[sword-svn] r2330 - trunk/include

chrislit at crosswire.org chrislit at crosswire.org
Thu Apr 23 03:02:14 MST 2009


Author: chrislit
Date: 2009-04-23 03:02:14 -0700 (Thu, 23 Apr 2009)
New Revision: 2330

Modified:
   trunk/include/canon_abbrevs.h
Log:
added some additional abbreviations to generally favor more canonical books over less
did a couple other minor cleanups (removed Apocalypse of St. John abbreviation, made E prefer Exod instead of Eph, etc.)


Modified: trunk/include/canon_abbrevs.h
===================================================================
--- trunk/include/canon_abbrevs.h	2009-04-23 06:33:28 UTC (rev 2329)
+++ trunk/include/canon_abbrevs.h	2009-04-23 10:02:14 UTC (rev 2330)
@@ -34,10 +34,12 @@
   {"1 C", "1Cor"},		// I Corinthians
   {"1 CHRONICLES", "1Chr"},		// I Chronicles
   {"1 CORINTHIANS", "1Cor"},		// I Corinthians
+  {"1 E", "1Esd"},		// I Esdras
   {"1 ENOCH", "1En"},		// I Enoch
   {"1 ESDRAS", "1Esd"},		// I Esdras
   {"1 JN", "1John"},		// I John
   {"1 JOHN", "1John"},		// I John
+  {"1 K", "1Kgs"},		// I Kings
   {"1 KGDMS", "1Sam"},		// I Samuel
   {"1 KGS", "1Kgs"},		// I Kings
   {"1 KINGDOMS", "1Sam"},		// I Samuel
@@ -58,12 +60,14 @@
   {"1CHRONICLES", "1Chr"},		// I Chronicles
   {"1COR", "1Cor"},		// I Corinthians
   {"1CORINTHIANS", "1Cor"},		// I Corinthians
+  {"1E", "1Esd"},		// I Esdras
   {"1EN", "1En"},		// I Enoch
   {"1ENOCH", "1En"},		// I Enoch
   {"1ESD", "1Esd"},		// I Esdras
   {"1ESDRAS", "1Esd"},		// I Esdras
   {"1JN", "1John"},		// I John
   {"1JOHN", "1John"},		// I John
+  {"1K", "1Kgs"},		// I Kings
   {"1KGDMS", "1Sam"},		// I Samuel
   {"1KGS", "1Kgs"},		// I Kings
   {"1KINGDOMS", "1Sam"},		// I Samuel
@@ -88,9 +92,11 @@
   {"2 C", "2Cor"},		// II Corinthians
   {"2 CHRONICLES", "2Chr"},		// II Chronicles
   {"2 CORINTHIANS", "2Cor"},		// II Corinthians
+  {"2 E", "2Esd"},		// II Esdras
   {"2 ESDRAS", "2Esd"},		// II Esdras
   {"2 JN", "2John"},		// II John
   {"2 JOHN", "2John"},		// II John
+  {"2 K", "2Kgs"},		// II Kings
   {"2 KGDMS", "2Sam"},		// II Samuel
   {"2 KGS", "2Kgs"},		// II Kings
   {"2 KINGDOMS", "2Sam"},		// II Samuel
@@ -112,10 +118,12 @@
   {"2CHRONICLES", "2Chr"},		// II Chronicles
   {"2COR", "2Cor"},		// II Corinthians
   {"2CORINTHIANS", "2Cor"},		// II Corinthians
+  {"2E", "2Esd"},		// II Esdras
   {"2ESD", "2Esd"},		// II Esdras
   {"2ESDRAS", "2Esd"},		// II Esdras
   {"2JN", "2John"},		// II John
   {"2JOHN", "2John"},		// II John
+  {"2K", "2Kgs"},		// II Kings
   {"2KGDMS", "2Sam"},		// II Samuel
   {"2KGS", "2Kgs"},		// II Kings
   {"2KINGDOMS", "2Sam"},		// II Samuel
@@ -184,7 +192,6 @@
   {"ADDPS", "AddPs"},		// Additional Psalm
   {"AMOS", "Amos"},		// Amos
   {"APOCALYPSE OF JOHN", "Rev"},		// Revelation of John
-  {"APOCALYPSE OF ST. JOHN", "Rev"},		// Revelation of John
   {"AZA", "PrAzar"},		// Prayer of Azariah
   {"AZAR", "PrAzar"},		// Prayer of Azariah
   {"AZARIAH", "PrAzar"},		// Prayer of Azariah
@@ -210,11 +217,13 @@
   {"DAT", "DanTheo"},		// Daniel (Theodotion)
   {"DEUT", "Deut"},		// Deuteronomy
   {"DEUTERONOMY", "Deut"},		// Deuteronomy
