X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Flyx_pot.py;h=b559aec97e25e8cc0b8e6d89d4da016165d84c5b;hb=5142d1c86ada8df7451534402e2a1716678ee8b7;hp=275d4f70b2a7513e336c4cfd9489a9913ece7bd4;hpb=d103ab6cf96d1a4f05e605efc5ea38695e4d0385;p=lyx.git

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 275d4f70b2..b559aec97e 100755
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -77,24 +77,30 @@ def ui_l10n(input_files, output, base):
 def layouts_l10n(input_files, output, base):
     '''Generate pot file from lib/layouts/*.{layout,inc,module}'''
     out = open(output, 'w')
-    Style = re.compile(r'^Style\s+(.*)')
+    Style = re.compile(r'^Style\s+(.*)', re.IGNORECASE)
     # include ???LabelString???, but exclude comment lines
     LabelString = re.compile(r'^[^#]*LabelString\S*\s+(.*)')
     GuiName = re.compile(r'\s*GuiName\s+(.*)')
     ListName = re.compile(r'\s*ListName\s+(.*)')
     CategoryName = re.compile(r'\s*Category\s+(.*)')
     NameRE = re.compile(r'DeclareLyXModule.*{(.*)}')
-    InsetLayout = re.compile(r'^InsetLayout\s+(.*)')
+    InsetLayout = re.compile(r'^InsetLayout\s+\"?(.*)\"?')
+    FlexCheck = re.compile(r'^Flex:(.*)')
     DescBegin = re.compile(r'#+\s*DescriptionBegin\s*$')
     DescEnd = re.compile(r'#+\s*DescriptionEnd\s*$')
     Category = re.compile(r'#Category: (.*)$')
     I18nPreamble = re.compile(r'\s*(Lang)|(Babel)Preamble\s*$')
     EndI18nPreamble = re.compile(r'\s*End(Lang)|(Babel)Preamble\s*$')
     I18nString = re.compile(r'_\(([^\)]+)\)')
-
+    CounterFormat = re.compile(r'\s*PrettyFormat\s+"?(.*)"?')
+    CiteFormat = re.compile(r'\s*CiteFormat')
+    KeyVal = re.compile(r'^\s*_\w+\s+(.*)$')
+    End = re.compile(r'\s*End')
+    
     for src in input_files:
         readingDescription = False
         readingI18nPreamble = False
+        readingCiteFormats = False
         descStartLine = -1
         descLines = []
         lineno = 0
@@ -167,12 +173,32 @@ def layouts_l10n(input_files, output, base):
                 string = res.group(1)
                 string = string.replace('_', ' ')
                 writeString(out, src, base, lineno, string)
+                m = FlexCheck.search(string)
+                if m:
+                  writeString(out, src, base, lineno, m.group(1))
                 continue
             res = Category.search(line)
             if res != None:
                 string = res.group(1)
                 writeString(out, src, base, lineno, string)
                 continue
+            res = CounterFormat.search(line)
+            if res != None:
+                string = res.group(1)
+                writeString(out, src, base, lineno, string)
+                continue
+            res = CiteFormat.search(line)
+            if res != None:
+                readingCiteFormats = True
+            res = End.search(line)
+            if res != None and readingCiteFormats:
+                readingCiteFormats = False
+            if readingCiteFormats:
+                res = KeyVal.search(line)
+                if res != None:
+                    val = res.group(1)
+                    writeString(out, src, base, lineno, val)
+                
     out.close()
 
 
@@ -207,7 +233,7 @@ def languages_l10n(input_files, output, base):
     '''Generate pot file from lib/language'''
     output = open(output, 'w')
     # assuming only one language file
-    reg = re.compile('[\w-]+\s+[\w"]+\s+"([\w \-\(\),]+)"\s+(true|false)\s+[\w-]+\s+\w+\s+"[^"]*"')
+    reg = re.compile('[\w-]+\s+[\w"]+\s+"([\w \-\(\),]+)"\s+(true|false)\s+[\w-]+\s+[\w\-]+\s+"[^"]*"')
     input = open(input_files[0])
     for lineno, line in enumerate(input.readlines()):
         if line[0] == '#':