anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Harden a few of the other regexes, too.

Browse Source 
I've tested this and get no difference of output.
This commit is contained in:
Richard Heck 2018-02-01 22:14:51 -05:00
parent 50676c782a
commit 16a6a98182
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/configure.py
View File

@ -1515,12 +1515,12 @@ 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'^#\s*\\\\DeclareLyXModule\s*(?:\[([^]]*?)\])?{(.*)}') remods = re.compile(b'^\s*#\s*\\\\DeclareLyXModule\s*(?:\[([^]]*?)\])?{(.*)}')
rereqs = re.compile(b'#+\s*Requires: (.*)') rereqs = re.compile(b'^\s*#+\s*Requires: (.*)')
reexcs = re.compile(b'#+\s*Excludes: (.*)') reexcs = re.compile(b'^\s*#+\s*Excludes: (.*)')
recaty = re.compile(b'#+\s*Category: (.*)') recaty = re.compile(b'^\s*#+\s*Category: (.*)')
redbeg = re.compile(b'#+\s*DescriptionBegin\s*$') redbeg = re.compile(b'^\s*#+\s*DescriptionBegin\s*$')
redend = re.compile(b'#+\s*DescriptionEnd\s*$') redend = re.compile(b'^\s*#+\s*DescriptionEnd\s*$')
modname = desc = pkgs = req = excl = catgy = b"" modname = desc = pkgs = req = excl = catgy = b""
readingDescription = False readingDescription = False
@ -1639,9 +1639,9 @@ 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'^#\s*\\\\DeclareLyXCiteEngine\s*(?:\[([^]]*?)\])?{(.*)}') remods = re.compile(b'^\s*#\s*\\\\DeclareLyXCiteEngine\s*(?:\[([^]]*?)\])?{(.*)}')
redbeg = re.compile(b'#+\s*DescriptionBegin\s*$') redbeg = re.compile(b'^\s*#+\s*DescriptionBegin\s*$')
redend = re.compile(b'#+\s*DescriptionEnd\s*$') redend = re.compile(b'^\s*#+\s*DescriptionEnd\s*$')
recet = re.compile(b'\s*CiteEngineType\s*(.*)') recet = re.compile(b'\s*CiteEngineType\s*(.*)')
redb = re.compile(b'\s*DefaultBiblio\s*(.*)') redb = re.compile(b'\s*DefaultBiblio\s*(.*)')
resfm = re.compile(b'\s*CiteFramework\s*(.*)') resfm = re.compile(b'\s*CiteFramework\s*(.*)')