replace valignment "center" by "middle" in tables

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

diff --git a/lib/lyx2lyx/lyxconvert_216.py b/lib/lyx2lyx/lyxconvert_216.py
index f95c6e86f0145ba24d391de30f47a65a33e5adca..99f715fdedc5758cd6682a3c44ad8a419bc7f6b4 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_216.py
+++ b/lib/lyx2lyx/lyxconvert_216.py
@@ -99,7 +99,7 @@ def update_tabular(lines):
                     # the end variable refers to cell end, not to file end.
                     end = find_tokens(lines, ['\\layout','\\the_end','\\end_deeper','\\end_float'], i)
                 else:
-                    end = find_token(lines, '\\newline ', i)
+                    end = find_token(lines, '\\newline', i)
 
                 if end == -1:
                     sys.stderr.write("Malformed lyx file\n")
@@ -111,7 +111,7 @@ def update_tabular(lines):
                     del lines[i]
                     end = end -1
 
-                if lines[i] == '\\newline ':
+                if string.find(lines[i],'\\newline') != -1:
                     del lines[i]
                 l = l + 1
 
@@ -263,7 +263,8 @@ def update_language(header):
         header.append('\\language english')
         return
     # This is the lyx behaviour: defaults to english
-    header[i] = '\\language english'
+    if string.split(header[i])[1] == 'default':
+        header[i] = '\\language english'
     return
 
 def convert(header,body):