lyxl2yx catches \end_layout

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7408 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 99c014974ac573e9f84789fd14849c527d97da3a..0ed7e92270405439d7cc6ec43aa8596d1715bc04 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-28  José Matos  <jamatos@fep.up.pt>
+
+       * lyx2lyx/lyx_convert224.py (add_end_layout): new file to read new format.
+
 2003-07-27  José Matos  <jamatos@fep.up.pt>
 
        * layouts/db_lyxmacros.inc:

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index b0d7077f54bb2c6c5b65ac4b55c5ca91d5a9edd4..6ee6cb5977272db30da6aaf28e65d8593ecdecd6 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -37,7 +37,7 @@ opt.quiet = 0
 
 format = re.compile(r"(\d)[\.,]?(\d\d)")
 fileformat = re.compile(r"\\lyxformat\s*(\S*)")
-lst_ft = ["210", "215", "216", "217", "218", "220", "221", "223", "224"]
+lst_ft = ["210", "215", "216", "217", "218", "220", "221", "223", "224", "225"]
 
 def usage():
     print """Usage: lyx2lyx [options] file1

diff --git a/lib/lyx2lyx/lyxconvert_224.py b/lib/lyx2lyx/lyxconvert_224.py
new file mode 100644 (file)
index 0000000..a7fc145
--- /dev/null
+++ b/lib/lyx2lyx/lyxconvert_224.py
@@ -0,0 +1,46 @@
+# This file is part of lyx2lyx
+# Copyright (C) 2003 José Matos <jamatos@fep.up.pt>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+from parser_tools import find_token, find_tokens
+from sys import stderr
+
+def add_end_layout(lines):
+    begin_layout = "\\layout"
+
+    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
+
+    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)
+        if i == -1:
+            return
+        i = i + 1
+        
+def convert(header, body):
+    add_end_layout(body)
+
+if __name__ == "__main__":
+    pass