summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorChris Little <chrislit@crosswire.org>2013-06-01 04:44:57 +0000
committerChris Little <chrislit@crosswire.org>2013-06-01 04:44:57 +0000
commit7db7cad954b0216258b783475308cb31dd7de175 (patch)
tree4b1970b95a3c7148e7b17a47340ca5128ba06091 /modules
parent2047288d8c3325b206f73958dd93879f7ffa8fec (diff)
downloadsword-tools-7db7cad954b0216258b783475308cb31dd7de175.tar.gz
progressing on MODTOOLS-42
git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@417 07627401-56e2-0310-80f4-f8cd0041bdcd
Diffstat (limited to 'modules')
-rwxr-xr-xmodules/python/usfm2osis.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/python/usfm2osis.py b/modules/python/usfm2osis.py
index 4cae257..d5b2ad7 100755
--- a/modules/python/usfm2osis.py
+++ b/modules/python/usfm2osis.py
@@ -501,8 +501,8 @@ def convertToOsis(sFile):
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 @@ def convertToOsis(sFile):
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: