Handle Michael's changes to InsetCollapsable.

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

diff --git a/lib/lyx2lyx/lyxconvert_220.py b/lib/lyx2lyx/lyxconvert_220.py
index e3089711e58a969495338cf780e2953f93bd80ae..cee86ddeb2e7ae7c75e470cd40566c93f9caaa0c 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_220.py
+++ b/lib/lyx2lyx/lyxconvert_220.py
@@ -27,6 +27,8 @@ def change_insetgraphics(lines):
            break
        j = find_end_of_inset(lines, i)
 
+       lines[i] = "\\begin_inset Graphics"
+
        if get_value(lines, "display", i, j) == "default":
            j = del_token(lines, "display", i, j)
        if get_value(lines, "rotateOrigin", i, j) == "leftBaseline":
@@ -42,38 +44,50 @@ def change_insetgraphics(lines):
        k = find_token2(lines, "size_type", i, j)
        if k == -1:
            k = find_token2(lines, "size_kind", i, j)
-       size_type = string.split(lines[k])[1]
-       del lines[k]
-       j = j-1
-       if size_type in ["0", "original"]:
-           j = del_token(lines, "width", i, j)
-           j = del_token(lines, "height", i, j)
-           j = del_token(lines, "scale", i, j)
-       elif size_type in ["2", "scale"]:
-           j = del_token(lines, "width", i, j)
-           j = del_token(lines, "height", i, j)
-           if get_value(lines, "scale", i, j) == "100":
+       if k != -1:
+           size_type = string.split(lines[k])[1]
+           del lines[k]
+           j = j-1
+           if size_type in ["0", "original"]:
+               j = del_token(lines, "width", i, j)
+               j = del_token(lines, "height", i, j)
+               j = del_token(lines, "scale", i, j)
+           elif size_type in ["2", "scale"]:
+               j = del_token(lines, "width", i, j)
+               j = del_token(lines, "height", i, j)
+               if get_value(lines, "scale", i, j) == "100":
+                   j = del_token(lines, "scale", i, j)
+           else:
                j = del_token(lines, "scale", i, j)
-       else:
-           j = del_token(lines, "scale", i, j)
 
        k = find_token2(lines, "lyxsize_type", i, j)
        if k == -1:
            k = find_token2(lines, "lyxsize_kind", i, j)
-       lyxsize_type = string.split(lines[k])[1]
-       del lines[k]
-       j = j-1
-       j = del_token(lines, "lyxwidth", i, j)
-       j = del_token(lines, "lyxheight", i, j)
-       if lyxsize_type not in ["2", "scale"] or \
-          get_value(lines, "lyxscale", i, j) == "100":
-           j = del_token(lines, "lyxscale", i, j)
-       
+       if k != -1:
+           lyxsize_type = string.split(lines[k])[1]
+           del lines[k]
+           j = j-1
+           j = del_token(lines, "lyxwidth", i, j)
+           j = del_token(lines, "lyxheight", i, j)
+           if lyxsize_type not in ["2", "scale"] or \
+              get_value(lines, "lyxscale", i, j) == "100":
+               j = del_token(lines, "lyxscale", i, j)
+
        i = i+1
 
+def change_tabular(lines):
+    i = 0
+    while 1:
+        i = find_token(lines, "<column", i)
+        if i == -1:
+            break
+        if not re.search('width="0pt"', lines[i]):
+            lines[i] = re.sub(' alignment=".*?"',' alignment="block"',lines[i])
+        i = i+1
 
 def convert(header, body):
     change_insetgraphics(body)
+    change_tabular(body)
 
 if __name__ == "__main__":
     pass