replace valignment "center" by "middle" in tables

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

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index e24d5bd36cb375f6b24bc9c917fa8402da80451e..465e174d3a863dce9645e04948f926a7105bd2a5 100644 (file)
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -80,7 +80,10 @@ def get_value(lines, token, start, end = 0):
     i = find_token2(lines, token, start, end)
     if i == -1:
        return ""
-    return string.split(lines[i])[1]
+    if len(string.split(lines[i])) > 1:
+        return string.split(lines[i])[1]
+    else:
+        return ""
 
 def del_token(lines, token, i, j):
     k = find_token2(lines, token, i, j)
@@ -102,9 +105,8 @@ def get_paragraph(lines, i):
 # Finds the paragraph after the paragraph that contains line i.
 def get_next_paragraph(lines, i):
     while i != -1:
-       i = find_tokens(lines, ["\\begin_inset", "\\layout"], i)
-        if i == -1: return -1
-       if check_token(lines[i], "\\layout"):
+       i = find_tokens(lines, ["\\begin_inset", "\\layout", "\\end_float", "\\the_end"], i)
+       if not check_token(lines[i], "\\begin_inset"):
            return i
        i = find_end_of_inset(lines, i)
 
@@ -171,22 +173,13 @@ def find_nonempty_line(lines, start, end = 0):
            return i
     return -1
 
-def set_comment(lines, number):
-    x = int(number)
-    if x < 216:
-       # It is not worth the trouble to handle this case
-       return
-    elif x < 220:
-       version = "1.1"
-    else:
-       version = str((x-220)/10.0+1.2)
-
+def set_comment(lines, version):
     lines[0] = "#LyX %s created this file. For more info see http://www.lyx.org/" % version
     if lines[1][0] == '#':
        del lines[1]
 
 def set_format(lines, number):
     if int(number) <= 217:
-       number = float(number)/100
+        number = float(number)/100
     i = find_token(lines, "\\lyxformat", 0)
     lines[i] = "\\lyxformat %s" % number