Update RELEASE-NOTES

[lyx.git] / lib / lyx2lyx / lyx_2_0.py

diff --git a/lib/lyx2lyx/lyx_2_0.py b/lib/lyx2lyx/lyx_2_0.py
index 62a2212986cc66243d5f584196f86fa78f0fb7c6..2756418f88d09afb0671878977800b6a8f525584 100644 (file)
--- 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}')
@@ -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.
@@ -2078,19 +2073,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 +2096,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 +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
@@ -2457,6 +2448,10 @@ def revert_tabularwidth(document):
     if document.body[features].find('alignment="tabularwidth"') != -1:
       remove_option(document.body, features, 'tabularwidth')
 
+def revert_html_css_as_file(document):
+  if not del_token(document.header, '\\html_css_as_file', 0):
+    document.warning("Malformed LyX document: Missing \\html_css_as_file.")
+
 
 ##
 # Conversion hub
@@ -2529,10 +2524,12 @@ convert = [[346, []],
            [409, [convert_use_xetex]],
            [410, []],
            [411, [convert_langpack]],
-           [412, []]
+           [412, []],
+           [413, []]
 ]
 
-revert =  [[411, [revert_tabularwidth]],
+revert =  [[412, [revert_html_css_as_file]],
+           [411, [revert_tabularwidth]],
            [410, [revert_langpack]],
            [409, [revert_labeling]],
            [408, [revert_use_xetex]],