add bibtopic support (bug 870).

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

diff --git a/lib/lyx2lyx/lyxconvert_227.py b/lib/lyx2lyx/lyxconvert_227.py
index e10332355690addf35ef64f7bdb8eb6a818e87b5..208156838477943bd3f96c3f9499d80e8db1c99e 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_227.py
+++ b/lib/lyx2lyx/lyxconvert_227.py
@@ -1,4 +1,5 @@
 # This file is part of lyx2lyx
+# -*- coding: iso-8859-1 -*-
 # Copyright (C) 2003 José Matos <jamatos@fep.up.pt>
 #
 # This program is free software; you can redistribute it and/or
@@ -34,8 +35,8 @@ def convert_collapsable(lines):
             break
 
         # Seach for a line starting 'collapsed'
-        # If, however, we find a line starting '\layout' (_always_ present)
-        # then break with a warning message
+        # If, however, we find a line starting '\begin_layout'
+        # (_always_ present) then break with a warning message
         i = i + 1
         while 1:
             if (lines[i] == "collapsed false"):
@@ -44,80 +45,44 @@ def convert_collapsable(lines):
             elif (lines[i] == "collapsed true"):
                 lines[i] = "status collapsed"
                 break
-            elif (lines[i][:7] == "\\layout"):
+            elif (lines[i][:13] == "\\begin_layout"):
                 sys.stderr.write("Malformed lyx file\n")
                 break
             i = i + 1
 
         i = i + 1
 
-
-def convert_minipage(lines):
-    """ Convert minipages to the box inset.
-    We try to use the same order of arguments as lyx does.
-    """
-    pos = ["t","c","b"]
-    inner_pos = ["c","t","b","s"]
-
+def convert_ert(lines):
     i = 0
     while 1:
-        i = find_token(lines, "\\begin_inset Minipage", i)
+        i = find_token(lines, "\\begin_inset ERT", i)
         if i == -1:
-            return
-
-        lines[i] = "\\begin_inset Box Frameless"
-        i = i + 1
-
-        # convert old to new position using the pos list
-        if lines[i][:8] == "position":
-            lines[i] = 'position "%s"' % pos[int(lines[i][9])]
-        else:
-            lines.insert(i, 'position "%s"' % pos[0])
-        i = i + 1
-
-        lines.insert(i, 'hor_pos "c"')
-        i = i + 1
-        lines.insert(i, 'has_inner_box 1')
-        i = i + 1
+            break
 
-        # convert the inner_position
-        if lines[i][:14] == "inner_position":
-            lines[i] = 'inner_pos "%s"' %  inner_pos[int(lines[i][15])]
-        else:
-            lines.insert('inner_pos "%s"' % inner_pos[0])
+        # Seach for a line starting 'status'
+        # If, however, we find a line starting '\begin_layout'
+        # (_always_ present) then break with a warning message
         i = i + 1
+        while 1:
+            if (lines[i] == "status Open"):
+                lines[i] = "status open"
+                break
+            elif (lines[i] == "status Collapsed"):
+                lines[i] = "status collapsed"
+                break
+            elif (lines[i] == "status Inlined"):
+                lines[i] = "status inlined"
+                break
+            elif (lines[i][:13] == "\\begin_layout"):
+                sys.stderr.write("Malformed lyx file\n")
+                break
+            i = i + 1
 
-        # We need this since the new file format has a height and width
-        # in a different order.
-        if lines[i][:6] == "height":
-            height = lines[i][6:]
-            # test for default value of 221 and convert it accordingly
-            if height == ' "0pt"':
-                height = ' "1pt"'
-            del lines[i]
-        else:
-            height = ' "1pt"'
-
-        if lines[i][:5] == "width":
-            width = lines[i][5:]
-            del lines[i]
-        else:
-            width = ' "0"'
-
-        lines.insert(i, 'use_parbox 0')
-        i = i + 1
-        lines.insert(i, 'width' + width)
-        i = i + 1
-        lines.insert(i, 'special "none"')
-        i = i + 1
-        lines.insert(i, 'height' + height)
-        i = i + 1
-        lines.insert(i, 'height_special "totalheight"')
         i = i + 1
 
 def convert(header, body):
     convert_collapsable(body)
-    convert_minipage(body)
+    convert_ert(body)
 
 if __name__ == "__main__":
     pass