]> git.lyx.org Git - lyx.git/blobdiff - po/lyx_pot.py
Move Lexer to support/ directory (and lyx::support namespace)
[lyx.git] / po / lyx_pot.py
index bf700e1e98a789a7cac934f5058d49344ace9b75..665fdcddcfe35d6fd3806aafa5488f72e3b56294 100755 (executable)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # file lyx_pot.py
 # This script will extract translatable strings from input files and write
 # to output in gettext .pot format.
 #
-import sys, os, re, getopt
-if sys.version_info < (2, 4, 0):
-    from sets import Set as set
+from __future__ import print_function
+
+import glob, sys, os, re, getopt
+import io
 
 def relativePath(path, base):
     '''return relative path from top source dir'''
@@ -26,7 +27,7 @@ def relativePath(path, base):
     path1 = os.path.normpath(os.path.realpath(path)).split(os.sep)
     path2 = os.path.normpath(os.path.realpath(base)).split(os.sep)
     if path1[:len(path2)] != path2:
-        print "Path %s is not under top source directory" % path
+        print("Path %s is not under top source directory" % path)
     path3 = os.path.join(*path1[len(path2):]);
     # replace all \ by / such that we get the same comments on Windows and *nix
     path3 = path3.replace('\\', '/')
@@ -37,27 +38,30 @@ def writeString(outfile, infile, basefile, lineno, string):
     string = string.replace('\\', '\\\\').replace('"', '')
     if string == "":
         return
-    print >> outfile, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-        (relativePath(infile, basefile), lineno, string)
+    print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+        (relativePath(infile, basefile), lineno, string), file=outfile)
 
 
 def ui_l10n(input_files, output, base):
     '''Generate pot file from lib/ui/*'''
