X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx_2_0.py;h=7914cc499542c9f1359fd52dd9767b7414677dfe;hb=7158f7b58d81e89c8e0dcd3a6eb8a53b89dc2619;hp=56cd8e0f44afbdeb7cfcdce9b0ad10e1904d6d35;hpb=f27d5aa9ae5f3f89c4e2923dae1592a116988906;p=lyx.git diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py index 56cd8e0f44..7914cc4995 100644 --- a/lib/lyx2lyx/lyx_2_0.py +++ b/lib/lyx2lyx/lyx_2_0.py @@ -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}') @@ -328,11 +317,33 @@ def revert_backgroundcolor(document): '\\pagecolor{page_backgroundcolor}']) -def revert_splitindex(document): - " Reverts splitindex-aware documents " +def add_use_indices(document): + " Add \\use_indices if it is missing " i = find_token(document.header, '\\use_indices', 0) + if i != -1: + return i + i = find_token(document.header, '\\use_bibtopic', 0) + if i == -1: + i = find_token(document.header, '\\cite_engine', 0) + if i == -1: + i = find_token(document.header, '\\use_mathdots', 0) + if i == -1: + i = find_token(document.header, '\\use_mhchem', 0) + if i == -1: + i = find_token(document.header, '\\use_esint', 0) + if i == -1: + i = find_token(document.header, '\\use_amsmath', 0) if i == -1: document.warning("Malformed LyX document: Missing \\use_indices.") + return -1 + document.header.insert(i + 1, '\\use_indices 0') + return i + 1 + + +def revert_splitindex(document): + " Reverts splitindex-aware documents " + i = add_use_indices(document) + if i == -1: return useindices = str2bool(get_value(document.header, "\\use_indices", i)) del document.header[i] @@ -409,6 +420,7 @@ def revert_splitindex(document): def convert_splitindex(document): " Converts index and printindex insets to splitindex-aware format " + add_use_indices(document) i = 0 while True: i = find_token(document.body, "\\begin_inset Index", i) @@ -433,9 +445,8 @@ def convert_splitindex(document): def revert_subindex(document): " Reverts \\printsubindex CommandInset types " - i = find_token(document.header, '\\use_indices', 0) + i = add_use_indices(document) if i == -1: - document.warning("Malformed LyX document: Missing \\use_indices.") return useindices = str2bool(get_value(document.header, "\\use_indices", i)) i = 0 @@ -459,9 +470,8 @@ def revert_subindex(document): def revert_printindexall(document): " Reverts \\print[sub]index* CommandInset types " - i = find_token(document.header, '\\use_indices', 0) + i = add_use_indices(document) if i == -1: - document.warning("Malformed LyX document: Missing \\use_indices.") return useindices = str2bool(get_value(document.header, "\\use_indices", i)) i = 0 @@ -771,7 +781,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 +1004,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 @@ -1829,9 +1838,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 +1855,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 +1871,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. @@ -2078,19 +2094,16 @@ def convert_passthru(document): document.warning("Can't find end of layout at line " + str(beg)) beg += 1 continue - document.warning(str(end)) # 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. - # first, though, we need to find out if the paragraph has any - # customization, so those can be propogated. - custom = [] - i = beg + 1 - while document.body[i].startswith("\\"): - custom.append(document.body[i]) - i += 1 + # 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: @@ -2104,11 +2117,11 @@ def convert_passthru(document): continue if document.body[ne + 1] == "": ne += 1 - subst = ["\\end_layout", "", "\\begin_layout " + lay] + custom + subst = ["\\end_layout", "", "\\begin_layout " + lay] document.body[ns:ne + 1] = subst # now we need to adjust end, in particular, but might as well # do ns properly, too - newlines = (ne - ns) - len(subst) + len(custom) + newlines = (ne - ns) - len(subst) ns += newlines + 2 end += newlines + 2 @@ -2236,7 +2249,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 @@ -2436,6 +2448,32 @@ def convert_langpack(document): 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, "