[sword-svn] r389 - trunk/modules/python

[chrislit at crosswire.org]

Author: chrislit
Date: 2012-08-24 18:08:04 -0700 (Fri, 24 Aug 2012)
New Revision: 389

Modified:
   trunk/modules/python/usfm2osis.py
Log:
OSIS abbreviations corrections for Sword


Modified: trunk/modules/python/usfm2osis.py
===================================================================
--- trunk/modules/python/usfm2osis.py	2012-08-19 02:48:17 UTC (rev 388)
+++ trunk/modules/python/usfm2osis.py	2012-08-25 01:08:04 UTC (rev 389)
@@ -111,7 +111,7 @@
     'TOB':'Tob', 'JDT':'Jdt', 'ESG':'EsthGr', 'WIS':'Wis', 'SIR':'Sir', 'BAR':'Bar', 'LJE':'EpJer', 'S3Y':'PrAzar',
     'SUS':'Sus', 'BEL':'Bel', '1MA':'1Macc', '2MA':'2Macc',
     # DC - Eastern Orthodox
-    '3MA':'3Macc', '4MA':'4Macc', '1ES':'1Esd', '2ES':'2Esd', 'MAN':'PrMan', 'PS2':'Ps151',
+    '3MA':'3Macc', '4MA':'4Macc', '1ES':'1Esd', '2ES':'2Esd', 'MAN':'PrMan', 'PS2':'AddPs',
     # Rahlfs' LXX
     'ODA':'Odes', 'PSS':'PssSol',
     # Esdrae
@@ -143,11 +143,11 @@
 
     ### Proposed Additions <http://lc.bfbs.org.uk/e107_files/downloads/canonicalissuesinparatext.pdf>
     # Alternate Psalms
-    'PSB':'Ps',
+    'PSB':'PsMet',
     # Vulgate
     'PSO':'PrSol', 'PJE':'PrJer',
     # Armenian
-    'WSI':'WSir', 'COP':'CorCorr', '3CO':'3Cor', 'EUT':'PrEut', 'DOJ':'DJohn',
+    'WSI':'WSir', 'COP':'EpCor', '3CO':'3Cor', 'EUT':'PrEuth', 'DOJ':'DormJohn',
     # Apostolic Fathers
     '1CL':'1Clem', '2CL':'2Clem', 'SHE':'Herm', 'LBA':'Barn', 'DID':'Did',
     ###
@@ -330,7 +330,7 @@
         """
         global loc2osisBk, osis2locBk
         # \id_<CODE>_(Name of file, Book name, Language, Last edited, Date etc.)
-        osis = re.sub(r'\\id\s+([A-Z0-9]{3})\b\s*([^\\'+'\n'+']*?)'+'\n'+r'(.*)(?=\\id|$)', lambda m: u'﷐<div type="book" osisID="' + bookDict[m.group(1)] + '">\n' + (('<!-- id comment - ' + m.group(2) + ' -->\n') if m.group(2) else '') +  m.group(3) + u'</div type="book">﷐\n' , osis, flags=re.DOTALL)#@
+        osis = re.sub(r'\\id\s+([A-Z0-9]{3})\b\s*([^\\'+'\n'+']*?)'+'\n'+r'(.*)(?=\\id|$)', lambda m: u'﷐<div type="book" osisID="' + bookDict[m.group(1)] + '">\n' + (('<!-- id comment - ' + m.group(2) + ' -->\n') if m.group(2) else '') +  m.group(3) + u'</div type="book">﷐\n' , osis, flags=re.DOTALL)
         # keep a copy of the OSIS book abbreviation for below (\toc3 processing) to store for mapping localized book names to/from OSIS
         osisBook = re.search(r'\\id\s+([A-Z0-9]{3})', osis)
         if osisBook: