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

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-05-31 21:44:57 -0700 (Fri, 31 May 2013)
New Revision: 417

Modified:
   trunk/modules/python/usfm2osis.py
Log:
progressing on MODTOOLS-42

Modified: trunk/modules/python/usfm2osis.py
===================================================================
--- trunk/modules/python/usfm2osis.py	2013-05-22 04:00:56 UTC (rev 416)
+++ trunk/modules/python/usfm2osis.py	2013-06-01 04:44:57 UTC (rev 417)
@@ -501,8 +501,8 @@
         osis = re.sub(r'\\(ipi|im|ipq|imq|ipr)\s+(.*?)(?=(\\(i?m|i?p|nb|lit|cls|tr|io|iq|i?li|iex?|s)|<chapter eID|</?div\b|<(p|closer)\b))', lambda m: '\uFDD3<p type="' + pType[m.group(1)] + '" subType="x-introduction">\n' + m.group(2) + '\uFDD3</p>\n', osis, flags=re.DOTALL)
 
         # \iq#_text...
-        osis = re.sub(r'\\iq\b\s*(.*?)(?=(['+'\uFDD0\uFDD1\uFDD3\uFDD4'+r']|\\i?q[\d\s]|\\fig|<l\b|<lb\b|<title\b))', r'<l level="1" subType="x-introduction">\1</l>', osis, flags=re.DOTALL)
-        osis = re.sub(r'\\iq(\d)\b\s*(.*?)(?=(['+'\uFDD0\uFDD1\uFDD3\uFDD4'+r']|\\i?q[\d\s]|\\fig|<l\b|<lb\b|<title\b))', r'<l level="\1" subType="x-introduction">\2</l>', osis, flags=re.DOTALL)
+        osis = re.sub(r'\\iq\b\s*(.*?)(?=(['+'\uFDD0\uFDD1\uFDD3\uFDD4'+r']|\\iq[\d\s]|\\fig|<l\b|<lb\b|<title\b))', r'<l level="1" subType="x-introduction">\1</l>', osis, flags=re.DOTALL)
+        osis = re.sub(r'\\iq(\d)\b\s*(.*?)(?=(['+'\uFDD0\uFDD1\uFDD3\uFDD4'+r']|\\iq[\d\s]|\\fig|<l\b|<lb\b|<title\b))', r'<l level="\1" subType="x-introduction">\2</l>', osis, flags=re.DOTALL)
 
         # \ib
         osis = re.sub(r'\\ib\b\s?', '<lb type="x-p"/>', osis)
@@ -1337,8 +1337,8 @@
     osis = cvtStudyBibleContent(osis, relaxedConformance)
     osis = cvtPrivateUseExtensions(osis, relaxedConformance)
 
-    osis = processOsisIDs(osis)
-    osis = osisReorderAndCleanup(osis)
+    #osis = processOsisIDs(osis)
+    #osis = osisReorderAndCleanup(osis)
 
     # change type on special books
     for sb in specialBooks: