re-add stuff to math menu

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

diff --git a/lib/lyx2lyx/lyxconvert_218.py b/lib/lyx2lyx/lyxconvert_218.py
index 4e64d252b5c2ba3e1f18d538aea7802432f1565e..4b94a5388a0a65de25a0e7070fc81f4240f63aca 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_218.py
+++ b/lib/lyx2lyx/lyxconvert_218.py
@@ -44,10 +44,6 @@ floats = {
 font_tokens = ["\\family", "\\series", "\\shape", "\\size", "\\emph",
               "\\bar", "\\noun", "\\color", "\\lang", "\\latex"]
 
-#
-# Change \begin_float .. \end_float into \begin_inset Float .. \end_inset
-#
-
 pextra_type3_rexp = re.compile(r".*\\pextra_type\s+3")
 pextra_rexp = re.compile(r"\\pextra_type\s+(\S+)"+\
                         r"(\s+\\pextra_alignment\s+(\S+))?"+\
@@ -56,13 +52,18 @@ pextra_rexp = re.compile(r"\\pextra_type\s+(\S+)"+\
                         r"(\s+(\\pextra_widthp?)\s+(\S*))?")
 
 def get_width(mo):
-    if mo.group(9) == "\\pextra_widthp":
-       return mo.group(10)+"col%"
-    elif mo.group(10):
-       return mo.group(10)
+    if mo.group(10):
+       if mo.group(9) == "\\pextra_widthp":
+           return mo.group(10)+"col%"
+       else:
+           return mo.group(10)
     else:
        return "100col%"
 
+#
+# Change \begin_float .. \end_float into \begin_inset Float .. \end_inset
+#
+
 def remove_oldfloat(lines, language):
     i = 0
     while 1:
@@ -124,21 +125,29 @@ def remove_oldfloat(lines, language):
        lines[i:j+1] = new
        i = i+1
 
-pextra_type2_rexp = re.compile(r".*\\pextra_type\s+2")
+pextra_type2_rexp = re.compile(r".*\\pextra_type\s+[12]")
 pextra_type2_rexp2 = re.compile(r".*(\\layout|\\pextra_type\s+2)")
 
-def remove_oldminipage(lines):
+def remove_pextra(lines):
     i = 0
     flag = 0
     while 1:
        i = find_re(lines, pextra_type2_rexp, i)
        if i == -1:
            break
-       
+
        mo = pextra_rexp.search(lines[i])
+        width = get_width(mo)
+
+        if mo.group(1) == "1":
+            # handle \pextra_type 1 (indented paragraph)
+            lines[i] = re.sub(pextra_rexp, "\\leftindent "+width+" ", lines[i])
+            i = i+1
+            continue
+
+        # handle \pextra_type 2 (minipage)
        position = mo.group(3)
        hfill = mo.group(5)
-       width = get_width(mo)
        lines[i] = re.sub(pextra_rexp, "", lines[i])
 
        start = ["\\begin_inset Minipage",
@@ -157,11 +166,9 @@ def remove_oldminipage(lines):
 
        j = find_token_backwards(lines,"\\layout", i-1)
        j0 = j
-       mid = lines[j:i]
 
        j = find_tokens(lines, ["\\layout", "\\end_float"], i+1)
-       # j can be -1, but this is still ok
-       mid = mid+lines[i+1:j]
+       # j can be -1
 
        count = 0
        while 1:
@@ -178,11 +185,10 @@ def remove_oldminipage(lines):
            if mo.group(7) == "1":
                flag = 1
                break
-           j = find_token_backwards(lines,"\\layout", i-1)
-           mid = mid+lines[j:i]
+           lines[i] = re.sub(pextra_rexp, "", lines[i])
            j = find_tokens(lines, ["\\layout", "\\end_float"], i+1)
-           mid = mid+lines[i+1:j]
 
+       mid = lines[j0:j]
        end = ["\\end_inset "]
 
        lines[j0:j] = start+mid+end
@@ -191,7 +197,7 @@ def remove_oldminipage(lines):
 def is_empty(lines):
     return filter(is_nonempty_line, lines) == []
 
-font_rexp =  re.compile(r"\\(family|series|shape|size|emph|numeric|bar|noun)")
+move_rexp =  re.compile(r"\\(family|series|shape|size|emph|numeric|bar|noun|end_deeper)")
 ert_rexp = re.compile(r"\\begin_inset|.*\\SpecialChar")
 spchar_rexp = re.compile(r"(.*)(\\SpecialChar.*)")
 ert_begin = ["\\begin_inset ERT",
@@ -207,10 +213,12 @@ def remove_oldert(lines):
            break
        j = i+1
        while 1:
-           j = find_tokens(lines, ["\\latex default", "\\begin_inset", "\\layout", "\\end_float", "\\the_end"],
+            # \end_inset is for ert inside a tabular cell. The other tokens
+            # are obvious.
+           j = find_tokens(lines, ["\\latex default", "\\layout", "\\begin_inset", "\\end_inset", "\\end_float", "\\the_end"],
                            j)
            if check_token(lines[j], "\\begin_inset"):
-               j = find_end_of_inset(lines, j)
+               j = find_end_of_inset(lines, j)+1
            else:
                break
 
@@ -242,7 +250,8 @@ def remove_oldert(lines):
 
            tmp = []
            for line in lines[k:k2]:
-               if font_rexp.match(line):
+                # Move some lines outside the ERT inset:
+               if move_rexp.match(line):
                    if new2 == []:
                        # This is not necessary, but we want the output to be
                        # as similar as posible to the lyx format
@@ -288,6 +297,7 @@ def remove_oldert(lines):
        lines[i:j+1] = new
        i = i+1
 
+    # Delete remaining "\latex xxx" tokens
     i = 0
     while 1:
        i = find_token(lines, "\\latex ", i)
@@ -295,7 +305,7 @@ def remove_oldert(lines):
            break
        del lines[i]
 
-
+# ERT insert are hidden feature of lyx 1.1.6. This might be removed in the future.
 def remove_oldertinset(lines):
     i = 0
     while 1:
@@ -312,9 +322,13 @@ def remove_oldertinset(lines):
        i = i+1
 
 def is_ert_paragraph(lines, i):
+    if not check_token(lines[i], "\\layout Standard"):
+        return 0
+
     i = find_nonempty_line(lines, i+1)
     if not check_token(lines[i], "\\begin_inset ERT"):
        return 0
+
     j = find_end_of_inset(lines, i)
     k = find_nonempty_line(lines, j+1)
     return check_token(lines[k], "\\layout")
@@ -325,7 +339,7 @@ def combine_ert(lines):
        i = find_token(lines, "\\begin_inset ERT", i)
        if i == -1:
            break
-       j = find_token_backwards(lines,"\\layout", i-1)
+       j = get_paragraph(lines, i)
        count = 0
        text = []
        while is_ert_paragraph(lines, j):
@@ -437,6 +451,28 @@ def update_tabular(lines):
 
        i = i+1
 
+# Figure insert are hidden feature of lyx 1.1.6. This might be removed in the future.
+def fix_oldfloatinset(lines):
+    i = 0
+    while 1:
+       i = find_token(lines, "\\begin_inset Float ", i)
+       if i == -1:
+           break
+        j = find_token(lines, "collapsed", i)
+        if j != -1:
+            lines[j:j] = ["wide false"]
+        i = i+1
+
+def change_listof(lines):
+    i = 0
+    while 1:
+       i = find_token(lines, "\\begin_inset LatexCommand \\listof", i)
+       if i == -1:
+           break
+        type = lines[i][33:-3]
+        lines[i] = "\\begin_inset FloatList "+type
+        i = i+1
+
 def change_preamble(lines):
     i = find_token(lines, "\\use_amsmath", 0)
     if i == -1:
@@ -450,8 +486,10 @@ def convert(header, body):
        language = "english"
 
     change_preamble(header)
+    change_listof(body)
+    fix_oldfloatinset(body)
     update_tabular(body)
-    remove_oldminipage(body)
+    remove_pextra(body)
     remove_oldfloat(body, language)
     remove_figinset(body)
     remove_oldertinset(body)