Make module and citeengine regexes a little more discerning.

This commit is contained in:
Richard Heck 2018-02-01 22:10:54 -05:00
parent 0e3d209295
commit 50676c782a

View File

@ -1515,7 +1515,7 @@ def processModuleFile(file, filename, bool_docbook):
We expect output: We expect output:
"ModuleName" "filename" "Description" "Packages" "Requires" "Excludes" "Category" "ModuleName" "filename" "Description" "Packages" "Requires" "Excludes" "Category"
''' '''
remods = re.compile(b'\\\\DeclareLyXModule\s*(?:\[([^]]*?)\])?{(.*)}') remods = re.compile(b'^#\s*\\\\DeclareLyXModule\s*(?:\[([^]]*?)\])?{(.*)}')
rereqs = re.compile(b'#+\s*Requires: (.*)') rereqs = re.compile(b'#+\s*Requires: (.*)')
reexcs = re.compile(b'#+\s*Excludes: (.*)') reexcs = re.compile(b'#+\s*Excludes: (.*)')
recaty = re.compile(b'#+\s*Category: (.*)') recaty = re.compile(b'#+\s*Category: (.*)')
@ -1639,7 +1639,7 @@ def processCiteEngineFile(file, filename, bool_docbook):
We expect output: We expect output:
"CiteEngineName" "filename" "CiteEngineType" "CiteFramework" "DefaultBiblio" "Description" "Packages" "CiteEngineName" "filename" "CiteEngineType" "CiteFramework" "DefaultBiblio" "Description" "Packages"
''' '''
remods = re.compile(b'\\\\DeclareLyXCiteEngine\s*(?:\[([^]]*?)\])?{(.*)}') remods = re.compile(b'^#\s*\\\\DeclareLyXCiteEngine\s*(?:\[([^]]*?)\])?{(.*)}')
redbeg = re.compile(b'#+\s*DescriptionBegin\s*$') redbeg = re.compile(b'#+\s*DescriptionBegin\s*$')
redend = re.compile(b'#+\s*DescriptionEnd\s*$') redend = re.compile(b'#+\s*DescriptionEnd\s*$')
recet = re.compile(b'\s*CiteEngineType\s*(.*)') recet = re.compile(b'\s*CiteEngineType\s*(.*)')