X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx_2_0.py;h=2756418f88d09afb0671878977800b6a8f525584;hb=978ecc33092206c9d3ffcead33af5442f3370a5b;hp=21af97cf6c80decdd438fbfab7d4707b61df1bf5;hpb=cff0f635cce0b5063ffeb293832df03031f9d4de;p=lyx.git diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py index 21af97cf6c..2756418f88 100644 --- a/lib/lyx2lyx/lyx_2_0.py +++ b/lib/lyx2lyx/lyx_2_0.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # This file is part of lyx2lyx # -*- coding: utf-8 -*- -# Copyright (C) 2010 The LyX team +# Copyright (C) 2011 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 @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA """ Convert files to the file format generated by lyx 2.0""" @@ -45,17 +45,6 @@ def remove_option(lines, m, option): return True -# DO NOT USE THIS ROUTINE ANY MORE. Better yet, replace the uses that -# have been made of it with uses of put_cmd_in_ert. -def old_put_cmd_in_ert(string): - for rep in unicode_reps: - string = string.replace(rep[1], rep[0].replace('\\\\', '\\')) - string = string.replace('\\', "\\backslash\n") - string = "\\begin_inset ERT\nstatus collapsed\n\\begin_layout Plain Layout\n" \ - + string + "\n\\end_layout\n\\end_inset" - return string - - ############################################################################### ### ### Conversion and reversion routines @@ -214,7 +203,7 @@ def revert_xetex(document): # 2.) check font settings # defaults - roman = sans = typew = default + roman = sans = typew = "default" osf = False sf_scale = tt_scale = 100.0 @@ -288,11 +277,11 @@ def revert_xetex(document): sf += 'Scale=' + str(sf_scale / 100.0) + ',' sf += 'Mapping=tex-text]{' + sans + '}' pretext.append(sf) - if typewriter != "default": + if typew != "default": tw = '\\setmonofont' if tt_scale != 100.0: tw += '[Scale=' + str(tt_scale / 100.0) + ']' - tw += '{' + typewriter + '}' + tw += '{' + typew + '}' pretext.append(tw) if osf: pretext.append('\\defaultfontfeatures{Numbers=OldStyle}') @@ -771,7 +760,7 @@ def revert_author_id(document): " Remove the author_id from the \\author definition " i = 0 anum = 0 - rx = re.compile(r'(\\author)\s+(\d+)\s+(\".*\")\s*(.*)$') + rx = re.compile(r'(\\author)\s+(-?\d+)\s+(\".*\")\s*(.*)$') idmap = dict() while True: @@ -994,7 +983,6 @@ def revert_multirow(document): numrows = int(numrows) numcols = int(numcols) except: - document.warning(numrows) document.warning("Unable to determine rows and columns!") begin_table = end_table continue @@ -1571,7 +1559,7 @@ def convert_use_makebox(document): i = z continue document.body.insert(k + 1, "use_makebox 0") - i = z + 1 + i = blay + 1 # not z + 1 (box insets may be nested) def revert_IEEEtran(document): @@ -1829,9 +1817,16 @@ def convert_mathdots(document): " Load mathdots automatically " i = find_token(document.header, "\\use_mhchem" , 0) if i == -1: - i = find_token(document.header, "\\use_esint" , 0) - if i != -1: - document.header.insert(i + 1, "\\use_mathdots 1") + i = find_token(document.header, "\\use_esint" , 0) + if i == -1: + document.warning("Malformed LyX document: Can't find \\use_mhchem.") + return; + j = find_token(document.preamble, "\\usepackage{mathdots}", 0) + if j == -1: + document.header.insert(i + 1, "\\use_mathdots 0") + else: + document.header.insert(i + 1, "\\use_mathdots 2") + del document.preamble[j] def revert_mathdots(document): @@ -1839,7 +1834,7 @@ def revert_mathdots(document): mathdots = find_token(document.header, "\\use_mathdots" , 0) if mathdots == -1: - document.warning("No \\usemathdots line. Assuming auto.") + document.warning("No \\use_mathdots line. Assuming auto.") else: val = get_value(document.header, "\\use_mathdots", mathdots) del document.header[mathdots] @@ -1855,7 +1850,7 @@ def revert_mathdots(document): return if usedots == 2: # force load case - add_to_preamble(["\\usepackage{mathdots}"]) + add_to_preamble(document, ["\\usepackage{mathdots}"]) return # so we are in the auto case. we want to load mathdots if \iddots is used. @@ -1978,10 +1973,17 @@ def revert_diagram(document): # only need to do it once! return +chapters = ("amsbook", "book", "docbook-book", "elsart", "extbook", "extreport", + "jbook", "jreport", "jsbook", "literate-book", "literate-report", "memoir", + "mwbk", "mwrep", "recipebook", "report", "scrbook", "scrreprt", "svmono", + "svmult", "tbook", "treport", "tufte-book") def convert_bibtex_clearpage(document): " insert a clear(double)page bibliographystyle if bibtotoc option is used " + if document.textclass not in chapters: + return + i = find_token(document.header, '\\papersides', 0) sides = 0 if i == -1: @@ -2071,9 +2073,17 @@ def convert_passthru(document): document.warning("Can't find end of layout at line " + str(beg)) beg += 1 continue + # we are now going to replace newline insets within this layout # by new instances of this layout. so we have repeated layouts # instead of newlines. + + # if the paragraph has any customization, however, we do not want to + # do the replacement. + if document.body[beg + 1].startswith("\\"): + beg = end + 1 + continue + ns = beg while True: ns = find_token(document.body, "\\begin_inset Newline newline", ns, end) @@ -2092,7 +2102,8 @@ def convert_passthru(document): # do ns properly, too newlines = (ne - ns) - len(subst) ns += newlines + 2 - end += newlines + 1 + end += newlines + 2 + # ok, we now want to find out if the next layout is the # same as this one. if so, we will insert an extra copy of it didit = False @@ -2217,7 +2228,6 @@ def revert_multirowOffset(document): numrows = int(numrows) numcols = int(numcols) except: - document.warning(numrows) document.warning("Unable to determine rows and columns!") begin_table = end_table continue @@ -2397,6 +2407,52 @@ def revert_labeling(document): document.body[i] = "\\begin_layout List" +def revert_langpack(document): + " revert \\language_package parameter " + i = 0 + i = find_token(document.header, "\\language_package", 0) + if i == -1: + document.warning("Malformed document. No \\language_package param!") + return + + del document.header[i] + + +def convert_langpack(document): + " Add \\language_package parameter " + i = find_token(document.header, "\language" , 0) + if i == -1: + document.warning("Malformed document. No \\language defined!") + return + + document.header.insert(i + 1, "\\language_package default") + + +def revert_tabularwidth(document): + i = 0 + while True: + i = find_token(document.body, "\\begin_inset Tabular", i) + if i == -1: + return + j = find_end_of_inset(document.body, i) + if j == -1: + document.warning("Unable to find end of Tabular inset at line " + str(i)) + i += 1 + continue + i += 1 + features = find_token(document.body, "