-    output = open(output, 'w')
-    Submenu = re.compile(r'^[^#]*Submenu\s+"([^"]*)"')
-    Popupmenu = re.compile(r'^[^#]*PopupMenu\s+"[^"]+"\s+"([^"]*)"')
-    IconPalette = re.compile(r'^[^#]*IconPalette\s+"[^"]+"\s+"([^"]*)"')
-    Toolbar = re.compile(r'^[^#]*Toolbar\s+"[^"]+"\s+"([^"]*)"')
-    Item = re.compile(r'[^#]*Item\s+"([^"]*)"')
-    TableInsert = re.compile(r'[^#]*TableInsert\s+"([^"]*)"')
+    output = io.open(output, 'w', encoding='utf_8', newline='\n')
+    Submenu = re.compile(r'^[^#]*Submenu\s+"([^"]*)"', re.IGNORECASE)
+    Popupmenu = re.compile(r'^[^#]*PopupMenu\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
+    Dynamicmenu = re.compile(r'^[^#]*DynamicMenu\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
+    IconPalette = re.compile(r'^[^#]*IconPalette\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
+    Toolbar = re.compile(r'^[^#]*Toolbar\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
+    Item = re.compile(r'[^#]*Item\s+"([^"]*)"', re.IGNORECASE)
+    TableInsert = re.compile(r'[^#]*TableInsert\s+"([^"]*)"', re.IGNORECASE)
     for src in input_files:
-        input = open(src)
+        input = io.open(src, encoding='utf_8')
         for lineno, line in enumerate(input.readlines()):
             if Submenu.match(line):
                 (string,) = Submenu.match(line).groups()
                 string = string.replace('_', ' ')
             elif Popupmenu.match(line):
                 (string,) = Popupmenu.match(line).groups()
+            elif Dynamicmenu.match(line):
+                (string,) = Dynamicmenu.match(line).groups()
             elif IconPalette.match(line):
                 (string,) = IconPalette.match(line).groups()
             elif Toolbar.match(line):
@@ -70,36 +74,46 @@ def ui_l10n(input_files, output, base):
                 continue
             string = string.replace('"', '')
             if string != "":
-                print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                    (relativePath(src, base), lineno+1, string)
+                print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                    (relativePath(src, base), lineno+1, string), file=output)
         input.close()
     output.close()
 
 
 def layouts_l10n(input_files, output, base, layouttranslations):
-    '''Generate pot file from lib/layouts/*.{layout,inc,module}'''
-    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+\"?(.*)\"?')
-    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*$')
+    '''Generate pot file from lib/layouts/*.{layout,inc,module} and lib/citeengines/*.citeengine'''
+    ClassDescription = re.compile(r'^\s*#\s*\\Declare(LaTeX|DocBook)Class.*\{(.*)\}$', re.IGNORECASE)
+    ClassCategory = re.compile(r'^\s*#\s*\\DeclareCategory\{(.*)\}$', re.IGNORECASE)
+    Style = re.compile(r'^\s*Style\s+(.*\S)\s*$', re.IGNORECASE)
+    # 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)
+    OutlinerName = re.compile(r'^[^#]*OutlinerName\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)
+    CiteNameRE = re.compile(r'^\s*#\s*\\DeclareLyXCiteEngine.*\{(.*)\}$', 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*#\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)
+    I18nPreamble = re.compile(r'^\s*((Lang)|(Babel))Preamble\s*$', re.IGNORECASE)
+    EndI18nPreamble = re.compile(r'^\s*End((Lang)|(Babel))Preamble\s*$', re.IGNORECASE)
     I18nString = re.compile(r'_\(([^\)]+)\)')
-    CounterFormat = re.compile(r'\s*PrettyFormat\s+"?(.*)"?')
-    CiteFormat = re.compile(r'\s*CiteFormat')
-    KeyVal = re.compile(r'^\s*_\w+\s+(.*)$')
-    Float = re.compile(r'\s*Float')
-    End = re.compile(r'\s*End')
-    Comment = re.compile(r'\s*#')
-    Translation = re.compile(r'\s*Translation\s+(.*)\s*$')
+    CounterFormat = re.compile(r'^\s*PrettyFormat\s+"?(.*)"?\s*$', re.IGNORECASE)
+    CiteFormat = re.compile(r'^\s*CiteFormat', re.IGNORECASE)
+    # Note: preceding and trailing space in the val below matters
+    KeyVal = re.compile(r'^\s*B?_\w+\s(.*\S)*$')
+    Float = re.compile(r'^\s*Float\s*$', re.IGNORECASE)
+    UsesFloatPkg = re.compile(r'^\s*UsesFloatPkg\s+(.*\S)\s*$', re.IGNORECASE)
+    IsPredefined = re.compile(r'^\s*IsPredefined\s+(.*\S)\s*$', re.IGNORECASE)
+    End = re.compile(r'^\s*End', re.IGNORECASE)
+    Comment = re.compile(r'^(.*)#')
+    Translation = re.compile(r'^\s*Translation\s+(.*\S)\s*$', re.IGNORECASE)
     KeyValPair = re.compile(r'\s*"(.*)"\s+"(.*)"')
 
     oldlanguages = []
@@ -109,17 +123,20 @@ def layouts_l10n(input_files, output, base, layouttranslations):
     if layouttranslations:
         linguas_file = os.path.join(base, 'po/LINGUAS')
         for line in open(linguas_file).readlines():
-            if Comment.search(line) == None:
+            res = Comment.search(line)
+            if res:
+                line = res.group(1)
+            if line.strip() != '':
                 languages.extend(line.split())
 
         # read old translations if available
         try:
-            input = open(output)
+            input = io.open(output, encoding='utf_8')
             lang = ''
             for line in input.readlines():
                 res = Comment.search(line)
                 if res:
-                    continue
+                    line = res.group(1)
                 if line.strip() == '':
                     continue
                 res = Translation.search(line)
@@ -136,34 +153,54 @@ def layouts_l10n(input_files, output, base, layouttranslations):
                     continue
                 res = KeyValPair.search(line)
                 if res and lang != '':
-                    key = res.group(1).decode('utf-8')
-                    val = res.group(2).decode('utf-8')
+                    key = res.group(1)
+                    val = res.group(2)
                     key = key.replace('\\"', '"').replace('\\\\', '\\')
                     val = val.replace('\\"', '"').replace('\\\\', '\\')
                     oldtrans[lang][key] = val
                     keyset.add(key)
                     continue
-                print "Error: Unable to handle line:"
-                print line
+                print("Error: Unable to handle line:")
+                print(line)
         except IOError:
-            pass
+            print("Warning: Unable to open %s for reading." % output)
+            print("         Old translations will be lost.")
 
         # walon is not a known document language
         # FIXME: Do not hardcode, read from lib/languages!
         if 'wa' in languages:
             languages.remove('wa')
 
-    out = open(output, 'w')
+    if layouttranslations:
+        out = io.open(output, 'w', encoding='utf_8')
+    else:
+        out = io.open(output, 'w', encoding='utf_8', newline='\n')
     for src in input_files:
         readingDescription = False
         readingI18nPreamble = False
         readingFloat = False
         readingCiteFormats = False
+        isPredefined = False
+        usesFloatPkg = True
+        listname = ''
+        floatname = ''
         descStartLine = -1
         descLines = []
         lineno = 0
-        for line in open(src).readlines():
+        for line in io.open(src, encoding='utf_8').readlines():
             lineno += 1
+            res = ClassDescription.search(line)
+            if res != None:
+                string = res.group(2)
+                if not layouttranslations:
+                    writeString(out, src, base, lineno + 1, string)
+                continue
+            res = ClassCategory.search(line)
+            if res != None:
+                string = res.group(1)
+                if not layouttranslations:
+                    writeString(out, src, base, lineno + 1, string)
+                continue
             if readingDescription:
                 res = DescEnd.search(line)
                 if res != None:
@@ -197,6 +234,12 @@ def layouts_l10n(input_files, output, base, layouttranslations):
                 readingI18nPreamble = True
                 continue
             res = NameRE.search(line)
+            if res != None:
+                string = res.group(1)
+                if not layouttranslations:
+                    writeString(out, src, base, lineno + 1, string)
+                continue
+            res = CiteNameRE.search(line)
             if res != None:
                 string = res.group(1)
                 if not layouttranslations:
@@ -206,10 +249,30 @@ def layouts_l10n(input_files, output, base, layouttranslations):
             if res != None:
                 string = res.group(1)
                 string = string.replace('_', ' ')
+                # Style means something else inside a float definition
+                if not readingFloat:
+                    if not layouttranslations:
+                        writeString(out, src, base, lineno, string)
+                continue
+            res = LabelString.search(line)
+            if res != None:
+                string = res.group(1)
                 if not layouttranslations:
                     writeString(out, src, base, lineno, string)
                 continue
-            res = LabelString.search(line)
+            res = MenuString.search(line)
+            if res != None:
+                string = res.group(1)
+                if not layouttranslations:
+                    writeString(out, src, base, lineno, string)
+                continue
+            res = OutlinerName.search(line)
+            if res != None:
+                string = res.group(2)
+                if not layouttranslations:
+                    writeString(out, src, base, lineno, string)
+                continue
+            res = Tooltip.search(line)
             if res != None:
                 string = res.group(1)
                 if not layouttranslations:
@@ -221,7 +284,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
                 if layouttranslations:
                     # gui name must only be added for floats
                     if readingFloat:
-                        keyset.add(string)
+                        floatname = string
                 else:
                     writeString(out, src, base, lineno, string)
                 continue
@@ -235,7 +298,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
             if res != None:
                 string = res.group(1)
                 if layouttranslations:
-                    keyset.add(string.strip('"'))
+                    listname = string.strip('"')
                 else:
                     writeString(out, src, base, lineno, string)
                 continue
@@ -247,6 +310,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))
@@ -267,13 +334,47 @@ def layouts_l10n(input_files, output, base, layouttranslations):
             if res != None:
                 readingFloat = True
                 continue
+            res = IsPredefined.search(line)
+            if res != None:
+                string = res.group(1).lower()
+                if string == 'true':
+                    isPredefined = True
+                else:
+                    isPredefined = False
+                continue
+            res = UsesFloatPkg.search(line)
+            if res != None:
+                string = res.group(1).lower()
+                if string == 'true':
+                    usesFloatPkg = True
+                else:
+                    usesFloatPkg = False
+                continue
             res = CiteFormat.search(line)
             if res != None:
                 readingCiteFormats = True
+                continue
             res = End.search(line)
             if res != None:
+                # 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:
+                    if floatname != '':
+                        keyset.add(floatname)
+                    if listname != '':
+                        keyset.add(listname)
+                isPredefined = False
+                usesFloatPkg = True
+                listname = ''
+                floatname = ''
                 readingCiteFormats = False
                 readingFloat = False
+                continue
             if readingCiteFormats:
                 res = KeyVal.search(line)
                 if res != None:
@@ -293,12 +394,18 @@ def layouts_l10n(input_files, output, base, layouttranslations):
             keys.append(key)
         keys.sort()
 
-        print >> out, '''# This file has been automatically generated by po/lyx_pot.py.
+        ContextRe = re.compile(r'(.*)(\[\[.*\]\])')
+
+        print(u'''# This file has been automatically generated by po/lyx_pot.py.
 # PLEASE MODIFY ONLY THE LAGUAGES HAVING NO .po FILE! If you want to regenerate
-# this file from the translations, run `make ../lib/layouttranslations' in po.'''
+# this file from the translations, run `make ../lib/layouttranslations' in po.
+# Python polib library is needed for building the output file.
+#
+# This file should remain fixed during minor LyX releases.
+# For more comments see README.localization file.''', file=out)
         for lang in languages:
-            print >> out, '\nTranslation %s' % lang
-            if lang in oldtrans.keys():
+            print(u'\nTranslation %s' % lang, file=out)
+            if lang in list(oldtrans.keys()):
                 trans = oldtrans[lang]
             else:
                 trans = dict()
@@ -317,28 +424,34 @@ def layouts_l10n(input_files, output, base, layouttranslations):
                         if val != key:
                             trans[key] = val
             for key in keys:
-                if key in trans.keys():
+                if key in list(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'))
-                # to print untranslated entries, uncomment the following lines
-                #else:
-                #    key = key.replace('\\', '\\\\').replace('"', '\\"')
-                #    print >> out, '\t"%s" "%s"' % \
-                #             (key.encode('utf-8'), key.encode('utf-8'))
-            print >> out, 'End'
+                    print(u'\t"%s" "%s"' % (key, val), file=out)
+                # also print untranslated entries to help translators
+                elif not lang in oldlanguages:
+                    key = key.replace('\\', '\\\\').replace('"', '\\"')
+                    res = ContextRe.search(key)
+                    if res != None:
+                        val = res.group(1)
+                    else:
+                        val = key
+                    print(u'\t"%s" "%s"' % (key, val), file=out)
+            print(u'End', file=out)
 
     out.close()
 
 
-def qt4_l10n(input_files, output, base):
-    '''Generate pot file from src/frontends/qt4/ui/*.ui'''
-    output = open(output, 'w')
+def qt_l10n(input_files, output, base):
+    '''Generate pot file from src/frontends/qt/ui/*.ui'''
+    output = io.open(output, 'w', encoding='utf_8', newline='\n')
     pat = re.compile(r'\s*<string>(.*)</string>')
     prop = re.compile(r'\s*<property.*name.*=.*shortcut')
     for src in input_files:
-        input = open(src)
+        input = io.open(src, encoding='utf_8')
         skipNextLine = False
         for lineno, line in enumerate(input.readlines()):
             # skip the line after <property name=shortcut>
@@ -355,43 +468,63 @@ def qt4_l10n(input_files, output, base):
                 string = string.replace('&lt;', '<').replace('&gt;', '>')
                 string = string.replace('\\', '\\\\').replace('"', r'\"')
                 string = string.replace('&#x0a;', r'\n')
-                print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                    (relativePath(src, base), lineno+1, string)
+                print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                    (relativePath(src, base), lineno+1, string), file=output)
         input.close()
     output.close()
 
 
 def languages_l10n(input_files, output, base):
     '''Generate pot file from lib/languages'''
-    out = open(output, 'w')
-    GuiName = re.compile(r'^[^#]*GuiName\s+(.*)')
-    
+    out = io.open(output, 'w', encoding='utf_8', newline='\n')
+    GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
+
+    for src in input_files:
+        descStartLine = -1
+        descLines = []
+        lineno = 0
+        for line in io.open(src, encoding='utf_8').readlines():
+            lineno += 1
+            res = GuiName.search(line)
+            if res != None:
+                string = res.group(1)
+                writeString(out, src, base, lineno, string)
+                continue
+
+    out.close()
+
+
+def latexfonts_l10n(input_files, output, base):
+    '''Generate pot file from lib/latexfonts'''
+    out = io.open(output, 'w', encoding='utf_8', newline='\n')
+    GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
+
     for src in input_files:
         descStartLine = -1
         descLines = []
         lineno = 0
-        for line in open(src).readlines():
+        for line in io.open(src, encoding='utf_8').readlines():
             lineno += 1
             res = GuiName.search(line)
             if res != None:
                 string = res.group(1)
                 writeString(out, src, base, lineno, string)
                 continue
-               
+
     out.close()
 
 
 def external_l10n(input_files, output, base):
-    '''Generate pot file from lib/external_templates'''
-    output = open(output, 'w')
-    Template = re.compile(r'^Template\s+(.*)')
-    GuiName = re.compile(r'\s*GuiName\s+(.*)')
-    HelpTextStart = re.compile(r'\s*HelpText\s')
+    '''Generate pot file from lib/xtemplates'''
+    output = io.open(output, 'w', encoding='utf_8', newline='\n')
+    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*$')
-    HelpTextEnd = re.compile(r'\s*HelpTextEnd\s')
+    HelpTextEnd = re.compile(r'\s*HelpTextEnd\s', re.IGNORECASE)
     i = -1
     for src in input_files:
-        input = open(src)
+        input = io.open(src, encoding='utf_8')
         inHelp = False
         hadHelp = False
         prev_help_string = ''
@@ -403,20 +536,26 @@ def external_l10n(input_files, output, base):
             elif inHelp:
                 if HelpTextEnd.match(line):
                     if hadHelp:
-                        print >> output, '\nmsgstr ""\n'
+                        print(u'\nmsgstr ""\n', file=output)
                     inHelp = False
                     hadHelp = False
                     prev_help_string = ''
                 elif HelpTextSection.match(line):
                     (help_string,) = HelpTextSection.match(line).groups()
                     help_string = help_string.replace('"', '')
+                    help_string =  help_string.replace('\\', '_backsl_')
+                    help_string =  help_string.replace('_backsl_', '\\\\')
                     if help_string != "" and prev_help_string == '':
-                        print >> output, '#: %s:%d\nmsgid ""\n"%s\\n"' % \
-                            (relativePath(src, base), lineno+1, help_string)
+                        print(u'#: %s:%d\nmsgid ""\n"%s\\n"' % \
+                            (relativePath(src, base), lineno+1, help_string), file=output)
                         hadHelp = True
                     elif help_string != "":
-                        print >> output, '"%s\\n"' % help_string
+                        print(u'"%s\\n"' % help_string, file=output)
                     prev_help_string = help_string
+                else:
+                    # Empty line
+                    print(u'"\\n"', file=output)
+                    prev_help_string = 'xxxx'
             elif HelpTextStart.match(line):
                 inHelp = True
                 prev_help_string = ''
@@ -424,18 +563,18 @@ def external_l10n(input_files, output, base):
                 continue
             string = string.replace('"', '')
             if string != "" and not inHelp:
-                print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                    (relativePath(src, base), lineno+1, string)
+                print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                    (relativePath(src, base), lineno+1, string), file=output)
         input.close()
     output.close()
 
 
 def formats_l10n(input_files, output, base):
     '''Generate pot file from configure.py'''
-    output = open(output, 'w')
-    GuiName = re.compile(r'.*\Format\s+\S+\s+\S+\s+"([^"]*)"\s+(\S*)\s+.*')
-    GuiName2 = re.compile(r'.*\Format\s+\S+\s+\S+\s+([^"]\S+)\s+(\S*)\s+.*')
-    input = open(input_files[0])
+    output = io.open(output, 'w', encoding='utf_8', newline='\n')
+    GuiName = re.compile(r'.*\\Format\s+\S+\s+\S+\s+"([^"]*)"\s+(\S*)\s+.*', re.IGNORECASE)
+    GuiName2 = re.compile(r'.*\\Format\s+\S+\s+\S+\s+([^"]\S+)\s+(\S*)\s+.*', re.IGNORECASE)
+    input = io.open(input_files[0], encoding='utf_8')
     for lineno, line in enumerate(input.readlines()):
         label = ""
         labelsc = ""
@@ -451,37 +590,92 @@ def formats_l10n(input_files, output, base):
         if shortcut != "":
             labelsc = label + "|" + shortcut
         if label != "":
-            print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                (relativePath(input_files[0], base), lineno+1, label)
+            print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                (relativePath(input_files[0], base), lineno+1, label), file=output)
         if labelsc != "":
-            print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                (relativePath(input_files[0], base), lineno+1, labelsc)
+            print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                (relativePath(input_files[0], base), lineno+1, labelsc), file=output)
     input.close()
     output.close()
 
 
 def encodings_l10n(input_files, output, base):
     '''Generate pot file from lib/encodings'''
