Convert tabular version 2 -> version 3

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5131 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/lyxconvert_217.py b/lib/lyx2lyx/lyxconvert_217.py
index 875b4f57cb68e27752cd09219585d997ac2bc452..4a389fecc620d221936c3449b1f7e507bba333e8 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_217.py
+++ b/lib/lyx2lyx/lyxconvert_217.py
@@ -22,7 +22,7 @@ bool_table =  {"0": "false", "1":"true" }
 align_table = {"0": "top", "2": "left", "4": "right", "8": "center"}
 use_table = {"0": "none", "1": "parbox"}
 
-table_meta_re = re.compile(r'<LyXTabular version="1" rows="(\d*)" columns="(\d*)">')
+#table_meta_re = re.compile(r'<LyXTabular version="1" rows="(\d*)" columns="(\d*)">')
 def update_tabular(lines):
     i=0
     while 1:

diff --git a/lib/lyx2lyx/lyxconvert_218.py b/lib/lyx2lyx/lyxconvert_218.py
index 4896ff6921704c7117077d4fa5cec5e67cb61372..9759fb40c0eff5608940a0fedd07d2bb84609d37 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_218.py
+++ b/lib/lyx2lyx/lyxconvert_218.py
@@ -399,6 +399,31 @@ def remove_figinset(lines):
        new = new + ["\end_inset"]
        lines[i:j+1] = new
 
+attr_re = re.compile(r' \w*="(false|0|)"')
+line_re = re.compile(r'<(features|column|row|cell)')
+
+def update_tabular(lines):
+    i = 0
+    while 1:
+        i = find_token(lines, '\\begin_inset  Tabular', i)
+        if i == -1:
+            break
+
+        # scan table header meta-info
+        lines[i+1] = string.replace(lines[i+1], 'version="2"', 'version="3"')
+
+        j = find_token(lines, '</lyxtabular>', i)
+        if j == -1:
+            break
+
+       for k in xrange(i+2,j):
+           if check_token(lines[k], "<column"):
+                lines[k] = string.replace(lines[k], 'width=""', 'width="0pt"')
+           if line_re.match(lines[k]):
+               lines[k] = re.sub(attr_re, "", lines[k])
+
+       i = i+1
+
 def change_preamble(lines):
     i = find_token(lines, "\\use_amsmath", 0)
     if i == -1:
@@ -412,6 +437,7 @@ def convert(header, body):
        language = "english"
 
     change_preamble(header)
+    update_tabular(body)
     remove_oldminipage(body)
     remove_oldfloat(body, language)
     remove_figinset(body)