]> git.lyx.org Git - features.git/commitdiff
Make module and citeengine regexes a little more discerning.
authorRichard Heck <rgheck@lyx.org>
Fri, 2 Feb 2018 03:10:54 +0000 (22:10 -0500)
committerRichard Heck <rgheck@lyx.org>
Fri, 2 Feb 2018 03:11:45 +0000 (22:11 -0500)
lib/configure.py

index 1ec8a0e012fd433469c4967c46369e2bf0adfadc..cf913128c36a0e9e6e7bef0dd05252aef0b51296 100644 (file)
@@ -1515,7 +1515,7 @@ def processModuleFile(file, filename, bool_docbook):
         We expect output:
           "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: (.*)')
     reexcs = re.compile(b'#+\s*Excludes: (.*)')
     recaty = re.compile(b'#+\s*Category: (.*)')
@@ -1639,7 +1639,7 @@ def processCiteEngineFile(file, filename, bool_docbook):
         We expect output:
           "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*$')
     redend = re.compile(b'#+\s*DescriptionEnd\s*$')
     recet = re.compile(b'\s*CiteEngineType\s*(.*)')