Don't return yet! We need to check the other one.

[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 5385f87d19a04b35623a9038e23f47f4af63eb84..4af886bfa6c41daae6f8cef4f2cb7679beff8551 100644 (file)
--- a/lib/lyx2lyx/lyx_2_0.py
+++ b/lib/lyx2lyx/lyx_2_0.py
@@ -362,9 +362,10 @@ def revert_flex_inset(document, name, LaTeXname, position):
     i += 1
 
 
-def revert_charstyles(document, name, LaTeXname, changed):
-  " Reverts character styles to TeX code "
+def revert_font_attrs(document, name, LaTeXname):
+  " Reverts font changes to TeX code "
   i = 0
+  changed = False
   while True:
     i = find_token(document.body, name + ' on', i)
     if i == -1:
@@ -658,7 +659,7 @@ def revert_backgroundcolor(document):
     i = find_token(document.header, "\\backgroundcolor", 0)
     if i == -1:
         return
-    colorcode = get_value(document.header, '\\backgroundcolor', 0)
+    colorcode = get_value(document.header, '\\backgroundcolor', i)
     del document.header[i]
     # don't clutter the preamble if backgroundcolor is not set
     if colorcode == "#ffffff":
@@ -682,9 +683,12 @@ def revert_splitindex(document):
         return
     indices = get_value(document.header, "\\use_indices", i)
     preamble = ""
-    if indices == "true":
+    useindices = (indices == "true")
+    if useindices:
          preamble += "\\usepackage{splitidx}\n"
     del document.header[i]
+    
+    # deal with index declarations in the preamble
     i = 0
     while True:
         i = find_token(document.header, "\\index", i)
@@ -694,17 +698,20 @@ def revert_splitindex(document):
         if k == -1:
             document.warning("Malformed LyX document: Missing \\end_index.")
             return
-        line = document.header[i]
-        l = re.compile(r'\\index (.*)$')
-        m = l.match(line)
-        iname = m.group(1)
-        ishortcut = get_value(document.header, '\\shortcut', i, k)
-        if ishortcut != "" and indices == "true":
-            preamble += "\\newindex[" + iname + "]{" + ishortcut + "}\n"
+        if useindices:    
+          line = document.header[i]
+          l = re.compile(r'\\index (.*)$')
+          m = l.match(line)
+          iname = m.group(1)
+          ishortcut = get_value(document.header, '\\shortcut', i, k)
+          if ishortcut != "":
+              preamble += "\\newindex[" + iname + "]{" + ishortcut + "}\n"
         del document.header[i:k + 1]
-        i = 0
     if preamble != "":
         insert_to_preamble(0, document, preamble)
+        
+    # deal with index insets
+    # these need to have the argument removed
     i = 0
     while True:
         i = find_token(document.body, "\\begin_inset Index", i)
@@ -719,13 +726,17 @@ def revert_splitindex(document):
         else:
             k = find_end_of_inset(document.body, i)
             if k == -1:
-                 return
+                document.warning("Can't find end of index inset!")
+                i += 1
+                continue
             content = lyx2latex(document, document.body[i:k])
             # escape quotes
             content = content.replace('"', r'\"')
-            subst = [old_put_cmd_in_ert("\\sindex[" + itype + "]{" + content + "}")]
+            subst = put_cmd_in_ert("\\sindex[" + itype + "]{" + content + "}")
             document.body[i:k + 1] = subst
         i = i + 1
+        
+    # deal with index_print insets
     i = 0
     while True:
         i = find_token(document.body, "\\begin_inset CommandInset index_print", i)
@@ -736,10 +747,10 @@ def revert_splitindex(document):
         if ptype == "idx":
             j = find_token(document.body, "type", i, k)
             del document.body[j]
-        elif indices == "false":
+        elif not useindices:
             del document.body[i:k + 1]
         else:
-            subst = [old_put_cmd_in_ert("\\printindex[" + ptype + "]{}")]
+            subst = put_cmd_in_ert("\\printindex[" + ptype + "]{}")
             document.body[i:k + 1] = subst
         i = i + 1
 
@@ -775,6 +786,7 @@ def revert_subindex(document):
         document.warning("Malformed LyX document: Missing \\use_indices.")
         return
     indices = get_value(document.header, "\\use_indices", i)
+    useindices = (indices == "true")
     i = 0
     while True:
         i = find_token(document.body, "\\begin_inset CommandInset index_print", i)
@@ -783,13 +795,13 @@ def revert_subindex(document):
         k = find_end_of_inset(document.body, i)
         ctype = get_value(document.body, 'LatexCommand', i, k)
         if ctype != "printsubindex":
-            i = i + 1
+            i = k + 1
             continue
         ptype = get_value(document.body, 'type', i, k).strip('"')
-        if indices == "false":
+        if not useindices:
             del document.body[i:k + 1]
         else:
-            subst = [old_put_cmd_in_ert("\\printsubindex[" + ptype + "]{}")]
+            subst = put_cmd_in_ert("\\printsubindex[" + ptype + "]{}")
             document.body[i:k + 1] = subst
         i = i + 1
 
@@ -801,6 +813,7 @@ def revert_printindexall(document):
         document.warning("Malformed LyX document: Missing \\use_indices.")
         return
     indices = get_value(document.header, "\\use_indices", i)
+    useindices = (indices == "true")
     i = 0
     while True:
         i = find_token(document.body, "\\begin_inset CommandInset index_print", i)
@@ -809,22 +822,21 @@ def revert_printindexall(document):
         k = find_end_of_inset(document.body, i)
         ctype = get_value(document.body, 'LatexCommand', i, k)
         if ctype != "printindex*" and ctype != "printsubindex*":
-            i = i + 1
+            i = k
             continue
-        if indices == "false":
+        if not useindices:
             del document.body[i:k + 1]
         else:
-            subst = [old_put_cmd_in_ert("\\" + ctype + "{}")]
+            subst = put_cmd_in_ert("\\" + ctype + "{}")
             document.body[i:k + 1] = subst
         i = i + 1
 
 
 def revert_strikeout(document):
-  " Reverts \\strikeout character style "
-  changed = False
-  changed = revert_charstyles(document, "\\uuline", "\\uuline", changed)
-  changed = revert_charstyles(document, "\\uwave", "\\uwave", changed)
-  changed = revert_charstyles(document, "\\strikeout", "\\sout", changed)
+  " Reverts \\strikeout font attribute "
+  changed = revert_font_attrs(document, "\\uuline", "\\uuline")
+  changed = revert_font_attrs(document, "\\uwave", "\\uwave") or changed
+  changed = revert_font_attrs(document, "\\strikeout", "\\sout")  or changed
   if changed == True:
     insert_to_preamble(0, document,
         '% Commands inserted by lyx2lyx for proper underlining\n'
@@ -833,7 +845,7 @@ def revert_strikeout(document):
 
 
 def revert_ulinelatex(document):
-    " Reverts \\uline character style "
+    " Reverts \\uline font attribute "
     i = find_token(document.body, '\\bar under', 0)
     if i == -1:
         return
@@ -852,13 +864,13 @@ def revert_custom_processors(document):
     i = find_token(document.header, '\\bibtex_command', 0)
     if i == -1:
         document.warning("Malformed LyX document: Missing \\bibtex_command.")
-        return
-    del document.header[i]
+    else:
+        del document.header[i]
     i = find_token(document.header, '\\index_command', 0)
     if i == -1:
         document.warning("Malformed LyX document: Missing \\index_command.")
-        return
-    del document.header[i]
+    else:
+        del document.header[i]
 
 
 def convert_nomencl_width(document):