fix bug 2026 and bug 2088

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

diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index 312fa4fa357af8ebc8f44274b12607f877c140a5..c3d9899e88b7d995109d9062de51fa2feb3920da 100644 (file)
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -1,5 +1,6 @@
 # This file is part of lyx2lyx
-# Copyright (C) 2002 Dekel Tsur <dekel@lyx.org>, José Matos <jamatos@lyx.org>
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002-2004 Dekel Tsur <dekel@lyx.org>, José Matos <jamatos@lyx.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,12 +17,14 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import string
+import re
 
 def check_token(line, token):
     if line[:len(token)] == token:
        return 1
     return 0
 
+
 # We need to check that the char after the token is space, but I think
 # we can ignore this
 def find_token(lines, token, start, end = 0):
@@ -33,6 +36,7 @@ def find_token(lines, token, start, end = 0):
            return i
     return -1
 
+
 def find_token2(lines, token, start, end = 0):
     if end == 0:
        end = len(lines)
@@ -42,6 +46,7 @@ def find_token2(lines, token, start, end = 0):
            return i
     return -1
 
+
 def find_tokens(lines, tokens, start, end = 0):
     if end == 0:
        end = len(lines)
@@ -52,6 +57,7 @@ def find_tokens(lines, tokens, start, end = 0):
                return i
     return -1
 
+
 def find_re(lines, rexp, start, end = 0):
     if end == 0:
        end = len(lines)
@@ -60,6 +66,7 @@ def find_re(lines, rexp, start, end = 0):
                return i
     return -1
 
+
 def find_token_backwards(lines, token, start):
     m = len(token)
     for i in xrange(start, -1, -1):
@@ -68,6 +75,7 @@ def find_token_backwards(lines, token, start):
            return i
     return -1
 
+
 def find_tokens_backwards(lines, tokens, start):
     for i in xrange(start, -1, -1):
        line = lines[i]
@@ -76,6 +84,7 @@ def find_tokens_backwards(lines, tokens, start):
                return i
     return -1
 
+
 def get_value(lines, token, start, end = 0):
     i = find_token2(lines, token, start, end)
     if i == -1:
@@ -85,6 +94,14 @@ def get_value(lines, token, start, end = 0):
     else:
         return ""
 
+
+def get_layout(line, default_layout):
+    tokens = string.split(line)
+    if len(tokens) > 1:
+        return tokens[1]
+    return default_layout
+
+
 def del_token(lines, token, i, j):
     k = find_token2(lines, token, i, j)
     if k == -1:
@@ -93,22 +110,37 @@ def del_token(lines, token, i, j):
        del lines[k]
        return j-1
 
+
 # Finds the paragraph that contains line i.
-def get_paragraph(lines, i):
+def get_paragraph(lines, i, format):
+    if format < 225:
+        begin_layout = "\\layout"
+    else:
+        begin_layout = "\\begin_layout"
     while i != -1:
-       i = find_tokens_backwards(lines, ["\\end_inset", "\\layout"], i)
+       i = find_tokens_backwards(lines, ["\\end_inset", begin_layout], i)
         if i == -1: return -1
-       if check_token(lines[i], "\\layout"):
+       if check_token(lines[i], begin_layout):
            return i
        i = find_beginning_of_inset(lines, i)
+    return -1
+
 
 # Finds the paragraph after the paragraph that contains line i.
-def get_next_paragraph(lines, i):
+def get_next_paragraph(lines, i, format):
+    if format < 225:
+        tokens = ["\\begin_inset", "\\layout", "\\end_float", "\\the_end"]
+    elif format < 236:
+        tokens = ["\\begin_inset", "\\begin_layout", "\\end_float", "\\end_document"]
+    else:
+        tokens = ["\\begin_inset", "\\begin_layout", "\\end_float", "\\end_body", "\\end_document"]
     while i != -1:
-       i = find_tokens(lines, ["\\begin_inset", "\\layout", "\\end_float", "\\the_end"], i)
+       i = find_tokens(lines, tokens, i)
        if not check_token(lines[i], "\\begin_inset"):
            return i
        i = find_end_of_inset(lines, i)
+    return -1
+
 
 def find_end_of(lines, i, start_token, end_token):
     count = 1
@@ -123,6 +155,7 @@ def find_end_of(lines, i, start_token, end_token):
            return i
     return -1
 
+
 # Finds the matching \end_inset
 def find_beginning_of(lines, i, start_token, end_token):
     count = 1
@@ -136,17 +169,21 @@ def find_beginning_of(lines, i, start_token, end_token):
            return i
     return -1
 
+
 # Finds the matching \end_inset
 def find_end_of_inset(lines, i):
     return find_end_of(lines, i, "\\begin_inset", "\\end_inset")
 
+
 # Finds the matching \end_inset
 def find_beginning_of_inset(lines, i):
     return find_beginning_of(lines, i, "\\begin_inset", "\\end_inset")
 
+
 def find_end_of_tabular(lines, i):
     return find_end_of(lines, i, "<lyxtabular", "</lyxtabular")
 
+
 def get_tabular_lines(lines, i):
     result = []
     i = i+1
@@ -162,9 +199,11 @@ def get_tabular_lines(lines, i):
            i = i+1
     return result
 
+
 def is_nonempty_line(line):
     return line != " "*len(line)
 
+
 def find_nonempty_line(lines, start, end = 0):
     if end == 0:
        end = len(lines)
@@ -172,23 +211,3 @@ def find_nonempty_line(lines, start, end = 0):
        if is_nonempty_line(lines[i]):
            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)
-
-    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
-    i = find_token(lines, "\\lyxformat", 0)
-    lines[i] = "\\lyxformat %s" % number