X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx_2_1.py;h=84f376a52fd95698a22f145a20b8d3720e801df9;hb=e798db5739871aaa29f95de321c52f19058064c9;hp=d986493e856703e4ad044613514b9ea5caa5bede;hpb=bfc749eb237ad1db8aa899279ecf32bb4847f07a;p=lyx.git diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index d986493e85..84f376a52f 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++ b/lib/lyx2lyx/lyx_2_1.py @@ -58,7 +58,7 @@ def revert_Argument_to_TeX_brace(document, line, endline, n, nmax, environment, Reverts an InsetArgument to TeX-code usage: revert_Argument_to_TeX_brace(document, LineOfBegin, LineOfEnd, StartArgument, EndArgument, isEnvironment, isOpt) - LineOfBegin is the line of the \begin_layout or \begin_inset statement + 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 @@ -111,7 +111,7 @@ def convert_TeX_brace_to_Argument(document, line, n, nmax, inset, environment, o - { and } surround a mandatory argument of an environment usage: convert_TeX_brace_to_Argument(document, LineOfBeginLayout/Inset, StartArgument, EndArgument, isInset, isEnvironment, isOpt) - LineOfBeginLayout/Inset is the line of the \begin_layout or \begin_inset statement + LineOfBeginLayout/Inset is the line of the \\begin_layout or \\begin_inset statement StartArgument is the number of the first ERT that needs to be converted EndArgument is the number of the last ERT that needs to be converted isInset must be true, if braces inside an InsetLayout needs to be converted @@ -181,7 +181,7 @@ def convert_TeX_brace_to_Argument(document, line, n, nmax, inset, environment, o else: beginBrace = find_token(document.body, "{", endBrace, end_layout) # assure that the ERTs are consecutive (11 or 12 depending if there is a space between the ERTs or not) - if beginBrace == endBrace + 11 or beginBrace == endBrace + 12: + if beginBrance != -1 and (beginBrace == endBrace + 11 or beginBrace == endBrace + 12): end = find_token(document.body, "\\end_inset", beginBrace) document.body[lineERT : end + 1] = ["\\end_layout", "", "\\end_inset"] if loop == 1: @@ -219,6 +219,13 @@ def convert_TeX_brace_to_Argument(document, line, n, nmax, inset, environment, o else: lineERT += 1 if environment == True: + # FIXME This version of the routine does not check for and pass over + # arguments before n. So it attempts to process the argument in the + # document, no matter what has been specified. + # + # The other branch does do that, but probably that code would be better + # in a single location: Skip all those arguments, then process the ones + # we want. end_ERT = find_end_of_inset(document.body, lineERT) if end_ERT == -1: document.warning("Can't find end of ERT!!") @@ -254,6 +261,9 @@ def convert_TeX_brace_to_Argument(document, line, n, nmax, inset, environment, o document.body[lineERT2 : end2 + 1] = ["\\end_layout", "", "\\end_inset"] document.body[lineERT : end_ERT + 1] = ["\\begin_inset Argument " + str(n), "status open", "", "\\begin_layout Plain Layout"] n += 1 + else: + document.warning("Unable to process argument!") + n += 1 ############################################################################### @@ -814,41 +824,31 @@ def revert_cancel(document): revert_use_package(document, "cancel", cancel_commands, False) -def revert_verbatim(document, starred): +def revert_verbatim(document, starred = False): " Revert verbatim environments completely to TeX-code. " i = 0 consecutive = False - subst_end = ['\end_layout', '', '\\begin_layout Plain Layout', - '\end_layout', '', + + layout_name = "Verbatim" + latex_name = "verbatim" + if starred: + layout_name = "Verbatim*" + latex_name = "verbatim*" + + subst_end = ['\\end_layout', '', '\\begin_layout Plain Layout', + '\\end_layout', '', '\\begin_layout Plain Layout', '', '', '\\backslash', '', - 'end{verbatim}', + 'end{%s}' % (latex_name), '\\end_layout', '', '\\end_inset', '', '', '\\end_layout'] subst_begin = ['\\begin_layout Standard', '\\noindent', '\\begin_inset ERT', 'status open', '', '\\begin_layout Plain Layout', '', '', '\\backslash', - 'begin{verbatim}', + 'begin{%s}' % (latex_name), '\\end_layout', '', '\\begin_layout Plain Layout', ''] - if starred: - subst_end = ['\end_layout', '', '\\begin_layout Plain Layout', - '\end_layout', '', - '\\begin_layout Plain Layout', '', '', - '\\backslash', '', - 'end{verbatim*}', - '\\end_layout', '', '\\end_inset', - '', '', '\\end_layout'] - subst_begin = ['\\begin_layout Standard', '\\noindent', - '\\begin_inset ERT', 'status open', '', - '\\begin_layout Plain Layout', '', '', '\\backslash', - 'begin{verbatim*}', - '\\end_layout', '', '\\begin_layout Plain Layout', ''] - - layout_name = "Verbatim" - if starred: - layout_name = "Verbatim*" - while 1: + while True: i = find_token(document.body, "\\begin_layout %s" % (layout_name), i) if i == -1: return @@ -860,7 +860,7 @@ def revert_verbatim(document, starred): continue # delete all line breaks insets (there are no other insets) l = i - while 1: + while True: n = find_token(document.body, "\\begin_inset Newline newline", l, j) if n == -1: n = find_token(document.body, "\\begin_inset Newline linebreak", l, j) @@ -868,24 +868,29 @@ def revert_verbatim(document, starred): break m = find_end_of_inset(document.body, n) del(document.body[m:m+1]) - document.body[n:n+1] = ['\end_layout', '', '\\begin_layout Plain Layout'] + document.body[n:n+1] = ['\\end_layout', '', '\\begin_layout Plain Layout'] l += 1 # we deleted a line, so the end of the inset moved forward. + # FIXME But we also added some lines, didn't we? I think this + # should be j += 1. j -= 1 # consecutive verbatim environments need to be connected - k = find_token(document.body, "\\begin_layout Verbatim", j) + k = find_token(document.body, "\\begin_layout %s" % (layout_name), j) if k == j + 2 and consecutive == False: consecutive = True - document.body[j:j+1] = ['\end_layout', '', '\\begin_layout Plain Layout'] + document.body[j:j+1] = ['\\end_layout', '', '\\begin_layout Plain Layout'] document.body[i:i+1] = subst_begin continue if k == j + 2 and consecutive == True: - document.body[j:j+1] = ['\end_layout', '', '\\begin_layout Plain Layout'] + document.body[j:j+1] = ['\\end_layout', '', '\\begin_layout Plain Layout'] del(document.body[i:i+1]) continue if k != j + 2 and consecutive == True: document.body[j:j+1] = subst_end # the next paragraph must not be indented + # FIXME This seems to be causing problems, because of the + # hardcoded use of 19. We should figure out exactly where + # this needs to go by searching for the right tag. document.body[j+19:j+19] = ['\\noindent'] del(document.body[i:i+1]) consecutive = False @@ -893,6 +898,9 @@ def revert_verbatim(document, starred): else: document.body[j:j+1] = subst_end # the next paragraph must not be indented + # FIXME This seems to be causing problems, because of the + # hardcoded use of 19. We should figure out exactly where + # this needs to go by searching for the right tag. document.body[j+19:j+19] = ['\\noindent'] document.body[i:i+1] = subst_begin @@ -900,7 +908,7 @@ def revert_verbatim(document, starred): def revert_tipa(document): " Revert native TIPA insets to mathed or ERT. " i = 0 - while 1: + while True: i = find_token(document.body, "\\begin_inset IPA", i) if i == -1: return @@ -972,7 +980,7 @@ def revert_cell_rotation(document): finally: if load_rotating: - add_to_preamble(document, ["\\@ifundefined{turnbox}{\usepackage{rotating}}{}"]) + add_to_preamble(document, ["\\@ifundefined{turnbox}{\\usepackage{rotating}}{}"]) def convert_cell_rotation(document): @@ -1031,7 +1039,7 @@ def revert_table_rotation(document): finally: if load_rotating: - add_to_preamble(document, ["\\@ifundefined{turnbox}{\usepackage{rotating}}{}"]) + add_to_preamble(document, ["\\@ifundefined{turnbox}{\\usepackage{rotating}}{}"]) def convert_table_rotation(document): @@ -1442,6 +1450,10 @@ def revert_mdnomath(document): document.header[i] = "\\font_roman %s" % mathdesign_dict[val] +def convert_mathfonts(document): + document.header.insert(-1, "\\font_math auto") + + def convert_mdnomath(document): " Change mathdesign font name " @@ -1687,46 +1699,49 @@ def revert_latexargs(document): def revert_IEEEtran(document): - ''' - Reverts InsetArgument of - Page headings - Biography - Biography without photo - to TeX-code - ''' - if document.textclass == "IEEEtran": + ''' + Reverts InsetArgument of + Page headings + Biography + Biography without photo + to TeX-code + ''' + if document.textclass != "IEEEtran": + return + + layouts = {"Page headings": False, + "Biography without photo": True} + + for layout in list(layouts.keys()): + i = 0 + while True: + i = find_token(document.body, '\\begin_layout ' + layout, i) + if i == -1: + break + revert_Argument_to_TeX_brace(document, i, 0, 1, 1, layouts[layout], False) + i += 1 + i = 0 - i2 = 0 - j = 0 - k = 0 while True: - if i != -1: - i = find_token(document.body, "\\begin_layout Page headings", i) - if i != -1: + i = find_token(document.body, '\\begin_inset Flex Paragraph Start', i) + if i == -1: + break revert_Argument_to_TeX_brace(document, i, 0, 1, 1, False, False) i += 1 - if i2 != -1: - i2 = find_token(document.body, "\\begin_inset Flex Paragraph Start", i2) - if i2 != -1: - revert_Argument_to_TeX_brace(document, i2, 0, 1, 1, False, False) - i2 = i2 + 1 - if j != -1: - j = find_token(document.body, "\\begin_layout Biography without photo", j) - if j != -1: - revert_Argument_to_TeX_brace(document, j, 0, 1, 1, True, False) - j += 1 - if k != -1: - k = find_token(document.body, "\\begin_layout Biography", k) - kA = find_token(document.body, "\\begin_layout Biography without photo", k) - if k == kA and k != -1: - k += 1 - continue - if k != -1: + + i = 0 + while True: + i = find_token_exact(document.body, "\\begin_layout Biography", i) + if i == -1: + break + + if document.body[i] == "\\begin_layout Biography without photo": + i += 1 + continue + # start with the second argument, therefore 2 - revert_Argument_to_TeX_brace(document, k, 0, 2, 2, True, False) - k += 1 - if i == -1 and i2 == -1 and j == -1 and k == -1: - return + revert_Argument_to_TeX_brace(document, i, 0, 2, 2, True, False) + i += 1 def revert_IEEEtran_2(document): @@ -1746,41 +1761,41 @@ def revert_IEEEtran_2(document): def convert_IEEEtran(document): - ''' - Converts ERT of - Page headings - Biography - Biography without photo - to InsetArgument - ''' - if document.textclass == "IEEEtran": + ''' + Converts ERT of + Page headings + Biography + Biography without photo + to InsetArgument + ''' + if document.textclass != "IEEEtran": + return + + layouts = {"Page headings": False, + "Biography without photo": True} + + for layout in list(layouts.keys()): + i = 0 + while True: + i = find_token(document.body, '\\begin_layout ' + layout, i) + if i == -1: + break + convert_TeX_brace_to_Argument(document, i, 1, 1, False, layouts[layout], False) + i += 1 + i = 0 - j = 0 - k = 0 while True: - if i != -1: - i = find_token(document.body, "\\begin_layout Page headings", i) - if i != -1: - convert_TeX_brace_to_Argument(document, i, 1, 1, False, False, False) - i += 1 - if j != -1: - j = find_token(document.body, "\\begin_layout Biography without photo", j) - if j != -1: - convert_TeX_brace_to_Argument(document, j, 1, 1, False, True, False) - j += 1 - if k != -1: - # assure that we don't handle Biography Biography without photo - k = find_token(document.body, "\\begin_layout Biography", k) - kA = find_token(document.body, "\\begin_layout Biography without photo", k - 1) - if k == kA and k != -1: - k += 1 - continue - if k != -1: + i = find_token_exact(document.body, "\\begin_layout Biography", i) + if i == -1: + break + + if document.body[i] == "\\begin_layout Biography without photo": + i += 1 + continue + # the argument we want to convert is the second one - convert_TeX_brace_to_Argument(document, k, 2, 2, False, True, False) - k += 1 - if i == -1 and j == -1 and k == -1: - return + convert_TeX_brace_to_Argument(document, i, 2, 2, False, True, False) + i += 1 def revert_AASTeX(document): @@ -4828,7 +4843,7 @@ convert = [ [437, []], [438, []], [439, []], - [440, []], + [440, [convert_mathfonts]], [441, [convert_mdnomath]], [442, []], [443, []],