Fix reversion of beamer documents.

[lyx.git] / po / lyx_pot.py

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 21d4c749951f224ed0015243d3a43aba537a4ce7..ca97416299bc8097495fc80758502421ae84ef01 100755 (executable)
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -334,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 != '':
@@ -401,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'))
@@ -494,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:
@@ -572,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'):