]> git.lyx.org Git - lyx.git/blobdiff - lib/lyx2lyx/lyxconvert_224.py
move minipage->box conversion from 224 to 227
[lyx.git] / lib / lyx2lyx / lyxconvert_224.py
index 2f2ad64981d72fbbe2a08a96ec88567c831ccc9e..af4c733e93697b236a20300fc77706948f71a8b0 100644 (file)
@@ -18,7 +18,7 @@
 import re
 from parser_tools import find_token, find_tokens, find_end_of_inset, find_end_of
 from sys import stderr
-from string import replace, split, find
+from string import replace, split, find, replace, strip, join
 
 def add_end_layout(lines):
     i = find_token(lines, '\\layout', 0)
@@ -105,83 +105,34 @@ def end_document(lines):
         return
     lines[i] = "\\end_document"
 
-
-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"]
-
-    i = 0
-    while 1:
-        i = find_token(lines, "\\begin_inset Minipage", i)
-        if i == -1:
-            return
-
-        lines[i] = "\\begin_inset 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
-
-        # 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])
-        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:]
-            del lines[i]
-        else:
-            height = ' "0"'
-
-        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
-
 ##
 # Convert line and page breaks
 # Old:
 #\layout Standard
-#\line_top \line_bottom \pagebreak_top \pagebreak_bottom 
+#\line_top \line_bottom \pagebreak_top \pagebreak_bottom \added_space_top xxx \added_space_bottom yyy
 #0
 #
 # New:
-#\begin_layout Standard
+#\begin layout Standard
+#
 #\newpage 
 #
-#\lyxline 
+#\lyxline
+#\begin_inset VSpace xxx
+#\end_inset
+#
+#\end_layout
+#\begin_layout Standard
+#
 #0
+#\end_layout
+#\begin_layout Standard
+#
+#\begin_inset VSpace xxx
+#\end_inset
 #\lyxline 
 #
-#\newpage 
+#\newpage
 #
 #\end_layout
 
@@ -192,24 +143,58 @@ def convert_breaks(lines):
         if i == -1:
             return
         i = i + 1
-        line_top = find(lines[i],"\\line_top")
-        line_bot = find(lines[i],"\\line_bottom")
-        pb_top = find(lines[i],"\\pagebreak_top")
-        pb_bot = find(lines[i],"\\pagebreak_bottom")
-
-        if line_top == -1 and line_bot == -1 and pb_bot == -1 and pb_top == -1:
+        line_top   = find(lines[i],"\\line_top")
+        line_bot   = find(lines[i],"\\line_bottom")
+        pb_top     = find(lines[i],"\\pagebreak_top")
+        pb_bot     = find(lines[i],"\\pagebreak_bottom")
+        vspace_top = find(lines[i],"\\added_space_top")
+        vspace_bot = find(lines[i],"\\added_space_bottom")
+
+        if line_top == -1 and line_bot == -1 and pb_bot == -1 and pb_top == -1 and vspace_top == -1 and vspace_bot == -1:
             continue
 
-        lines[i] = ""
+        for tag in "\\line_top", "\\line_bottom", "\\pagebreak_top", "\\pagebreak_bottom":
+            lines[i] = replace(lines[i], tag, "")
+
+        if vspace_top != -1:
+            # the position could be change because of the removal of other
+            # paragraph properties above
+            vspace_top = find(lines[i],"\\added_space_top")
+            tmp_list = split(lines[i][vspace_top:])
+            vspace_top_value = tmp_list[1]
+            lines[i] = lines[i][:vspace_top] + join(tmp_list[2:])
+
+        if vspace_bot != -1:
+            # the position could be change because of the removal of other
+            # paragraph properties above
+            vspace_bot = find(lines[i],"\\added_space_bottom")
+            tmp_list = split(lines[i][vspace_bot:])
+            vspace_bot_value = tmp_list[1]
+            lines[i] = lines[i][:vspace_bot] + join(tmp_list[2:])
+
+        lines[i] = strip(lines[i])
         i = i + 1
 
-        if pb_top != -1:
-            lines.insert(i, "\\newpage ")
-            i = i + 1
+        #  Create an empty paragraph for line and page break that belong
+        # above the paragraph
+        if pb_top !=-1 or line_top != -1 or vspace_bot != -1:
+            
+            paragraph_above = ['','\\begin_layout Standard','','']
 
-        if line_top != -1:
-            lines.insert(i, "\\lyxline ")
-            i = i + 1
+            if pb_top != -1:
+                paragraph_above.extend(['\\newpage ',''])
+
+            if vspace_top != -1:
+                paragraph_above.extend(['\\begin_inset VSpace ' + vspace_top_value,'\\end_inset ','',''])
+
+            if line_top != -1:
+                paragraph_above.extend(['\\lyxline ',''])
+
+            paragraph_above.extend(['\\end_layout',''])
+
+            #inset new paragraph above the current paragraph
+            lines[i-2:i-2] = paragraph_above
+            i = i + len(paragraph_above)
 
         # Ensure that nested style are converted later.
         k = find_end_of(lines, i, "\\begin_layout", "\\end_layout")
@@ -217,20 +202,29 @@ def convert_breaks(lines):
         if k == -1:
             return
 
-        if line_bot != -1:
-            lines.insert(k, "\\lyxline ")
-            k = k + 1
+        if pb_top !=-1 or line_top != -1 or vspace_bot != -1:
+            
+            paragraph_bellow = ['','\\begin_layout Standard','','']
+
+            if line_bot != -1:
+                paragraph_bellow.extend(['\\lyxline ',''])
+
+            if vspace_bot != -1:
+                paragraph_bellow.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset ','',''])
+
+            if pb_bot != -1:
+                paragraph_bellow.extend(['\\newpage ',''])
+
+            paragraph_bellow.extend(['\\end_layout',''])
 
-        if pb_bot != -1:
-            lines.insert(k, "\\newpage ")
-            k = k + 1
+            #inset new paragraph above the current paragraph
+            lines[k + 1: k + 1] = paragraph_bellow
 
 def convert(header, body):
     add_end_layout(body)
     layout2begin_layout(body)
     end_document(body)
     table_valignment_middle(body)
-    convert_minipage(body)
     convert_breaks(body)
 
 if __name__ == "__main__":