X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Flyx_pot.py;h=226e6ecf859feaac32c8d7c6788d76e9cc9883d6;hb=0c8eea0fe526e17c75c524c0eacdacfd78d8d7b2;hp=500185fdba6a38a5f3c49bf74c4226c117d67dc4;hpb=262ae8264abe38dea41bff6e384e27cffc76bd3b;p=lyx.git

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 500185fdba..226e6ecf85 100755
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # file lyx_pot.py
@@ -18,7 +18,7 @@
 #
 from __future__ import print_function
 
-import sys, os, re, getopt
+import glob, sys, os, re, getopt
 import io
 
 def relativePath(path, base):
@@ -44,9 +44,10 @@ def writeString(outfile, infile, basefile, lineno, string):
 
 def ui_l10n(input_files, output, base):
     '''Generate pot file from lib/ui/*'''
-    output = io.open(output, 'w', encoding='utf_8')
+    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)
@@ -59,6 +60,8 @@ def ui_l10n(input_files, output, base):
                 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):
@@ -78,23 +81,24 @@ def ui_l10n(input_files, output, base):
 
 
 def layouts_l10n(input_files, output, base, layouttranslations):
-    '''Generate pot file from lib/layouts/*.{layout,inc,module}'''
+    '''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+(\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*#DescriptionBegin\s*$', 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)
@@ -102,7 +106,8 @@ def layouts_l10n(input_files, output, base, layouttranslations):
     I18nString = re.compile(r'_\(([^\)]+)\)')
     CounterFormat = re.compile(r'^\s*PrettyFormat\s+"?(.*)"?\s*$', re.IGNORECASE)
     CiteFormat = re.compile(r'^\s*CiteFormat', re.IGNORECASE)
-    KeyVal = re.compile(r'^\s*_\w+\s+(.*\S)\s*$')
+    # Note: preceding and trailing space in the val below matters
+    KeyVal = re.compile(r'^\s*_\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)
@@ -166,7 +171,10 @@ def layouts_l10n(input_files, output, base, layouttranslations):
         if 'wa' in languages:
             languages.remove('wa')
 
-    out = io.open(output, 'w', encoding='utf_8')
+    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
@@ -226,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:
@@ -433,7 +447,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
 
 def qt4_l10n(input_files, output, base):
     '''Generate pot file from src/frontends/qt4/ui/*.ui'''
-    output = io.open(output, 'w', encoding='utf_8')
+    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:
@@ -462,7 +476,7 @@ def qt4_l10n(input_files, output, base):
 
 def languages_l10n(input_files, output, base):
     '''Generate pot file from lib/languages'''
-    out = io.open(output, 'w', encoding='utf_8')
+    out = io.open(output, 'w', encoding='utf_8', newline='\n')
     GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
 
     for src in input_files:
@@ -482,7 +496,7 @@ def languages_l10n(input_files, output, base):
 
 def latexfonts_l10n(input_files, output, base):
     '''Generate pot file from lib/latexfonts'''
-    out = io.open(output, 'w', encoding='utf_8')
+    out = io.open(output, 'w', encoding='utf_8', newline='\n')
     GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
 
     for src in input_files:
@@ -501,8 +515,8 @@ def latexfonts_l10n(input_files, output, base):
 
 
 def external_l10n(input_files, output, base):
-    '''Generate pot file from lib/external_templates'''
-    output = io.open(output, 'w', encoding='utf_8')
+    '''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)
@@ -529,6 +543,8 @@ def external_l10n(input_files, output, base):
                 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(u'#: %s:%d\nmsgid ""\n"%s\\n"' % \
                             (relativePath(src, base), lineno+1, help_string), file=output)
@@ -536,6 +552,10 @@ def external_l10n(input_files, output, base):
                     elif 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 = ''
@@ -551,7 +571,7 @@ def external_l10n(input_files, output, base):
 
 def formats_l10n(input_files, output, base):
     '''Generate pot file from configure.py'''
-    output = io.open(output, 'w', encoding='utf_8')
+    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')
@@ -581,17 +601,19 @@ def formats_l10n(input_files, output, base):
 
 def encodings_l10n(input_files, output, base):
     '''Generate pot file from lib/encodings'''
-    output = io.open(output, 'w', encoding='utf_8')
+    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|variableunsafe)\s+\w+.*')
+    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(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                (relativePath(input_files[0], base), lineno+1, reg.match(line).groups()[0]), file=output)
+            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)
@@ -601,6 +623,37 @@ def encodings_l10n(input_files, output, base):
     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 = []
+  inputfs = input_files[0].split()
+  for src in inputfs:
+      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 = 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('_', ' ')), file=output)
+
+
 
 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
@@ -620,8 +673,9 @@ where
         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
 '''
 
 if __name__ == '__main__':
@@ -645,12 +699,19 @@ if __name__ == '__main__':
         elif opt in ['-s', '--src_file']:
             input_files = [f.strip() for f in io.open(value, encoding='utf_8')]
 
-    if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt4', 'languages', 'latexfonts', 'encodings', 'external', 'formats'] or output is None:
+    if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt4', 'languages', 'latexfonts', 'encodings', 'external', 'formats', 'examples_templates'] 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':
@@ -667,7 +728,7 @@ if __name__ == '__main__':
         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)
     else:
         languages_l10n(input_files, output, base)
-
-