-    output = open(output, 'w')
+    output = io.open(output, 'w', encoding='utf_8', newline='\n')
     # 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+.*')
-    input = open(input_files[0])
+    reg = re.compile('Encoding [\w-]+\s+[\w-]+\s+"([\w \-\(\)\[\]\/^"]*)"\s+["\w-]+\s+(fixed|variable|variableunsafe)\s+\w+.*')
+    input = io.open(input_files[0], encoding='utf_8')
     for lineno, line in enumerate(input.readlines()):
         if not line.startswith('Encoding'):
             continue
         if reg.match(line):
-            print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                (relativePath(input_files[0], base), lineno+1, reg.match(line).groups()[0])
+            guiname = reg.match(line).groups()[0]
+            if guiname != "":
+                print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                    (relativePath(input_files[0], base), lineno+1, guiname), file=output)
         else:
-            print "Error: Unable to handle line:"
-            print line
+            print("Error: Unable to handle line:")
+            print(line)
             # No need to abort if the parsing fails
             # sys.exit(1)
     input.close()
     output.close()
 
 
+def examples_templates_l10n(input_files, output, base):
+  '''Generate pot file from lib/templates and lib/examples'''
+  output = io.open(output, 'w', encoding='utf_8', newline='\n')
+  # only record each item once
+  seen = []
+  for src in input_files:
+      parseExamplesTemplates(src, seen, output)
+  output.close()
+
+
+def parseExamplesTemplates(file, seen, output):
+  # Recursively iterate over subdirectories
+  if os.path.isdir(file):
+      for sfile in glob.glob( os.path.join(file, '*') ):
+          parseExamplesTemplates(sfile, seen, output)
+
+  filename = os.path.normpath(os.path.realpath(file)).split(os.sep)[-1]
+  if os.path.isfile(file):
+      if filename[-4:] != ".lyx":
+          return
+      filename = filename[:-4]
+  if seen.count(filename) or filename[0].islower():
+      return
+
+  seen.append(filename)
+  if filename != "":
+      print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                (relativePath(input_files[0], base), 0, filename.replace('_', ' ').replace('%26', '&').replace('%28', '(').replace('%29', ')')), file=output)
+
+
+def tabletemplates_l10n(input_files, output, base):
+  '''Generate pot file from lib/tabletemplates '''
+  output = io.open(output, 'w', encoding='utf_8', newline='\n')
+  # only record each item once
+  seen = []
+  for file in input_files:
+      filename = os.path.normpath(os.path.realpath(file)).split(os.sep)[-1]
+      if os.path.isfile(file):
+          if filename[-4:] != ".lyx":
+              continue
+          filename = filename[:-4]
+          if filename[-4:-1] == "_1x":
+              continue
+          if seen.count(filename):
+              continue
+
+      seen.append(filename)
+      if filename != "":
+          print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                    (relativePath(input_files[0], base), 0, filename.replace('_', ' ')), file=output)
+  output.close()
+  
+
 
 Usage = '''
 lyx_pot.py [-b|--base top_src_dir] [-o|--output output_file] [-h|--help] [-s|src_file filename] -t|--type input_type input_files
@@ -497,11 +691,14 @@ where
         ui: lib/ui/*
         layouts: lib/layouts/*
         layouttranslations: create lib/layouttranslations from po/*.po and lib/layouts/*
-        qt4: qt4 ui files
+        qt: qt ui files
         languages: file lib/languages
+        latexfonts: file lib/latexfonts
         encodings: file lib/encodings
-        external: external templates file
+        external: external templates files
         formats: formats predefined in lib/configure.py
+        examples_templates: example and template files
+        tabletemplates: table template files
 '''
 
 if __name__ == '__main__':
