X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx_2_0.py;h=2756418f88d09afb0671878977800b6a8f525584;hb=9da74fe2078e24e1e7891784ecbfe33ff77e7f85;hp=f5d72db7e7c813a84f19fec24a146b0a5dd7e584;hpb=74245321ca6d0ad9eb4686e7fd40cbb83af0f6e8;p=lyx.git

diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py
index f5d72db7e7..2756418f88 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
@@ -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
@@ -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.
@@ -2233,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
@@ -2531,7 +2525,7 @@ convert = [[346, []],
            [410, []],
            [411, [convert_langpack]],
            [412, []],
-           [413, []],
+           [413, []]
 ]
 
 revert =  [[412, [revert_html_css_as_file]],