\end_document replaces \the_end.

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

diff --git a/lib/lyx2lyx/lyxconvert_224.py b/lib/lyx2lyx/lyxconvert_224.py
index a7fc145470ed5600173ea4e5d24dcff84e2e84a0..db4148f372f90fd1b1f2d0bcf48e0be708cca642 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_224.py
+++ b/lib/lyx2lyx/lyxconvert_224.py
@@ -17,30 +17,78 @@
 
 from parser_tools import find_token, find_tokens
 from sys import stderr
+from string import replace, split
 
 def add_end_layout(lines):
-    begin_layout = "\\layout"
+    i = find_token(lines, '\\layout', 0)
 
-    i = find_token(lines, begin_layout, 0)
     if i == -1:
-        write(stderr, "lyx2lyx: File with no paragraphs. ")
-        lines[0:len(lines)] = []
         return
-    i = i + 1
 
+    i = i + 1
+    struct_stack = ["\\layout"]
     while 1:
         i = find_tokens(lines, ["\\begin_inset", "\\end_inset", "\\layout",
                                 "\\begin_deeper", "\\end_deeper", "\\the_end"], i)
 
-        lines[i:i] = ["\\end_layout"]
-        i = i + 1
-        i = find_token(lines, begin_layout, i)
+        token = split(lines[i])[0]
+
+        if token == "\\begin_inset":
+            struct_stack.append(token)
+            i = i + 1
+            continue
+
+        if token == "\\end_inset":
+            tail = struct_stack.pop()
+            if tail == "\\layout":
+                lines.insert(i,"\\end_layout")
+                i = i + 1
+                #Check if it is the correct tag
+                struct_stack.pop()
+            i = i + 1
+            continue
+
+        if token == "\\layout":
+            tail = struct_stack.pop()
+            if tail == token:
+                lines.insert(i,"\\end_layout")
+                i = i + 2
+            else:
+                struct_stack.append(tail)
+                i = i + 1
+            struct_stack.append(token)
+            continue
+
+        if token == "\\begin_deeper" or token == "\\end_deeper":
+            lines.insert(i,"\\end_layout")
+            i = i + 2
+            continue
+        
+        #case \end_document
+        lines.insert(i, "\\end_layout")
+        return
+
+def layout2begin_layout(lines):
+    i = 0
+    while 1:
+        i = find_token(lines, '\\layout', i)
         if i == -1:
             return
+
+        lines[i]= replace(lines[i], '\\layout', '\\begin_layout')
         i = i + 1
-        
+
+def end_document(lines):
+    i = find_token(lines, "\\the_end", 0)
+    if i == -1:
+        lines.append("\\end_document")
+        return
+    lines[i] = "\\end_document"
+    
 def convert(header, body):
     add_end_layout(body)
+    layout2begin_layout(body)
+    end_document(body)
 
 if __name__ == "__main__":
     pass