Fix warnings in python 2.3.

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

diff --git a/lib/lyx2lyx/lyxconvert_224.py b/lib/lyx2lyx/lyxconvert_224.py
index 2f2ad64981d72fbbe2a08a96ec88567c831ccc9e..80e260cc2c20c9c12fd7443d9c4649127cc3bd92 100644 (file)
--- a/lib/lyx2lyx/lyxconvert_224.py
+++ b/lib/lyx2lyx/lyxconvert_224.py
@@ -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)
@@ -145,9 +145,12 @@ def convert_minipage(lines):
         # 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 = ' "0"'
+            height = ' "1pt"'
 
         if lines[i][:5] == "width":
             width = lines[i][5:]
@@ -170,18 +173,30 @@ def convert_minipage(lines):
 # 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 +207,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,13 +266,23 @@ 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)