X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyx_1_3.py;h=91dae09ec0d1c81ef7e61df06c735bc7885874d8;hb=23366b930e3ffd8b27c56042e2cd6459f3871366;hp=0d0cfb267d790b0706d304aa7fa371d00e8ceb0d;hpb=6c79118290d45c5d2b77441a3c5aa75afb001c06;p=lyx.git

diff --git a/lib/lyx2lyx/lyx_1_3.py b/lib/lyx2lyx/lyx_1_3.py
index 0d0cfb267d..91dae09ec0 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
@@ -17,69 +17,85 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-import string
+""" Convert files to the file format generated by lyx 1.3"""
+
 import re
-from parser_tools import find_token, find_end_of_inset, get_value,\
-                         find_token2, del_token
+from parser_tools import find_token, find_end_of, get_value,\
+                         find_token_exact, del_token
+
+####################################################################
+# 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")
+
+# End of helper functions
+####################################################################
 
-def change_insetgraphics(lines):
+
+def change_insetgraphics(document):
+    " Change inset Graphics."
+    lines = document.body
     i = 0
     while 1:
-	i = find_token(lines, "\\begin_inset Graphics", i)
-	if i == -1:
-	    break
-	j = find_end_of_inset(lines, i)
-
-	lines[i] = "\\begin_inset Graphics"
-
-	if get_value(lines, "display", i, j) == "default":
-	    j = del_token(lines, "display", i, j)
-	if get_value(lines, "rotateOrigin", i, j) == "leftBaseline":
-	    j = del_token(lines, "rotateOrigin", i, j)
-
-	k = find_token2(lines, "rotate", i, j)
-	if k != -1:
-	    del lines[k]
-	    j = j-1
-	else:
-	    j = del_token(lines, "rotateAngle", i, j)
-
-	k = find_token2(lines, "size_type", i, j)
-	if k == -1:
-	    k = find_token2(lines, "size_kind", i, j)
-	if k != -1:
-	    size_type = string.split(lines[k])[1]
-	    del lines[k]
-	    j = j-1
-	    if size_type in ["0", "original"]:
-		j = del_token(lines, "width", i, j)
-		j = del_token(lines, "height", i, j)
-		j = del_token(lines, "scale", i, j)
-	    elif size_type in ["2", "scale"]:
-		j = del_token(lines, "width", i, j)
-		j = del_token(lines, "height", i, j)
-		if get_value(lines, "scale", i, j) == "100":
-		    j = del_token(lines, "scale", i, j)
-	    else:
-		j = del_token(lines, "scale", i, j)
-
-	k = find_token2(lines, "lyxsize_type", i, j)
-	if k == -1:
-	    k = find_token2(lines, "lyxsize_kind", i, j)
-	if k != -1:
-	    lyxsize_type = string.split(lines[k])[1]
-	    del lines[k]
-	    j = j-1
-	    j = del_token(lines, "lyxwidth", i, j)
-	    j = del_token(lines, "lyxheight", i, j)
-	    if lyxsize_type not in ["2", "scale"] or \
-	       get_value(lines, "lyxscale", i, j) == "100":
-		j = del_token(lines, "lyxscale", i, j)
-
-	i = i+1
-
-
-def change_tabular(lines):
+        i = find_token(lines, "\\begin_inset Graphics", i)
+        if i == -1:
+            break
+        j = find_end_of_inset(lines, i)
+
+        lines[i] = "\\begin_inset Graphics"
+
+        if get_value(lines, "display", i, j) == "default":
+            j = del_token(lines, "display", i, j)
+        if get_value(lines, "rotateOrigin", i, j) == "leftBaseline":
+            j = del_token(lines, "rotateOrigin", i, j)
+
+        k = find_token_exact(lines, "rotate", i, j)
+        if k != -1:
+            del lines[k]
+            j = j-1
+        else:
+            j = del_token(lines, "rotateAngle", i, j)
+
+        k = find_token_exact(lines, "size_type", i, j)
+        if k == -1:
+            k = find_token_exact(lines, "size_kind", i, j)
+        if k != -1:
+            size_type = lines[k].split()[1]
+            del lines[k]
+            j = j-1
+            if size_type in ["0", "original"]:
+                j = del_token(lines, "width", i, j)
+                j = del_token(lines, "height", i, j)
+                j = del_token(lines, "scale", i, j)
+            elif size_type in ["2", "scale"]:
+                j = del_token(lines, "width", i, j)
+                j = del_token(lines, "height", i, j)
+                if get_value(lines, "scale", i, j) == "100":
+                    j = del_token(lines, "scale", i, j)
+            else:
+                j = del_token(lines, "scale", i, j)
+
+        k = find_token_exact(lines, "lyxsize_type", i, j)
+        if k == -1:
+            k = find_token_exact(lines, "lyxsize_kind", i, j)
+        if k != -1:
+            lyxsize_type = lines[k].split()[1]
+            del lines[k]
+            j = j-1
+            j = del_token(lines, "lyxwidth", i, j)
+            j = del_token(lines, "lyxheight", i, j)
+            if lyxsize_type not in ["2", "scale"] or \
+               get_value(lines, "lyxscale", i, j) == "100":
+                j = del_token(lines, "lyxscale", i, j)
+
+        i = i+1
+
+
+def change_tabular(document):
+    " Change tabular."
+    lines = document.body
     i = 0
     while 1:
         i = find_token(lines, "<column", i)
@@ -90,14 +106,9 @@ def change_tabular(lines):
         i = i+1
 
 
-def convert(file):
-    change_insetgraphics(file.body)
-    change_tabular(file.body)
-    file.format = 221
-
-
-def revert(file):
-    file.error("The convertion to an older format (%s) is not implemented." % file.format)
+supported_versions = ["1.3.%d" % i for i in range(8)] + ["1.3"]
+convert = [[221, [change_insetgraphics, change_tabular]]]
+revert  = []
 
 
 if __name__ == "__main__":