X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Flyx_pot.py;h=a0f98b909df01ed2e81cd0327d1fd54f9728e96e;hb=5bfd1c22d25e992ff0519931e1fb5590fc1e9024;hp=94142d14dd761514f2c013f96877dbb98c75dd8b;hpb=c5ef7cfcc4cb9deb7faa587264490ff77f233e04;p=lyx.git

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 94142d14dd..a0f98b909d 100755
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -84,13 +84,14 @@ def layouts_l10n(input_files, output, base, layouttranslations):
     # match LabelString, EndLabelString, LabelStringAppendix and maybe others but no comments
     LabelString = re.compile(r'^[^#]*LabelString\S*\s+(.*\S)\s*$', re.IGNORECASE)
     MenuString = re.compile(r'^[^#]*MenuString\S*\s+(.*\S)\s*$', re.IGNORECASE)
-    Tooltip = re.compile(r'^[^#]*Tooltip\S*\s+(.*\S)\s*$', re.IGNORECASE)
+    Tooltip = re.compile(r'^\s*Tooltip\S*\s+(.*\S)\s*$', re.IGNORECASE)
     GuiName = re.compile(r'^\s*GuiName\s+(.*\S)\s*$', re.IGNORECASE)
     ListName = re.compile(r'^\s*ListName\s+(.*\S)\s*$', re.IGNORECASE)
     CategoryName = re.compile(r'^\s*Category\s+(.*\S)\s*$', re.IGNORECASE)
     NameRE = re.compile(r'^\s*#\s*\\DeclareLyXModule.*{(.*)}$', re.IGNORECASE)
     InsetLayout = re.compile(r'^InsetLayout\s+\"?(.*)\"?\s*$', re.IGNORECASE)
     FlexCheck = re.compile(r'^Flex:(.*)', re.IGNORECASE)
+    CaptionCheck = re.compile(r'^Caption:(.*)', re.IGNORECASE)
     DescBegin = re.compile(r'^\s*#DescriptionBegin\s*$', re.IGNORECASE)
     DescEnd = re.compile(r'^\s*#\s*DescriptionEnd\s*$', re.IGNORECASE)
     Category = re.compile(r'^\s*#\s*Category:\s+(.*\S)\s*$', re.IGNORECASE)
@@ -287,6 +288,10 @@ def layouts_l10n(input_files, output, base, layouttranslations):
                 #if not layouttranslations:
                 #    writeString(out, src, base, lineno, string)
                 m = FlexCheck.search(string)
+                if m:
+                    if not layouttranslations:
+                        writeString(out, src, base, lineno, m.group(1))
+                m = CaptionCheck.search(string)
                 if m:
                     if not layouttranslations:
                         writeString(out, src, base, lineno, m.group(1))
@@ -329,11 +334,14 @@ def layouts_l10n(input_files, output, base, layouttranslations):
                 continue
             res = End.search(line)
             if res != None:
-                # If a float is predefined by the package and it does not need
-                # the float package then it uses the standard babel translations.
-                # This is even true for MarginFigure, MarginTable (both from
+                # We have four combinations of the flags usesFloatPkg and isPredefined:
+                #     usesFloatPkg and     isPredefined: might use standard babel translations
+                #     usesFloatPkg and not isPredefined: does not use standard babel translations
+                # not usesFloatPkg and     isPredefined: uses standard babel translations
+                # not usesFloatPkg and not isPredefined: not supported by LyX
+                # The third combination is even true for MarginFigure, MarginTable (both from
                 # tufte-book.layout) and Planotable, Plate (both from aguplus.inc).
-                if layouttranslations and readingFloat and usesFloatPkg and not isPredefined:
+                if layouttranslations and readingFloat and usesFloatPkg:
                     if floatname != '':
                         keyset.add(floatname)
                     if listname != '':
@@ -396,6 +404,9 @@ def layouts_l10n(input_files, output, base, layouttranslations):
             for key in keys:
                 if key in trans.keys():
                     val = trans[key].replace('\\', '\\\\').replace('"', '\\"')
+                    res = ContextRe.search(val)
+                    if res != None:
+                        val = res.group(1)
                     key = key.replace('\\', '\\\\').replace('"', '\\"')
                     print >> out, '\t"%s" "%s"' % \
                              (key.encode('utf-8'), val.encode('utf-8'))
@@ -489,7 +500,7 @@ def external_l10n(input_files, output, base):
     Template = re.compile(r'^Template\s+(.*)', re.IGNORECASE)
     GuiName = re.compile(r'\s*GuiName\s+(.*)', re.IGNORECASE)
     HelpTextStart = re.compile(r'\s*HelpText\s', re.IGNORECASE)
-    HelpTextSection = re.compile(r'\s*(\S.*\S)\s*$')
+    HelpTextSection = re.compile(r'\s*(\S.*)\s*$')
     HelpTextEnd = re.compile(r'\s*HelpTextEnd\s', re.IGNORECASE)
     i = -1
     for src in input_files:
@@ -567,7 +578,7 @@ def encodings_l10n(input_files, output, base):
     output = open(output, 'w')
     # assuming only one encodings file
     #                 Encoding utf8      utf8    "Unicode (utf8)" UTF-8    variable inputenc
-    reg = re.compile('Encoding [\w-]+\s+[\w-]+\s+"([\w \-\(\)]+)"\s+[\w-]+\s+(fixed|variable)\s+\w+.*')
+    reg = re.compile('Encoding [\w-]+\s+[\w-]+\s+"([\w \-\(\)]+)"\s+[\w-]+\s+(fixed|variable|variableunsafe)\s+\w+.*')
     input = open(input_files[0])
     for lineno, line in enumerate(input.readlines()):
         if not line.startswith('Encoding'):