\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 18c41b13fe064d678cd00f370ba7a8e1675e39c0..db4148f372f90fd1b1f2d0bcf48e0be708cca642 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_224.py
+++ b/lib/lyx2lyx/lyxconvert_224.py
@@ -68,19 +68,27 @@ def add_end_layout(lines):
         lines.insert(i, "\\end_layout")
         return
 
-## def layout2begin_layout(lines):
-##     i = 0
-##     while 1:
-##         i = find_token(lines, '\\layout', i)
-##         if i == -1:
-##             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
+        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)
+    layout2begin_layout(body)
+    end_document(body)
 
 if __name__ == "__main__":
     pass