@@ -514,7 +711,7 @@ if __name__ == '__main__':
         ['help', 'type=', 'output=', 'base=', 'src_file='])
     for (opt, value) in optlist:
         if opt in ['-h', '--help']:
-            print Usage
+            print(Usage)
             sys.exit(0)
         elif opt in ['-o', '--output']:
             output = value
@@ -523,29 +720,40 @@ if __name__ == '__main__':
         elif opt in ['-t', '--type']:
             input_type = value
         elif opt in ['-s', '--src_file']:
-            input_files = [f.strip() for f in open(value)]
+            input_files = [f.strip() for f in io.open(value, encoding='utf_8')]
 
-    if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt4', 'languages', 'encodings', 'external', 'formats'] or output is None:
-        print 'Wrong input type or output filename.'
+    if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt', 'languages', 'latexfonts', 'encodings', 'external', 'formats', 'examples_templates', 'tabletemplates'] or output is None:
+        print('Wrong input type or output filename.')
         sys.exit(1)
 
     input_files += args
 
+    # Ensure a unique sorting of input files and ignore the order in which they
+    # are given on the command line. This is important to avoid huge
+    # pseudo-diffs in the generated .pot file which would then end up in the
+    # .po files as well. We had this situation for years with people using
+    # different build systems to remerge .po files.
+    input_files.sort()
+
     if input_type == 'ui':
         ui_l10n(input_files, output, base)
+    elif input_type == 'latexfonts':
+        latexfonts_l10n(input_files, output, base)
     elif input_type == 'layouts':
         layouts_l10n(input_files, output, base, False)
     elif input_type == 'layouttranslations':
         layouts_l10n(input_files, output, base, True)
-    elif input_type == 'qt4':
-        qt4_l10n(input_files, output, base)
+    elif input_type == 'qt':
+        qt_l10n(input_files, output, base)
     elif input_type == 'external':
         external_l10n(input_files, output, base)
     elif input_type == 'formats':
         formats_l10n(input_files, output, base)
     elif input_type == 'encodings':
         encodings_l10n(input_files, output, base)
+    elif input_type == 'examples_templates':
+        examples_templates_l10n(input_files, output, base)
+    elif input_type == 'tabletemplates':
+        tabletemplates_l10n(input_files, output, base)
     else:
         languages_l10n(input_files, output, base)
-
-