X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx_2_2.py;h=c1fe09857122789cf69538715e796b366ddd8cd8;hb=5cb5d2cb5a5c369cabcb784899f4a00c7eaf6aa3;hp=3a10566757a17943004afb5a6cda19eb89f6da43;hpb=5239a27bfcd513b1ab0e6ff20e488db372f16236;p=lyx.git diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py index 3a10566757..c1fe098571 100644 --- a/lib/lyx2lyx/lyx_2_2.py +++ b/lib/lyx2lyx/lyx_2_2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # This file is part of lyx2lyx # -*- coding: utf-8 -*- -# Copyright (C) 2011 The LyX team +# Copyright (C) 2015 The LyX team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -30,7 +30,8 @@ import sys, os # find_token_backwards, is_in_inset, get_value, get_quoted_value, \ # del_token, check_token, get_option_value -from lyx2lyx_tools import add_to_preamble, put_cmd_in_ert, lyx2latex#, \ +from lyx2lyx_tools import add_to_preamble, put_cmd_in_ert, get_ert, lyx2latex, \ + lyx2verbatim, length_in_bp, convert_info_insets # insert_to_preamble, latex_length, revert_flex_inset, \ # revert_font_attrs, hex2ratio, str2bool @@ -38,12 +39,101 @@ from parser_tools import find_token, find_token_backwards, find_re, \ find_end_of_inset, find_end_of_layout, find_nonempty_line, \ get_containing_layout, get_value, check_token +#################################################################### +# Private helper functions + +def revert_Argument_to_TeX_brace(document, line, endline, n, nmax, environment, opt, nolastopt): + ''' + Reverts an InsetArgument to TeX-code + usage: + revert_Argument_to_TeX_brace(document, LineOfBegin, LineOfEnd, StartArgument, EndArgument, isEnvironment, isOpt, notLastOpt) + LineOfBegin is the line of the \begin_layout or \begin_inset statement + LineOfEnd is the line of the \end_layout or \end_inset statement, if "0" is given, the end of the file is used instead + StartArgument is the number of the first argument that needs to be converted + EndArgument is the number of the last argument that needs to be converted or the last defined one + isEnvironment must be true, if the layout is for a LaTeX environment + isOpt must be true, if the argument is an optional one + notLastOpt must be true if the argument is mandatory and followed by optional ones + ''' + lineArg = 0 + wasOpt = False + while lineArg != -1 and n < nmax + 1: + lineArg = find_token(document.body, "\\begin_inset Argument " + str(n), line) + if lineArg > endline and endline != 0: + return wasOpt + if lineArg != -1: + beginPlain = find_token(document.body, "\\begin_layout Plain Layout", lineArg) + # we have to assure that no other inset is in the Argument + beginInset = find_token(document.body, "\\begin_inset", beginPlain) + endInset = find_token(document.body, "\\end_inset", beginPlain) + k = beginPlain + 1 + l = k + while beginInset < endInset and beginInset != -1: + beginInset = find_token(document.body, "\\begin_inset", k) + endInset = find_token(document.body, "\\end_inset", l) + k = beginInset + 1 + l = endInset + 1 + if environment == False: + if opt == False: + if nolastopt == False: + document.body[endInset - 2 : endInset + 1] = put_cmd_in_ert("}{") + else: + document.body[endInset - 2 : endInset + 1] = put_cmd_in_ert("}") + del(document.body[lineArg : beginPlain + 1]) + wasOpt = False + else: + document.body[endInset - 2 : endInset + 1] = put_cmd_in_ert("]") + document.body[lineArg : beginPlain + 1] = put_cmd_in_ert("[") + wasOpt = True + else: + if opt == False: + document.body[endInset - 2 : endInset + 1] = put_cmd_in_ert("}") + document.body[lineArg : beginPlain + 1] = put_cmd_in_ert("{") + wasOpt = False + else: + document.body[endInset - 2 : endInset + 1] = put_cmd_in_ert("]") + document.body[lineArg : beginPlain + 1] = put_cmd_in_ert("[") + wasOpt = True + n += 1 + return wasOpt + + ############################################################################### ### ### Conversion and reversion routines ### ############################################################################### +def convert_longtable_label_internal(document, forward): + """ + Convert reference to "LongTableNoNumber" into "Unnumbered" if forward is True + else revert it. + """ + old_reference = "\\begin_inset Caption LongTableNoNumber" + new_reference = "\\begin_inset Caption Unnumbered" + + # if the purpose is to revert swap the strings roles + if not forward: + old_reference, new_reference = new_reference, old_reference + + i = 0 + while True: + i = find_token(document.body, old_reference, i) + + if i == -1: + return + + document.body[i] = new_reference + + +def convert_longtable_label(document): + convert_longtable_label_internal(document, True) + + +def revert_longtable_label(document): + convert_longtable_label_internal(document, False) + + def convert_separator(document): """ Convert layout separators to separator insets and add (LaTeX) paragraph @@ -63,7 +153,7 @@ def convert_separator(document): } i = 0 - while 1: + while True: i = find_token(document.body, "\\begin_deeper", i) if i == -1: break @@ -85,7 +175,7 @@ def convert_separator(document): i = i + 1 i = 0 - while 1: + while True: i = find_token(document.body, "\\align", i) if i == -1: break @@ -118,7 +208,7 @@ def convert_separator(document): regexp = re.compile(r'^\\begin_layout (?:(-*)|(\s*))(Separator|EndOfSlide)(?:(-*)|(\s*))$', re.IGNORECASE) i = 0 - while 1: + while True: i = find_re(document.body, regexp, i) if i == -1: return @@ -159,7 +249,7 @@ def revert_separator(document): "", "\\end_inset", ""] i = 0 - while 1: + while True: i = find_token(document.body, "\\begin_inset Separator", i) if i == -1: return @@ -244,6 +334,46 @@ def revert_separator(document): i = i + 1 +def convert_parbreak(document): + """ + Convert parbreak separators not specifically used to separate + environments to latexpar separators. + """ + parbreakinset = "\\begin_inset Separator parbreak" + i = 0 + while True: + i = find_token(document.body, parbreakinset, i) + if i == -1: + return + lay = get_containing_layout(document.body, i) + if lay == False: + document.warning("Malformed LyX document: Can't convert separator inset at line " + str(i)) + i += 1 + continue + if lay[0] == "Standard": + # Convert only if not alone in the paragraph + k1 = find_nonempty_line(document.body, lay[1] + 1, i + 1) + k2 = find_nonempty_line(document.body, i + 1, lay[2]) + if (k1 < i) or (k2 > i + 1) or not check_token(document.body[i], parbreakinset): + document.body[i] = document.body[i].replace("parbreak", "latexpar") + else: + document.body[i] = document.body[i].replace("parbreak", "latexpar") + i += 1 + + +def revert_parbreak(document): + """ + Revert latexpar separators to parbreak separators. + """ + i = 0 + while True: + i = find_token(document.body, "\\begin_inset Separator latexpar", i) + if i == -1: + return + document.body[i] = document.body[i].replace("latexpar", "parbreak") + i += 1 + + def revert_smash(document): " Set amsmath to on if smash commands are used " @@ -251,11 +381,11 @@ def revert_smash(document): i = find_token(document.header, "\\use_package amsmath", 0) if i == -1: document.warning("Malformed LyX document: Can't find \\use_package amsmath.") - return; + return value = get_value(document.header, "\\use_package amsmath", i).split()[1] if value != "1": # nothing to do if package is not auto but on or off - return; + return j = 0 while True: j = find_token(document.body, '\\begin_inset Formula', j) @@ -292,17 +422,20 @@ def revert_swissgerman(document): j = j + 1 -def revert_use_package(document, pkg, commands, oldauto): +def revert_use_package(document, pkg, commands, oldauto, supported): # oldauto defines how the version we are reverting to behaves: # if it is true, the old version uses the package automatically. # if it is false, the old version never uses the package. + # If "supported" is true, the target version also supports this + # package natively. regexp = re.compile(r'(\\use_package\s+%s)' % pkg) - i = find_re(document.header, regexp, 0) + p = find_re(document.header, regexp, 0) value = "1" # default is auto - if i != -1: - value = get_value(document.header, "\\use_package" , i).split()[1] - del document.header[i] - if value == "2": # on + if p != -1: + value = get_value(document.header, "\\use_package" , p).split()[1] + if not supported: + del document.header[p] + if value == "2" and not supported: # on add_to_preamble(document, ["\\usepackage{" + pkg + "}"]) elif value == "1" and not oldauto: # auto i = 0 @@ -318,7 +451,10 @@ def revert_use_package(document, pkg, commands, oldauto): code = "\n".join(document.body[i:j]) for c in commands: if code.find("\\%s" % c) != -1: - add_to_preamble(document, ["\\usepackage{" + pkg + "}"]) + if supported: + document.header[p] = "\\use_package " + pkg + " 2" + else: + add_to_preamble(document, ["\\usepackage{" + pkg + "}"]) return i = j @@ -331,7 +467,7 @@ mathtools_commands = ["xhookrightarrow", "xhookleftarrow", "xRightarrow", \ def revert_xarrow(document): "remove use_package mathtools" - revert_use_package(document, "mathtools", mathtools_commands, False) + revert_use_package(document, "mathtools", mathtools_commands, False, True) def revert_beamer_lemma(document): @@ -420,14 +556,7 @@ def revert_question_env(document): """ # Do we use theorems-ams-extended-bytype module? - have_mod = False - mods = document.get_module_list() - for mod in mods: - if mod == "theorems-ams-extended-bytype": - have_mod = True - continue - - if not have_mod: + if not "theorems-ams-extended-bytype" in document.get_module_list(): return consecutive = False @@ -491,7 +620,7 @@ def convert_dashes(document): while i < len(document.body): words = document.body[i].split() if len(words) > 1 and words[0] == "\\begin_inset" and \ - words[1] in ["CommandInset", "ERT", "External", "Formula", "Graphics", "IPA", "listings"]: + words[1] in ["CommandInset", "ERT", "External", "Formula", "FormulaMacro", "Graphics", "IPA", "listings"]: # must not replace anything in insets that store LaTeX contents in .lyx files # (math and command insets withut overridden read() and write() methods # filtering out IPA makes Text::readParToken() more simple @@ -503,6 +632,10 @@ def convert_dashes(document): else: i = j continue + if len(words) > 0 and words[0] in ["\\leftindent", "\\paragraph_spacing", "\\align", "\\labelwidthstring"]: + # skip paragraph parameters (bug 10243) + i += 1 + continue while True: j = document.body[i].find("--") if j == -1: @@ -667,7 +800,7 @@ def convert_specialchar_internal(document, forward): else: i = j continue - for key, value in specialchars.iteritems(): + for key, value in specialchars.items(): if forward: document.body[i] = document.body[i].replace("\\SpecialChar " + key, "\\SpecialChar " + value) document.body[i] = document.body[i].replace("\\SpecialCharNoPassThru " + key, "\\SpecialCharNoPassThru " + value) @@ -732,15 +865,7 @@ def revert_sigplan_doi(document): def revert_ex_itemargs(document): " Reverts \\item arguments of the example environments (Linguistics module) to TeX-code " - # Do we use the linguistics module? - have_mod = False - mods = document.get_module_list() - for mod in mods: - if mod == "linguistics": - have_mod = True - continue - - if not have_mod: + if not "linguistics" in document.get_module_list(): return i = 0 @@ -771,15 +896,7 @@ def revert_ex_itemargs(document): def revert_forest(document): " Reverts the forest environment (Linguistics module) to TeX-code " - # Do we use the linguistics module? - have_mod = False - mods = document.get_module_list() - for mod in mods: - if mod == "linguistics": - have_mod = True - continue - - if not have_mod: + if not "linguistics" in document.get_module_list(): return i = 0 @@ -799,26 +916,14 @@ def revert_forest(document): add_to_preamble(document, ["\\usepackage{forest}"]) - document.body[i:j + 1] = ["\\begin_inset ERT", "status collapsed", "", - "\\begin_layout Plain Layout", "", "\\backslash", - "begin{forest}", "\\end_layout", "", "\\begin_layout Plain Layout", - content, "\\end_layout", "", "\\begin_layout Plain Layout", - "\\backslash", "end{forest}", "", "\\end_layout", "", "\\end_inset"] + document.body[i:j + 1] = put_cmd_in_ert("\\begin{forest}" + content + "\\end{forest}") # no need to reset i def revert_glossgroup(document): " Reverts the GroupGlossedWords inset (Linguistics module) to TeX-code " - # Do we use the linguistics module? - have_mod = False - mods = document.get_module_list() - for mod in mods: - if mod == "linguistics": - have_mod = True - continue - - if not have_mod: + if not "linguistics" in document.get_module_list(): return i = 0 @@ -834,8 +939,7 @@ def revert_glossgroup(document): beginPlain = find_token(document.body, "\\begin_layout Plain Layout", i) endPlain = find_end_of_layout(document.body, beginPlain) - content = lyx2latex(document, document.body[beginPlain : endPlain]) - document.warning("content: %s" % content) + content = lyx2verbatim(document, document.body[beginPlain : endPlain]) document.body[i:j + 1] = ["{", "", content, "", "}"] # no need to reset i @@ -844,15 +948,7 @@ def revert_glossgroup(document): def revert_newgloss(document): " Reverts the new Glosse insets (Linguistics module) to the old format " - # Do we use the linguistics module? - have_mod = False - mods = document.get_module_list() - for mod in mods: - if mod == "linguistics": - have_mod = True - continue - - if not have_mod: + if not "linguistics" in document.get_module_list(): return glosses = ("\\begin_inset Flex Glosse", "\\begin_inset Flex Tri-Glosse") @@ -878,7 +974,7 @@ def revert_newgloss(document): i += 1 continue argendPlain = find_end_of_inset(document.body, argbeginPlain) - argcontent = lyx2latex(document, document.body[argbeginPlain : argendPlain - 2]) + argcontent = lyx2verbatim(document, document.body[argbeginPlain : argendPlain - 2]) document.body[j:j] = ["", "\\begin_layout Plain Layout","\\backslash", "glt ", argcontent, "\\end_layout"] @@ -891,24 +987,41 @@ def revert_newgloss(document): beginPlain = find_token(document.body, "\\begin_layout Plain Layout", i) endPlain = find_end_of_layout(document.body, beginPlain) - content = lyx2latex(document, document.body[beginPlain : endPlain]) + content = lyx2verbatim(document, document.body[beginPlain : endPlain]) document.body[beginPlain + 1:endPlain] = [content] i = beginPlain + 1 + # Dissolve ERT insets + for glosse in glosses: + i = 0 + while True: + i = find_token(document.body, glosse, i) + if i == -1: + break + j = find_end_of_inset(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of Glosse inset") + i += 1 + continue + while True: + ert = find_token(document.body, "\\begin_inset ERT", i, j) + if ert == -1: + break + ertend = find_end_of_inset(document.body, ert) + if ertend == -1: + document.warning("Malformed LyX document: Can't find end of ERT inset") + ert += 1 + continue + ertcontent = get_ert(document.body, ert, True) + document.body[ert : ertend + 1] = [ertcontent] + i += 1 + def convert_newgloss(document): " Converts Glosse insets (Linguistics module) to the new format " - # Do we use the linguistics module? - have_mod = False - mods = document.get_module_list() - for mod in mods: - if mod == "linguistics": - have_mod = True - continue - - if not have_mod: + if not "linguistics" in document.get_module_list(): return glosses = ("\\begin_inset Flex Glosse", "\\begin_inset Flex Tri-Glosse") @@ -1021,13 +1134,30 @@ def convert_origin(document): i = find_token(document.header, "\\textclass ", 0) if i == -1: document.warning("Malformed LyX document: No \\textclass!!") - return; - if document.dir == "": - origin = "stdin" + return + if document.dir == u'': + origin = u'stdin' else: - origin = document.dir.replace('\\', '/') + '/' - if os.name != 'nt': - origin = unicode(origin, sys.getfilesystemencoding()) + relpath = u'' + if document.systemlyxdir and document.systemlyxdir != u'': + try: + if os.path.isabs(document.dir): + absdir = os.path.normpath(document.dir) + else: + absdir = os.path.normpath(os.path.abspath(document.dir)) + if os.path.isabs(document.systemlyxdir): + abssys = os.path.normpath(document.systemlyxdir) + else: + abssys = os.path.normpath(os.path.abspath(document.systemlyxdir)) + relpath = os.path.relpath(absdir, abssys) + if relpath.find(u'..') == 0: + relpath = u'' + except: + relpath = u'' + if relpath == u'': + origin = document.dir.replace(u'\\', u'/') + u'/' + else: + origin = os.path.join(u"/systemlyxdir", relpath).replace(u'\\', u'/') + u'/' document.header[i:i] = ["\\origin " + origin] @@ -1037,7 +1167,7 @@ def revert_origin(document): i = find_token(document.header, "\\origin ", 0) if i == -1: document.warning("Malformed LyX document: No \\origin!!") - return; + return del document.header[i] @@ -1046,12 +1176,11 @@ color_names = ["brown", "darkgray", "gray", \ "pink", "purple", "teal", "violet"] def revert_textcolor(document): - " revert new \texcolor colors to TeX code " + " revert new \\textcolor colors to TeX code " i = 0 j = 0 xcolor = False - add_to_preamble(document, ["\\@ifundefined{rangeHsb}{\\usepackage{xcolor}}"]) while True: i = find_token(document.body, "\\color ", i) if i == -1: @@ -1062,7 +1191,7 @@ def revert_textcolor(document): # register that xcolor must be loaded in the preamble if xcolor == False: xcolor = True - add_to_preamble(document, ["\\@ifundefined{rangeHsb}{\usepackage{xcolor}}"]) + add_to_preamble(document, ["\\@ifundefined{rangeHsb}{\\usepackage{xcolor}}{}"]) # find the next \\color and/or the next \\end_layout j = find_token(document.body, "\\color", i + 1) k = find_token(document.body, "\\end_layout", i + 1) @@ -1094,34 +1223,66 @@ def convert_colorbox(document): def revert_colorbox(document): " outputs color settings for boxes as TeX code " - i = 0 + binset = 0 defaultframecolor = "black" defaultbackcolor = "none" while True: - i = find_token(document.body, "framecolor", i) - if i == -1: + binset = find_token(document.body, "\\begin_inset Box", binset) + if binset == -1: return - # read out the values - beg = document.body[i].find('"'); - end = document.body[i].rfind('"'); - framecolor = document.body[i][beg+1:end]; - beg = document.body[i+1].find('"'); - end = document.body[i+1].rfind('"'); - backcolor = document.body[i+1][beg+1:end]; - # delete the specification - del document.body[i:i+2] + + einset = find_end_of_inset(document.body, binset) + if einset == -1: + document.warning("Malformed LyX document: Can't find end of box inset!") + binset += 1 + continue + + blay = find_token(document.body, "\\begin_layout", binset, einset) + if blay == -1: + document.warning("Malformed LyX document: Can't find start of layout!") + binset = einset + continue + + # doing it this way, we make sure only to find a framecolor option + frame = find_token(document.body, "framecolor", binset, blay) + if frame == -1: + binset = einset + continue + + beg = document.body[frame].find('"') + end = document.body[frame].rfind('"') + framecolor = document.body[frame][beg + 1 : end] + + # this should be on the next line + bgcolor = frame + 1 + beg = document.body[bgcolor].find('"') + end = document.body[bgcolor].rfind('"') + backcolor = document.body[bgcolor][beg + 1 : end] + + # delete those bits + del document.body[frame : frame + 2] + # adjust end of inset + einset -= 2 + + if document.body[binset] == "\\begin_inset Box Boxed" and \ + framecolor != defaultframecolor: + document.body[binset] = "\\begin_inset Box Frameless" + # output TeX code # first output the closing brace - if framecolor != defaultframecolor or backcolor != defaultbackcolor: - document.body[i + 9 : i + 9] = put_cmd_in_ert("}") - # now output the box commands - if framecolor != defaultframecolor or backcolor != defaultbackcolor: - document.body[i - 14 : i - 14] = put_cmd_in_ert("{") - if framecolor != defaultframecolor: - document.body[i - 9 : i - 8] = ["\\backslash fboxcolor{" + framecolor + "}{" + backcolor + "}{"] - if backcolor != defaultbackcolor and framecolor == defaultframecolor: - document.body[i - 9 : i - 8] = ["\\backslash colorbox{" + backcolor + "}{"] - i = i + 11 + if framecolor == defaultframecolor and backcolor == defaultbackcolor: + # nothing needed + pass + else: + # we also neeed to load xcolor in the preamble but only once + add_to_preamble(document, ["\\@ifundefined{rangeHsb}{\\usepackage{xcolor}}{}"]) + document.body[einset + 1 : einset + 1] = put_cmd_in_ert("}") + if framecolor != defaultframecolor: + document.body[binset:binset] = put_cmd_in_ert("\\fcolorbox{" + framecolor + "}{" + backcolor + "}{") + else: + document.body[binset:binset] = put_cmd_in_ert("\\colorbox{" + backcolor + "}{") + + binset = einset def revert_mathmulticol(document): @@ -1338,7 +1499,6 @@ def revert_jss(document): h = find_token(document.body, "\\begin_inset Flex Code Chunk", h) if h != -1: endh = find_end_of_inset(document.body, h) - document.body[endh + 1 : endh] = ["\\end_layout"] document.body[endh : endh + 1] = put_cmd_in_ert("\\end{CodeChunk}") document.body[h : h + 3] = put_cmd_in_ert("\\begin{CodeChunk}") document.body[h - 1 : h] = ["\\begin_layout Standard"] @@ -1470,6 +1630,661 @@ def revert_subref(document): i += 1 +def convert_nounzip(document): + " remove the noUnzip parameter of graphics insets " + + rx = re.compile(r'\s*noUnzip\s*$') + i = 0 + while True: + i = find_token(document.body, "\\begin_inset Graphics", i) + if i == -1: + break + j = find_end_of_inset(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of graphics inset at line " + str(i)) + i += 1 + continue + + k = find_re(document.body, rx, i, j) + if k != -1: + del document.body[k] + j = j - 1 + i = j + 1 + + +def convert_revert_external_bbox(document, forward): + " add units to bounding box of external insets " + + rx = re.compile(r'^\s*boundingBox\s+\S+\s+\S+\s+\S+\s+\S+\s*$') + i = 0 + while True: + i = find_token(document.body, "\\begin_inset External", i) + if i == -1: + break + j = find_end_of_inset(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of external inset at line " + str(i)) + i += 1 + continue + k = find_re(document.body, rx, i, j) + if k == -1: + i = j + 1 + continue + tokens = document.body[k].split() + if forward: + for t in range(1, 5): + tokens[t] += "bp" + else: + for t in range(1, 5): + tokens[t] = length_in_bp(tokens[t]) + document.body[k] = "\tboundingBox " + tokens[1] + " " + tokens[2] + " " + \ + tokens[3] + " " + tokens[4] + i = j + 1 + + +def convert_external_bbox(document): + convert_revert_external_bbox(document, True) + + +def revert_external_bbox(document): + convert_revert_external_bbox(document, False) + + +def revert_tcolorbox_1(document): + " Reverts the Flex:Subtitle inset of tcolorbox to TeX-code " + i = -1 + while True: + i = find_token(document.header, "tcolorbox", i) + if i == -1: + break + else: + flex = 0 + flexEnd = -1 + flex = find_token(document.body, "\\begin_inset Flex Subtitle", flex) + if flex == -1: + return flexEnd + flexEnd = find_end_of_inset(document.body, flex) + wasOpt = revert_Argument_to_TeX_brace(document, flex, flexEnd, 1, 1, False, True, False) + revert_Argument_to_TeX_brace(document, flex, 0, 2, 2, False, False, False) + flexEnd = find_end_of_inset(document.body, flex) + if wasOpt == True: + document.body[flex + 0 : flex + 4] = put_cmd_in_ert("\\tcbsubtitle") + else: + document.body[flex + 0 : flex + 4] = put_cmd_in_ert("\\tcbsubtitle{") + document.body[flexEnd + 4 : flexEnd + 7] = put_cmd_in_ert("}") + flex += 1 + + +def revert_tcolorbox_2(document): + " Reverts the Flex:Raster_Color_Box inset of tcolorbox to TeX-code " + i = -1 + while True: + i = find_token(document.header, "tcolorbox", i) + if i == -1: + break + else: + flex = 0 + flexEnd = -1 + flex = find_token(document.body, "\\begin_inset Flex Raster Color Box", flex) + if flex == -1: + return flexEnd + flexEnd = find_end_of_inset(document.body, flex) + revert_Argument_to_TeX_brace(document, flex, flexEnd, 1, 1, True, True, False) + flexEnd = find_end_of_inset(document.body, flex) + document.body[flex + 0 : flex + 4] = put_cmd_in_ert("\\begin{tcbraster}") + document.body[flexEnd + 4 : flexEnd + 7] = put_cmd_in_ert("\\end{tcbraster}") + flex += 1 + + +def revert_tcolorbox_3(document): + " Reverts the Flex:Custom_Color_Box_1 inset of tcolorbox to TeX-code " + i = -1 + while True: + i = find_token(document.header, "tcolorbox", i) + if i == -1: + break + else: + flex = 0 + flexEnd = -1 + flex = find_token(document.body, "\\begin_inset Flex Custom Color Box 1", flex) + if flex == -1: + return flexEnd + flexEnd = find_end_of_inset(document.body, flex) + revert_Argument_to_TeX_brace(document, flex, flexEnd, 1, 1, True, True, False) + revert_Argument_to_TeX_brace(document, flex, 0, 2, 2, True, False, False) + flexEnd = find_end_of_inset(document.body, flex) + document.body[flex + 0 : flex + 4] = put_cmd_in_ert("\\begin{cBoxA}") + document.body[flexEnd + 4 : flexEnd + 7] = put_cmd_in_ert("{}\\end{cBoxA}") + flex += 1 + + +def revert_tcolorbox_4(document): + " Reverts the Flex:Custom_Color_Box_2 inset of tcolorbox to TeX-code " + i = -1 + while True: + i = find_token(document.header, "tcolorbox", i) + if i == -1: + break + else: + flex = 0 + flexEnd = -1 + flex = find_token(document.body, "\\begin_inset Flex Custom Color Box 2", flex) + if flex == -1: + return flexEnd + flexEnd = find_end_of_inset(document.body, flex) + revert_Argument_to_TeX_brace(document, flex, flexEnd, 1, 1, True, True, False) + revert_Argument_to_TeX_brace(document, flex, 0, 2, 2, True, False, False) + flexEnd = find_end_of_inset(document.body, flex) + document.body[flex + 0 : flex + 4] = put_cmd_in_ert("\\begin{cBoxB}") + document.body[flexEnd + 4 : flexEnd + 7] = put_cmd_in_ert("{}\\end{cBoxB}") + flex += 1 + + +def revert_tcolorbox_5(document): + " Reverts the Flex:Custom_Color_Box_3 inset of tcolorbox to TeX-code " + i = -1 + while True: + i = find_token(document.header, "tcolorbox", i) + if i == -1: + break + else: + flex = 0 + flexEnd = -1 + flex = find_token(document.body, "\\begin_inset Flex Custom Color Box 3", flex) + if flex == -1: + return flexEnd + flexEnd = find_end_of_inset(document.body, flex) + revert_Argument_to_TeX_brace(document, flex, flexEnd, 1, 1, True, True, False) + revert_Argument_to_TeX_brace(document, flex, 0, 2, 2, True, False, False) + flexEnd = find_end_of_inset(document.body, flex) + document.body[flex + 0 : flex + 4] = put_cmd_in_ert("\\begin{cBoxC}") + document.body[flexEnd + 4 : flexEnd + 7] = put_cmd_in_ert("{}\\end{cBoxC}") + flex += 1 + + +def revert_tcolorbox_6(document): + " Reverts the Flex:Custom_Color_Box_4 inset of tcolorbox to TeX-code " + i = -1 + while True: + i = find_token(document.header, "tcolorbox", i) + if i == -1: + break + else: + flex = 0 + flexEnd = -1 + flex = find_token(document.body, "\\begin_inset Flex Custom Color Box 4", flex) + if flex == -1: + return flexEnd + flexEnd = find_end_of_inset(document.body, flex) + revert_Argument_to_TeX_brace(document, flex, flexEnd, 1, 1, True, True, False) + revert_Argument_to_TeX_brace(document, flex, 0, 2, 2, True, False, False) + flexEnd = find_end_of_inset(document.body, flex) + document.body[flex + 0 : flex + 4] = put_cmd_in_ert("\\begin{cBoxD}") + document.body[flexEnd + 4 : flexEnd + 7] = put_cmd_in_ert("{}\\end{cBoxD}") + flex += 1 + + +def revert_tcolorbox_7(document): + " Reverts the Flex:Custom_Color_Box_5 inset of tcolorbox to TeX-code " + i = -1 + while True: + i = find_token(document.header, "tcolorbox", i) + if i == -1: + break + else: + flex = 0 + flexEnd = -1 + flex = find_token(document.body, "\\begin_inset Flex Custom Color Box 5", flex) + if flex == -1: + return flexEnd + flexEnd = find_end_of_inset(document.body, flex) + revert_Argument_to_TeX_brace(document, flex, flexEnd, 1, 1, True, True, False) + revert_Argument_to_TeX_brace(document, flex, 0, 2, 2, True, False, False) + flexEnd = find_end_of_inset(document.body, flex) + document.body[flex + 0 : flex + 4] = put_cmd_in_ert("\\begin{cBoxE}") + document.body[flexEnd + 4 : flexEnd + 7] = put_cmd_in_ert("{}\\end{cBoxE}") + flex += 1 + + +def revert_tcolorbox_8(document): + " Reverts the layout New Color Box Type of tcolorbox to TeX-code " + i = 0 + j = 0 + k = 0 + while True: + if i != -1: + i = find_token(document.body, "\\begin_layout New Color Box Type", i) + if i != -1: + j = find_end_of_layout(document.body, i) + wasOpt = revert_Argument_to_TeX_brace(document, i, j, 1, 1, False, True, False) + revert_Argument_to_TeX_brace(document, i, 0, 2, 2, False, False, True) + revert_Argument_to_TeX_brace(document, i, 0, 3, 4, False, True, False) + document.body[i] = document.body[i].replace("\\begin_layout New Color Box Type", "\\begin_layout Standard") + if wasOpt == True: + document.body[i + 1 : i + 1] = put_cmd_in_ert("\\newtcolorbox") + else: + document.body[i + 1 : i + 1] = put_cmd_in_ert("\\newtcolorbox{") + k = find_end_of_inset(document.body, j) + k = find_token(document.body, "\\end_inset", k + 1) + k = find_token(document.body, "\\end_inset", k + 1) + if wasOpt == True: + k = find_token(document.body, "\\end_inset", k + 1) + document.body[k + 2 : j + 2] = put_cmd_in_ert("{") + j = find_token(document.body, "\\begin_layout Standard", j + 1) + document.body[j - 2 : j - 2] = put_cmd_in_ert("}") + i += 1 + if i == -1: + return + + +def revert_moderncv_1(document): + " Reverts the new inset of moderncv to TeX-code in preamble " + + if document.textclass != "moderncv": + return + i = 0 + j = 0 + lineArg = 0 + while True: + # at first revert the new styles + # \moderncvicons + i = find_token(document.body, "\\begin_layout CVIcons", 0) + if i == -1: + return + j = find_end_of_layout(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of CVIcons layout") + i += 1 + continue + content = lyx2latex(document, document.body[i:j + 1]) + add_to_preamble(document, ["\\moderncvicons{" + content + "}"]) + del document.body[i:j + 1] + # \hintscolumnwidth + i = find_token(document.body, "\\begin_layout CVColumnWidth", 0) + if i == -1: + return + j = find_end_of_layout(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of CVColumnWidth layout") + i += 1 + continue + content = lyx2latex(document, document.body[i:j + 1]) + add_to_preamble(document, ["\\setlength{\hintscolumnwidth}{" + content + "}"]) + del document.body[i:j + 1] + # now change the new styles to the obsolete ones + # \name + i = find_token(document.body, "\\begin_layout Name", 0) + if i == -1: + return + j = find_end_of_layout(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of Name layout") + i += 1 + continue + lineArg = find_token(document.body, "\\begin_inset Argument 1", i) + if lineArg > j and j != 0: + return + if lineArg != -1: + beginPlain = find_token(document.body, "\\begin_layout Plain Layout", lineArg) + # we have to assure that no other inset is in the Argument + beginInset = find_token(document.body, "\\begin_inset", beginPlain) + endInset = find_token(document.body, "\\end_inset", beginPlain) + k = beginPlain + 1 + l = k + while beginInset < endInset and beginInset != -1: + beginInset = find_token(document.body, "\\begin_inset", k) + endInset = find_token(document.body, "\\end_inset", l) + k = beginInset + 1 + l = endInset + 1 + Arg2 = document.body[l + 5 : l + 6] + # rename the style + document.body[i : i + 1]= ["\\begin_layout FirstName"] + # delete the Argument inset + del( document.body[endInset - 2 : endInset + 3]) + del( document.body[lineArg : beginPlain + 1]) + document.body[i + 4 : i + 4]= ["\\begin_layout FamilyName"] + Arg2 + ["\\end_layout"] + [""] + + +def revert_moderncv_2(document): + " Reverts the phone inset of moderncv to the obsoleted mobile or fax " + + if document.textclass != "moderncv": + return + i = 0 + j = 0 + lineArg = 0 + while True: + # \phone + i = find_token(document.body, "\\begin_layout Phone", i) + if i == -1: + return + j = find_end_of_layout(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of Phone layout") + i += 1 + return + lineArg = find_token(document.body, "\\begin_inset Argument 1", i) + if lineArg > j and j != 0: + i += 1 + continue + if lineArg != -1: + beginPlain = find_token(document.body, "\\begin_layout Plain Layout", lineArg) + # we have to assure that no other inset is in the Argument + beginInset = find_token(document.body, "\\begin_inset", beginPlain) + endInset = find_token(document.body, "\\end_inset", beginPlain) + k = beginPlain + 1 + l = k + while beginInset < endInset and beginInset != -1: + beginInset = find_token(document.body, "\\begin_inset", k) + endInset = find_token(document.body, "\\end_inset", l) + k = beginInset + 1 + l = endInset + 1 + Arg = document.body[beginPlain + 1 : beginPlain + 2] + # rename the style + if Arg[0] == "mobile": + document.body[i : i + 1]= ["\\begin_layout Mobile"] + if Arg[0] == "fax": + document.body[i : i + 1]= ["\\begin_layout Fax"] + # delete the Argument inset + del(document.body[endInset - 2 : endInset + 1]) + del(document.body[lineArg : beginPlain + 3]) + i += 1 + + +def convert_moderncv_phone(document): + " Convert the Fax and Mobile inset of moderncv to the new phone inset " + + if document.textclass != "moderncv": + return + i = 0 + j = 0 + lineArg = 0 + + phone_dict = { + "Mobile" : "mobile", + "Fax" : "fax", + } + + rx = re.compile(r'^\\begin_layout (\S+)$') + while True: + # substitute \fax and \mobile by \phone[fax] and \phone[mobile], respectively + i = find_token(document.body, "\\begin_layout", i) + if i == -1: + return + + m = rx.match(document.body[i]) + val = "" + if m: + val = m.group(1) + if val not in list(phone_dict.keys()): + i += 1 + continue + j = find_end_of_layout(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of Mobile layout") + i += 1 + return + + document.body[i : i + 1] = ["\\begin_layout Phone", "\\begin_inset Argument 1", "status open", "", + "\\begin_layout Plain Layout", phone_dict[val], "\\end_layout", "", + "\\end_inset", ""] + + +def convert_moderncv_name(document): + " Convert the FirstName and LastName layout of moderncv to the general Name layout " + + if document.textclass != "moderncv": + return + + fnb = 0 # Begin of FirstName inset + fne = 0 # End of FirstName inset + lnb = 0 # Begin of LastName (FamilyName) inset + lne = 0 # End of LastName (FamilyName) inset + nb = 0 # Begin of substituting Name inset + ne = 0 # End of substituting Name inset + FirstName = [] # FirstName content + FamilyName = [] # LastName content + + while True: + # locate FirstName + fnb = find_token(document.body, "\\begin_layout FirstName", fnb) + if fnb != -1: + fne = find_end_of_layout(document.body, fnb) + if fne == -1: + document.warning("Malformed LyX document: Can't find end of FirstName layout") + return + FirstName = document.body[fnb + 1 : fne] + # locate FamilyName + lnb = find_token(document.body, "\\begin_layout FamilyName", lnb) + if lnb != -1: + lne = find_end_of_layout(document.body, lnb) + if lne == -1: + document.warning("Malformed LyX document: Can't find end of FamilyName layout") + return + FamilyName = document.body[lnb + 1 : lne] + # Determine the region for the substituting Name layout + if fnb == -1 and lnb == -1: # Neither FirstName nor FamilyName exists -> Do nothing + return + elif fnb == -1: # Only FamilyName exists -> New Name insets replaces that + nb = lnb + ne = lne + elif lnb == -1: # Only FirstName exists -> New Name insets replaces that + nb = fnb + ne = fne + elif fne > lne: # FirstName position before FamilyName -> New Name insets spans + nb = lnb # from FamilyName begin + ne = fne # to FirstName end + else: # FirstName position before FamilyName -> New Name insets spans + nb = fnb # from FirstName begin + ne = lne # to FamilyName end + + # Insert the substituting layout now. If FirstName exists, use an otpional argument. + if FirstName == []: + document.body[nb : ne + 1] = ["\\begin_layout Name"] + FamilyName + ["\\end_layout", ""] + else: + document.body[nb : ne + 1] = ["\\begin_layout Name", "\\begin_inset Argument 1", "status open", "", + "\\begin_layout Plain Layout"] + FirstName + ["\\end_layout", "", + "\\end_inset", ""] + FamilyName + ["\\end_layout", ""] + + +def revert_achemso(document): + " Reverts the flex inset Latin to TeX code " + + if document.textclass != "achemso": + return + i = 0 + j = 0 + while True: + i = find_token(document.body, "\\begin_inset Flex Latin", i) + if i != -1: + j = find_end_of_inset(document.body, i) + else: + return + if j != -1: + beginPlain = find_token(document.body, "\\begin_layout Plain Layout", i) + endPlain = find_end_of_layout(document.body, beginPlain) + content = lyx2latex(document, document.body[beginPlain : endPlain]) + document.body[i:j + 1] = put_cmd_in_ert("\\latin{" + content + "}") + else: + document.warning("Malformed LyX document: Can't find end of flex inset Latin") + return + i += 1 + + +fontsettings = ["\\font_roman", "\\font_sans", "\\font_typewriter", "\\font_math", \ + "\\font_sf_scale", "\\font_tt_scale"] +fontdefaults = ["default", "default", "default", "auto", "100", "100"] +fontquotes = [True, True, True, True, False, False] + +def convert_fontsettings(document): + " Duplicate font settings " + + i = find_token(document.header, "\\use_non_tex_fonts ", 0) + if i == -1: + document.warning("Malformed LyX document: No \\use_non_tex_fonts!") + use_non_tex_fonts = "false" + else: + use_non_tex_fonts = get_value(document.header, "\\use_non_tex_fonts", i) + j = 0 + for f in fontsettings: + i = find_token(document.header, f + " ", 0) + if i == -1: + document.warning("Malformed LyX document: No " + f + "!") + # we can fix that + # note that with i = -1, this will insert at the end + # of the header + value = fontdefaults[j] + else: + value = document.header[i][len(f):].strip() + if fontquotes[j]: + if use_non_tex_fonts == "true": + document.header[i:i+1] = [f + ' "' + fontdefaults[j] + '" "' + value + '"'] + else: + document.header[i:i+1] = [f + ' "' + value + '" "' + fontdefaults[j] + '"'] + else: + if use_non_tex_fonts == "true": + document.header[i:i+1] = [f + ' ' + fontdefaults[j] + ' ' + value] + else: + document.header[i:i+1] = [f + ' ' + value + ' ' + fontdefaults[j]] + j = j + 1 + + +def revert_fontsettings(document): + " Merge font settings " + + i = find_token(document.header, "\\use_non_tex_fonts ", 0) + if i == -1: + document.warning("Malformed LyX document: No \\use_non_tex_fonts!") + use_non_tex_fonts = "false" + else: + use_non_tex_fonts = get_value(document.header, "\\use_non_tex_fonts", i) + j = 0 + for f in fontsettings: + i = find_token(document.header, f + " ", 0) + if i == -1: + document.warning("Malformed LyX document: No " + f + "!") + j = j + 1 + continue + line = get_value(document.header, f, i) + if fontquotes[j]: + q1 = line.find('"') + q2 = line.find('"', q1+1) + q3 = line.find('"', q2+1) + q4 = line.find('"', q3+1) + if q1 == -1 or q2 == -1 or q3 == -1 or q4 == -1: + document.warning("Malformed LyX document: Missing quotes!") + j = j + 1 + continue + if use_non_tex_fonts == "true": + document.header[i:i+1] = [f + ' ' + line[q3+1:q4]] + else: + document.header[i:i+1] = [f + ' ' + line[q1+1:q2]] + else: + if use_non_tex_fonts == "true": + document.header[i:i+1] = [f + ' ' + line.split()[1]] + else: + document.header[i:i+1] = [f + ' ' + line.split()[0]] + j = j + 1 + + +def revert_solution(document): + " Reverts the solution environment of the theorem module to TeX code " + + # Do we use one of the modules that provides Solution? + have_mod = False + mods = document.get_module_list() + for mod in mods: + if mod == "theorems-std" or mod == "theorems-bytype" \ + or mod == "theorems-ams" or mod == "theorems-ams-bytype": + have_mod = True + break + if not have_mod: + return + + consecutive = False + is_starred = False + i = 0 + while True: + i = find_token(document.body, "\\begin_layout Solution", i) + if i == -1: + return + + is_starred = document.body[i].startswith("\\begin_layout Solution*") + if is_starred == True: + LaTeXName = "sol*" + LyXName = "Solution*" + theoremName = "newtheorem*" + else: + LaTeXName = "sol" + LyXName = "Solution" + theoremName = "newtheorem" + + j = find_end_of_layout(document.body, i) + if j == -1: + document.warning("Malformed LyX document: Can't find end of " + LyXName + " layout") + i += 1 + continue + + # if this is not a consecutive env, add start command + begcmd = [] + if not consecutive: + begcmd = put_cmd_in_ert("\\begin{%s}" % (LaTeXName)) + + # has this a consecutive theorem of same type? + consecutive = document.body[j + 2] == "\\begin_layout " + LyXName + + # if this is not followed by a consecutive env, add end command + if not consecutive: + document.body[j : j + 1] = put_cmd_in_ert("\\end{%s}" % (LaTeXName)) + ["\\end_layout"] + + document.body[i : i + 1] = ["\\begin_layout Standard", ""] + begcmd + + add_to_preamble(document, "\\theoremstyle{definition}") + if is_starred or mod == "theorems-bytype" or mod == "theorems-ams-bytype": + add_to_preamble(document, "\\%s{%s}{\\protect\\solutionname}" % \ + (theoremName, LaTeXName)) + else: # mod == "theorems-std" or mod == "theorems-ams" and not is_starred + add_to_preamble(document, "\\%s{%s}[thm]{\\protect\\solutionname}" % \ + (theoremName, LaTeXName)) + + add_to_preamble(document, "\\providecommand{\solutionname}{Solution}") + i = j + + +def revert_verbatim_star(document): + from lyx_2_1 import revert_verbatim + revert_verbatim(document, True) + + +def convert_save_props(document): + " Add save_transient_properties parameter. " + i = find_token(document.header, '\\begin_header', 0) + if i == -1: + document.warning("Malformed lyx document: Missing '\\begin_header'.") + return + document.header.insert(i + 1, '\\save_transient_properties true') + + +def revert_save_props(document): + " Remove save_transient_properties parameter. " + i = find_token(document.header, "\\save_transient_properties", 0) + if i == -1: + return + del document.header[i] + + +def convert_info_tabular_feature(document): + def f(arg): + return arg.replace("inset-modify tabular", "tabular-feature") + convert_info_insets(document, "shortcut(s)?|icon", f) + + +def revert_info_tabular_feature(document): + def f(arg): + return arg.replace("tabular-feature", "inset-modify tabular") + convert_info_insets(document, "shortcut(s)?|icon", f) + + ## # Conversion hub # @@ -1499,10 +2314,38 @@ convert = [ [492, [convert_colorbox]], [493, []], [494, []], - [495, [convert_subref]] + [495, [convert_subref]], + [496, [convert_nounzip]], + [497, [convert_external_bbox]], + [498, []], + [499, [convert_moderncv_phone, convert_moderncv_name]], + [500, []], + [501, [convert_fontsettings]], + [502, []], + [503, []], + [504, [convert_save_props]], + [505, []], + [506, [convert_info_tabular_feature]], + [507, [convert_longtable_label]], + [508, [convert_parbreak]] ] revert = [ + [507, [revert_parbreak]], + [506, [revert_longtable_label]], + [505, [revert_info_tabular_feature]], + [504, []], + [503, [revert_save_props]], + [502, [revert_verbatim_star]], + [501, [revert_solution]], + [500, [revert_fontsettings]], + [499, [revert_achemso]], + [498, [revert_moderncv_1, revert_moderncv_2]], + [497, [revert_tcolorbox_1, revert_tcolorbox_2, + revert_tcolorbox_3, revert_tcolorbox_4, revert_tcolorbox_5, + revert_tcolorbox_6, revert_tcolorbox_7, revert_tcolorbox_8]], + [496, [revert_external_bbox]], + [495, []], # nothing to do since the noUnzip parameter was optional [494, [revert_subref]], [493, [revert_jss]], [492, [revert_mathmulticol]],