bare bones to convert 222

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

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index b16648a8219ca2077d6bacc833aa44934f1a029d..adf711b99d7ab6063af00acd1d5fa6121e40d855 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)
@@ -92,16 +95,18 @@ def del_token(lines, token, i, j):
 
 # Finds the paragraph that contains line i.
 def get_paragraph(lines, i):
-    while 1:
+    while i != -1:
        i = find_tokens_backwards(lines, ["\\end_inset", "\\layout"], i)
+        if i == -1: return -1
        if check_token(lines[i], "\\layout"):
            return i
        i = find_beginning_of_inset(lines, i)
 
 # Finds the paragraph after the paragraph that contains line i.
 def get_next_paragraph(lines, i):
-    while 1:
+    while i != -1:
        i = find_tokens(lines, ["\\begin_inset", "\\layout"], i)
+        if i == -1: return -1
        if check_token(lines[i], "\\layout"):
            return i
        i = find_end_of_inset(lines, i)
@@ -122,8 +127,7 @@ def find_end_of(lines, i, start_token, end_token):
 # Finds the matching \end_inset
 def find_beginning_of(lines, i, start_token, end_token):
     count = 1
-    n = len(lines)
-    while i < n:
+    while i > 0:
        i = find_tokens_backwards(lines, [start_token, end_token], i-1)
        if check_token(lines[i], end_token):
            count = count+1