-  {"E", "Eph"},		// Ephesians
+  {"DT", "Deut"},		// Deuteronomy
+  {"E", "Exod"},		// Exodus
   {"ECCL", "Eccl"},		// Ecclesiastes
   {"ECCLESIASTES", "Eccl"},		// Ecclesiastes
   {"ECCLESIASTICUS", "Sir"},		// Sirach
   {"ECCLUS", "Sir"},		// Sirach
+  {"EK", "Ezek"},		// Ezekiel
   {"ENOCH", "1En"},		// I Enoch
   {"EPH", "Eph"},		// Ephesians
   {"EPHESIANS", "Eph"},		// Ephesians
@@ -222,7 +231,7 @@
   {"EPJ", "EpJer"},		// Epistle of Jeremiah
   {"EPJER", "EpJer"},		// Epistle of Jeremiah
   {"EPLAO", "EpLao"},		// Laodiceans
-  {"ES", "Esth"},               // Esther
+  {"ES", "Esth"},		// Esther
   {"ESDRAS A", "1Esd"},		// I Esdras
   {"ESDRAS B", "2Esd"},		// II Esdras
   {"ESDRASA", "1Esd"},		// I Esdras
@@ -247,6 +256,7 @@
   {"GALATIANS", "Gal"},		// Galatians
   {"GEN", "Gen"},		// Genesis
   {"GENESIS", "Gen"},		// Genesis
+  {"GN", "Gen"},		// Genesis
   {"GRDAN", "DanGr"},		// Daniel (Greek)
   {"GREEK DANIEL", "DanGr"},		// Daniel (Greek)
   {"GREEK ESTHER", "EsthGr"},		// Esther (Greek)
@@ -260,14 +270,17 @@
   {"HEBREWS", "Heb"},		// Hebrews
   {"HOS", "Hos"},		// Hosea
   {"HOSEA", "Hos"},		// Hosea
+  {"I", "Isa"},		// Isaiah
   {"I BARUCH", "Bar"},		// Baruch
   {"I C", "1Cor"},		// I Corinthians
   {"I CHRONICLES", "1Chr"},		// I Chronicles
   {"I CORINTHIANS", "1Cor"},		// I Corinthians
+  {"I E", "1Esd"},		// I Esdras
   {"I ENOCH", "1En"},		// I Enoch
   {"I ESDRAS", "1Esd"},		// I Esdras
   {"I JN", "1John"},		// I John
   {"I JOHN", "1John"},		// I John
+  {"I K", "1Kgs"},		// I Kings
   {"I KGDMS", "1Sam"},		// I Samuel
   {"I KGS", "1Kgs"},		// I Kings
   {"I KINGDOMS", "1Sam"},		// I Samuel
@@ -286,15 +299,18 @@
   {"IC", "1Cor"},		// I Corinthians
   {"ICHRONICLES", "1Chr"},		// I Chronicles
   {"ICORINTHIANS", "1Cor"},		// I Corinthians
+  {"IE", "1Esd"},		// I Esdras
   {"IENOCH", "1En"},		// I Enoch
   {"IESDRAS", "1Esd"},		// I Esdras
   {"II BARUCH", "2Bar"},		// 2Baruch
   {"II C", "2Cor"},		// II Corinthians
   {"II CHRONICLES", "2Chr"},		// II Chronicles
   {"II CORINTHIANS", "2Cor"},		// II Corinthians
+  {"II E", "2Esd"},		// II Esdras
   {"II ESDRAS", "2Esd"},		// II Esdras
   {"II JN", "2John"},		// II John
   {"II JOHN", "2John"},		// II John
+  {"II K", "2Kgs"},		// II Kings
   {"II KGDMS", "2Sam"},		// II Samuel
   {"II KGS", "2Kgs"},		// II Kings
   {"II KINGDOMS", "2Sam"},		// II Samuel
@@ -313,6 +329,7 @@
   {"IIC", "2Cor"},		// II Corinthians
   {"IICHRONICLES", "2Chr"},		// II Chronicles
   {"IICORINTHIANS", "2Cor"},		// II Corinthians
+  {"IIE", "2Esd"},		// II Esdras
   {"IIESDRAS", "2Esd"},		// II Esdras
   {"III EZRA", "1Esd"},		// I Esdras
   {"III JN", "3John"},		// III John
@@ -336,6 +353,7 @@
   {"IIIMEQABYAN", "3Meq"},		// III Meqabyan
   {"IIJN", "2John"},		// II John
   {"IIJOHN", "2John"},		// II John
