X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx_1_3.py;h=35f04db8c4ef4b8ad96096f6355731b662e2a8b5;hb=9a1b26a156c913f484ca2293fb2ec1c4986d2a3e;hp=acb8d9f62f0894a82a3cb0d79436df5549725af2;hpb=34001ec175b10b2b75ca91ccf0a28ffc4419f55e;p=lyx.git

diff --git a/lib/lyx2lyx/lyx_1_3.py b/lib/lyx2lyx/lyx_1_3.py
index acb8d9f62f..35f04db8c4 100644
--- a/lib/lyx2lyx/lyx_1_3.py
+++ b/lib/lyx2lyx/lyx_1_3.py
@@ -1,7 +1,7 @@
 # This file is part of lyx2lyx
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 # Copyright (C) 2002 Dekel Tsur <dekel@lyx.org>
-# Copyright (C) 2004 José Matos <jamatos@lyx.org>
+# Copyright (C) 2004 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
@@ -15,17 +15,46 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+""" Convert files to the file format generated by lyx 1.3"""
 
-import string
 import re
-from parser_tools import find_token, find_end_of_inset, get_value,\
-                         find_token_exact, del_token
+from parser_tools import find_token, find_end_of, get_value,\
+                         find_token_exact
+
+####################################################################
+# Private helper functions
+
+def find_end_of_inset(lines, i):
+    "Finds the matching \end_inset"
+    return find_end_of(lines, i, "\\begin_inset", "\\end_inset")
+
+
+def del_token(lines, token, start, end):
+    """ del_token(lines, token, start, end) -> int
+
+    Find the lower line in lines where token is the first element and
+    delete that line.
+
+    Returns the number of lines remaining."""
+
+    k = find_token_exact(lines, token, start, end)
+    if k == -1:
+        return end
+    else:
+        del lines[k]
+        return end - 1
+
+# End of helper functions
+####################################################################
+
 
-def change_insetgraphics(file):
-    lines = file.body
+def change_insetgraphics(document):
+    " Change inset Graphics."
+    lines = document.body
     i = 0
-    while 1:
+    while True:
         i = find_token(lines, "\\begin_inset Graphics", i)
         if i == -1:
             break
@@ -49,7 +78,7 @@ def change_insetgraphics(file):
         if k == -1:
             k = find_token_exact(lines, "size_kind", i, j)
         if k != -1:
-            size_type = string.split(lines[k])[1]
+            size_type = lines[k].split()[1]
             del lines[k]
             j = j-1
             if size_type in ["0", "original"]:
@@ -68,7 +97,7 @@ def change_insetgraphics(file):
         if k == -1:
             k = find_token_exact(lines, "lyxsize_kind", i, j)
         if k != -1:
-            lyxsize_type = string.split(lines[k])[1]
+            lyxsize_type = lines[k].split()[1]
             del lines[k]
             j = j-1
             j = del_token(lines, "lyxwidth", i, j)
@@ -80,10 +109,11 @@ def change_insetgraphics(file):
         i = i+1
 
 
-def change_tabular(file):
-    lines = file.body
+def change_tabular(document):
+    " Change tabular."
+    lines = document.body
     i = 0
-    while 1:
+    while True:
         i = find_token(lines, "<column", i)
         if i == -1:
             break
@@ -92,6 +122,7 @@ def change_tabular(file):
         i = i+1
 
 
+supported_versions = ["1.3.%d" % i for i in range(8)] + ["1.3"]
 convert = [[221, [change_insetgraphics, change_tabular]]]
 revert  = []