X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Flyx_pot.py;h=ca97416299bc8097495fc80758502421ae84ef01;hb=4cfc110d4aeb28c4d570ec47ab1607ad7672e792;hp=8b397c89504f88fddbf4f8e63a97034d8010f52b;hpb=29d48665fa5099efedfe6bc1f40a10bfeef3bbc2;p=lyx.git diff --git a/po/lyx_pot.py b/po/lyx_pot.py index 8b397c8950..ca97416299 100755 --- a/po/lyx_pot.py +++ b/po/lyx_pot.py @@ -80,31 +80,33 @@ def layouts_l10n(input_files, output, base, layouttranslations): '''Generate pot file from lib/layouts/*.{layout,inc,module}''' 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*$', 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*$', re.IGNORECASE) - Tooltip = re.compile(r'^[^#]*Tooltip\S*\s+(.*)\s*$', re.IGNORECASE) - GuiName = re.compile(r'^\s*GuiName\s+(.*)\s*$', re.IGNORECASE) - ListName = re.compile(r'^\s*ListName\s+(.*)\s*$', re.IGNORECASE) - CategoryName = re.compile(r'^\s*Category\s+(.*)\s*$', re.IGNORECASE) + 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) + 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*$', 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+"?(.*)"?\s*$', re.IGNORECASE) CiteFormat = re.compile(r'^\s*CiteFormat', re.IGNORECASE) - KeyVal = re.compile(r'^\s*_\w+\s+(.*)\s*$') + KeyVal = re.compile(r'^\s*_\w+\s+(.*\S)\s*$') Float = re.compile(r'^\s*Float\s*$', re.IGNORECASE) - UsesFloatPkg = re.compile(r'^\s*UsesFloatPkg\s+(.*)\s*$', re.IGNORECASE) - IsPredefined = re.compile(r'^\s*IsPredefined\s+(.*)\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*$', re.IGNORECASE) + Translation = re.compile(r'^\s*Translation\s+(.*\S)\s*$', re.IGNORECASE) KeyValPair = re.compile(r'\s*"(.*)"\s+"(.*)"') oldlanguages = [] @@ -237,6 +239,12 @@ def layouts_l10n(input_files, output, base, 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 = MenuString.search(line) if res != None: string = res.group(1) if not layouttranslations: @@ -280,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)) @@ -322,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 != '': @@ -389,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')) @@ -560,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'):