+  {"IIK", "2Kgs"},		// II Kings
   {"IIKGDMS", "2Sam"},		// II Samuel
   {"IIKGS", "2Kgs"},		// II Kings
   {"IIKINGDOMS", "2Sam"},		// II Samuel
@@ -352,6 +370,7 @@
   {"IITIMOTHY", "2Tim"},		// II Timothy
   {"IJN", "1John"},		// I John
   {"IJOHN", "1John"},		// I John
+  {"IK", "1Kgs"},		// I Kings
   {"IKGDMS", "1Sam"},		// I Samuel
   {"IKGS", "1Kgs"},		// I Kings
   {"IKINGDOMS", "1Sam"},		// I Samuel
@@ -385,6 +404,7 @@
   {"J", "Josh"},		// Joshua
   {"JAMES", "Jas"},		// James
   {"JAS", "Jas"},		// James
+  {"JB", "Job"},		// Job
   {"JD", "Judg"},		// Judges
   {"JDA", "JudgA"},		// Judges (Codex Alexandrinus)
   {"JDB", "JudgB"},		// Judges (Codex Vaticanus)
@@ -406,6 +426,7 @@
   {"JOSHUA", "Josh"},		// Joshua
   {"JOSHUA (CODEX ALEXANDRINUS)", "JoshA"},		// Joshua (Codex Alexandrinus)
   {"JOSHUA (CODEX VATICANUS)", "JoshB"},		// Joshua (Codex Vaticanus)
+  {"JS", "Josh"},		// Joshua
   {"JSA", "JoshA"},		// Joshua (Codex Alexandrinus)
   {"JSB", "JoshB"},		// Joshua (Codex Vaticanus)
   {"JU", "Jude"},		// Jude
@@ -425,13 +446,13 @@
   {"LAO", "EpLao"},		// Laodiceans
   {"LAODICEANS", "EpLao"},		// Laodiceans
   {"LE", "Lev"},		// Leviticus
-  {"LESSER GENESIS", "Jub"},		// Jubilees
   {"LETJER", "EpJer"},		// Epistle of Jeremiah
   {"LETTER OF JEREMIAH", "EpJer"},		// Epistle of Jeremiah
   {"LEV", "Lev"},		// Leviticus
   {"LEVITICUS", "Lev"},		// Leviticus
   {"LK", "Luke"},		// Luke
   {"LUKE", "Luke"},		// Luke
+  {"LV", "Lev"},		// Leviticus
   {"MA", "Matt"},		// Matthew
   {"MAL", "Mal"},		// Malachi
   {"MALACHI", "Mal"},		// Malachi
@@ -452,6 +473,7 @@
   {"NAM", "Nah"},		// Nahum
   {"NEH", "Neh"},		// Nehemiah
   {"NEHEMIAH", "Neh"},		// Nehemiah
+  {"NM", "Num"},		// Numbers
   {"NUM", "Num"},		// Numbers
   {"NUMBERS", "Num"},		// Numbers
   {"OBAD", "Obad"},		// Obadiah
@@ -479,6 +501,7 @@
   {"PS", "Ps"},		// Psalms
 //  {"PS 151", "AddPs"},		// Additional Psalm
 //  {"PS151", "AddPs"},		// Additional Psalm
+  {"PSALM", "Ps"},		// Psalms
 //  {"PSALM 151", "AddPs"},		// Additional Psalm
 //  {"PSALM151", "AddPs"},		// Additional Psalm
   {"PSALMS", "Ps"},		// Psalms
@@ -493,7 +516,9 @@
   {"ROM", "Rom"},		// Romans
   {"ROMANS", "Rom"},		// Romans
   {"RUTH", "Ruth"},		// Ruth
+  {"S", "Song"},		// Song of Solomon
 //  {"S3Y", "PrAzar"},		// Prayer of Azariah
+  {"SI", "Sir"},		// Sirach
   {"SIP", "SirP"},		// Sirach (Prologue)
   {"SIR", "Sir"},		// Sirach
   {"SIRACH", "Sir"},		// Sirach
@@ -511,6 +536,8 @@
   {"SUSTHEO", "SusTheo"},		// Susanna (Theodotion)
   {"SUT", "SusTheo"},		// Susanna (Theodotion)
   {"SYRIAC APOCALYPSE OF BARUCH", "2Bar"},		// 2Baruch
+  {"T", "Titus"},		// Titus
+  {"TB", "Tob"},		// Tobit
   {"TBA", "TobBA"},		// Tobit (Codices Vaticanus Alexandrinusque)
   {"TBS", "TobS"},		// Tobit (Codex Sinaiticus)
   {"TBT", "Tob"},		// Tobit




More information about the sword-cvs mailing list