corrected one OSIS abbreviation

set book order for 'canonical' ordering


git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@394 07627401-56e2-0310-80f4-f8cd0041bdcd

1 files changed, 47 insertions, 46 deletions

diff --git a/modules/python/usfm2osis.py b/modules/python/usfm2osis.py
index 07ee357..19f9f8f 100755
--- a/modules/python/usfm2osis.py
+++ b/modules/python/usfm2osis.py
@@ -148,7 +148,7 @@ addBookDict = {
     # Vulgate
     'PSO':'PrSol', 'PJE':'PrJer',
     # Armenian
-    'WSI':'WSir', 'COP':'EpCor', '3CO':'3Cor', 'EUT':'PrEuth', 'DOJ':'DormJohn',
+    'WSI':'WSir', 'COP':'EpCorPaul', '3CO':'3Cor', 'EUT':'PrEuth', 'DOJ':'DormJohn',
     # Apostolic Fathers
     '1CL':'1Clem', '2CL':'2Clem', 'SHE':'Herm', 'LBA':'Barn', 'DID':'Did',
     ###
@@ -159,54 +159,55 @@ addBookDict = {
     'ADE':'AddEsth'
     }
 
-canonicalOrder = (
-    # OT
-    'GEN', 'EXO', 'LEV', 'NUM', 'DEU', 'JOS', 'JDG', 'RUT', '1SA', '2SA', '1KI', '2KI', '1CH', '2CH', 'EZR', 'NEH',
-    'EST', 'JOB', 'PSA', 'PRO', 'ECC', 'SNG', 'ISA', 'JER', 'LAM', 'EZK', 'DAN', 'HOS', 'JOL', 'AMO', 'OBA', 'JON',
-    'MIC', 'NAM', 'HAB', 'ZEP', 'HAG', 'ZEC', 'MAL',
-    # DC - Catholic
-    'TOB', 'JDT', 'ESG', 'ADE', 'WIS', 'SIR', 'PSS', 'BAR', 'LJE', 'DAG', 'S3Y', 'SUS', 'BEL', '1MA', '2MA',
-    # DC - Eastern Orthodox
-    '1ES', 'MAN', 'PS2', '3MA', '2ES', '4MA',
-    # NT
-    'MAT', 'MRK', 'LUK', 'JHN', 'ACT', 'ROM', '1CO', '2CO', 'GAL', 'EPH', 'PHP', 'COL', '1TH', '2TH', '1TI', '2TI',
-    'TIT', 'PHM', 'HEB', 'JAS', '1PE', '2PE', '1JN', '2JN', '3JN', 'JUD', 'REV',
-    # Rahlfs' LXX
-    'ODA', 'ODE',
-    # Esdrae
-    'EZA', '5EZ', '6EZ',
-    # Inconsistency with Esther
 
-    # Syriac
-    'PS3', '2BA', 'LBA',
-    # Ethiopic
-    'JUB', 'ENO', '1MQ', '2MQ', '3MQ', 'REP', '4BA',
-    # Vulgate
-    'LAO',
-
-    # Additional non-biblical books
-    'XXA', 'XXB', 'XXC', 'XXD', 'XXE', 'XXF', 'XXG',
+canonicalOrder = [
+    # General principles of ordering:
+    # 1) Protocanonical books follow standard Protestant order within OT & NT
+    # 2) Intertestamentals follow the OT
+    # 3) NT-Apocrypha follow the NT
+    # 4) Apostolic Fathers follow NT-deuterocanonicals
+    # Specific principles:
+    # 1) Book representing parts of protocanonical books follow the primary book
+    # 2) Variants follow primary forms
+    # 3) Books that appear in only one tradition or Bible appear following their traditional/attested antecedent
+    
+    # There's no fool-proof way to order books without knowing the tradition ahead of time,
+    # but this ordering should get it right often for many common real Bibles.
+    
+    # Front Matter
+    'FRONT', 'INTRODUCTION', 
 
-    # Peripheral books
-    'FRT', 'INT', 'BAK', 'CNC', 'GLO',
-    'TDX', 'NDX', 'OTH'
-    ### Deprecated
-    # Rahlfs
-    'JSA', 'JDB', 'TBS', 'SST', 'DNT', 'BLT',
-    # Esdrae
-    '4ES', '5ES', '6ES',
+    # OT
+    'Gen', 'Exod', 'Lev', 'Num', 'Deut', 'Josh', 'JoshA', 'Judg', 'JudgB', 'Ruth',
+    '1Sam', '2Sam', '1Kgs', '2Kgs', '1Chr', '2Chr', 'PrMan', 'Jub', '1En',
+    'Ezra', 'Neh', 'Tob', 'TobS', 'Jdt', 'Esth', 'EsthGr', 'AddEsth', '1Meq', '2Meq', '3Meq',
+    'Job', 'Ps', 'AddPs', '5ApocSyrPss', 'PsMet', 'Odes', 'Prov', 'Reproof', 'Eccl', 'Song',
+    'Wis', 'Sir', 'WSir', 'PrSol', 'PssSol', 
+    'Isa',  'Jer', 'Lam', 'PrJer', 'Bar', 'EpJer', '2Bar', 'EpBar', '4Bar', 
+    'Ezek', 'Dan', 'DanGr', 'DanTh', 'PrAzar', 'Sus', 'SusTh', 'Bel', 'BelTh', 
+    'Hos', 'Joel', 'Amos', 'Obad', 'Jonah', 'Mic', 'Nah', 'Hab', 'Zeph', 'Hag', 'Zech', 'Mal',
+
+    # Intertestamentals
+    '1Esd', '2Esd', '4Ezra', '5Ezra', '6Ezra',
+    '1Macc', '2Macc', '3Macc', '4Macc', 
 
-    # Alternate Psalms
-    'PSB',
-    # Vulgate
-    'PSO', 'PJE',
-    # Armenian
-    'WSI', 'COP', '3CO', 'EUT', 'DOJ',
-    # Apostolic Fathers
-    '1CL', '2CL', 'SHE', 'LBA', 'DID',
-    ###
-    # Proposed replacements <http://lc.bfbs.org.uk/e107_files/downloads/canonicalissuesinparatext.pdf>
-    )
+    # NT
+    'Matt', 'Mark', 'Luke', 'John', 'Acts', 'Rom', '1Cor', '2Cor',
+    'Gal', 'Eph', 'Phil', 'Col', '1Thess', '2Thess', '1Tim', '2Tim',
+    'Titus', 'Phlm', 'Heb', 'Jas', '1Pet', '2Pet', '1John', '2John',
+    '3John', 'Jude', 'Rev',
+    # NT-Apocrypha
+    'EpLao', 'EpCorPaul', '3Cor', 'PrEuth', 'DormJohn',
+    # AF
+    '1Clem', '2Clem', 'Herm', 'Barn', 'Did',
+
+    # Private-Use Extensions
+    'XXA', 'XXB', 'XXC', 'XXD', 'XXE', 'XXF', 'XXG',
+    
+    # Back Matter
+    'BACK', 'CONCORDANCE', 'GLOSSARY',
+    'INDEX', 'GAZETTEER', 'X-OTHER'
+    ]
 
 specialBooks = ['FRONT', 'INTRODUCTION', 'BACK', 'CONCORDANCE', 'GLOSSARY', 'INDEX', 'GAZETTEER', 'X-OTHER']