old ERT insets should just be ignored

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

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index 10052a40b947423aa74f6a7e45fefdf7ed9be74b..b01a8c83b1c94b13199c152fed302594b80b0c7b 100644 (file)
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -74,6 +74,7 @@ def get_value(lines, token, start, end = 0):
     return string.split(lines[i])[1]
 
 # Finds the paragraph that contains line i.
+import sys
 def get_paragraph(lines, i):
     while 1:
        i = find_tokens_backwards(lines, ["\\end_inset", "\\layout"], i)
@@ -81,16 +82,27 @@ def get_paragraph(lines, i):
            return i
        count = 1
        while count > 0:
-           i = find_tokens_backwards(lines, ["\\end_inset", "\\begin_inset"], i)
+           i = find_tokens_backwards(lines, ["\\end_inset", "\\begin_inset"], i-1)
            if check_token(lines[i], "\\end_inset"):
                count = count+1
            else:
                count = count-1
-       i = i-1
 
+# Finds the matching \end_inset
+def find_end_of_inset(lines, i):
+    count = 1
+    i = i+1
+    while 1:
+       i = find_tokens(lines, ["\\end_inset", "\\begin_inset"], i)
+       if check_token(lines[i], "\\begin_inset"):
+           count = count+1
+       else:
+           count = count-1
+       if count == 0:
+           return i
+       i = i+1
 
 def is_nonempty_line(line):
-    line = line[:-1]
     return line != " "*len(line)
 
 def find_nonempty_line(lines, start, end = 0):