Get lots of nice icons from the desktop theme

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

diff --git a/lib/lyx2lyx/lyx_1_1_5.py b/lib/lyx2lyx/lyx_1_1_5.py
index 6e8fa21a2d7aa3bf5a18ea5f526c0121154dc8e4..459b185af12669628fd5226b537e0393b601b96e 100644 (file)
--- a/lib/lyx2lyx/lyx_1_1_5.py
+++ b/lib/lyx2lyx/lyx_1_1_5.py
@@ -33,7 +33,11 @@ def replace_protected_separator(file):
             break
         j = find_token_backwards(lines, "\\layout", i)
         #if j == -1: print error
-        layout = layout_exp.match(lines[j]).group(1)
+        layout_m = layout_exp.match(lines[j])
+        if layout_m:
+            layout = layout_m.group(1)
+        else:
+            layout = "Standard"
 
         if layout == "LyX-Code":
             result = ""
@@ -136,8 +140,6 @@ def remove_space_in_units(file):
 
     unit_rexp = re.compile(r'[^ ]* (.*) (.*)')
 
-    begin_preamble = find_token(lines,"\\begin_preamble", 0)
-    end_preamble = find_token(lines, "\\end_preamble", 0)
     for margin in margins:
         i = 0
         while 1:
@@ -145,29 +147,94 @@ def remove_space_in_units(file):
             if i == -1:
                 break
 
-            if i > begin_preamble and i < end_preamble:
-                i = i + 1
-                continue
-
             result = unit_rexp.search(lines[i])
             if result:
                 lines[i] = margin + " " + result.group(1) + result.group(2)
             i = i + 1
 
 
-def convert(file):
-    table = [first_layout, remove_vcid, remove_cursor, update_toc,
-             replace_protected_separator, merge_formula_inset,
-             update_tabular, remove_space_in_units]
+def latexdel_getargs(file, i):
+    lines = file.body
+
+    # play safe, clean empty lines
+    while 1:
+        if lines[i]:
+            break
+        del lines[i]
+
+    j = find_token(lines, '\\end_inset', i)
+
+    if i == j:
+        del lines[i]
+    else:
+        file.warning("Unexpected end of inset.")
+    j = find_token(lines, '\\begin_inset LatexDel }{', i)
+
+    ref = string.join(lines[i:j])
+    del lines[i:j + 1]
+
+    # play safe, clean empty lines
+    while 1:
+        if lines[i]:
+            break
+        del lines[i]
+
+    j = find_token(lines, '\\end_inset', i - 1)
+    if i == j:
+        del lines[i]
+    else:
+        file.warning("Unexpected end of inset.")
+    j = find_token(lines, '\\begin_inset LatexDel }', i)
+    label = string.join(lines[i:j])
+    del lines[i:j + 1]
+
+    return ref, label
 
-    for conv in table:
-        conv(file)
 
-    file.format = 216
+def update_ref(file):
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_token(lines, '\\begin_inset LatexCommand', i)
+        if i == -1:
+            return
+
+        if string.split(lines[i])[-1] == "\\ref{":
+            i = i + 1
+            ref, label = latexdel_getargs(file, i)
+            lines[i - 1] = "%s[%s]{%s}" % (lines[i - 1][:-1], ref, label)
+
+        i = i + 1
+
+
+def update_latexdel(file):
+    lines = file.body
+    i = 0
+    latexdel_re = re.compile(r".*\\begin_inset LatexDel")
+    while 1:
+        i = find_re(lines, latexdel_re, i)
+        if i == -1:
+            return
+        lines[i] = string.replace(lines[i],'\\begin_inset LatexDel', '\\begin_inset LatexCommand')
+
+        j = string.find(lines[i],'\\begin_inset')
+        lines.insert(i+1, lines[i][j:])
+        lines[i] = string.strip(lines[i][:j])
+        i = i + 1
+
+        if string.split(lines[i])[-1] in ("\\url{", "\\htmlurl{"):
+            i = i + 1
+
+            ref, label = latexdel_getargs(file, i)
+            lines[i -1] = "%s[%s]{%s}" % (lines[i-1][:-1], label, ref)
+
+        i = i + 1
 
 
-def revert(file):
-    file.error("The convertion to an older format (%s) is not implemented." % file.format)
+convert = [[216, [first_layout, remove_vcid, remove_cursor, update_toc,
+                  replace_protected_separator, merge_formula_inset,
+                  update_tabular, remove_space_in_units, update_ref, update_latexdel]]]
+revert  = []
 
 if __name__ == "__main__":
     pass