Convert vertical spaces to new format

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8186 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index 52248842cc47c6b3e23d5da94b7ae5de9d8a2c31..11af38359fc67cbb7077e8e1e97f036bd6ee7832 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-03  José Matos  <jamatos@lyx.org>
+
+       * lyx2lyx: update copyright date
+       * lyxconvert_224.py (convert_breaks): add vertical space convertion.
+
 2003-11-14  Kornel Benko  <kornel.benko@berlin.de>
 
        * lyxconvert_224.py (convert_minipage): fix convertion of minipages

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index 5806b135c061253788b9d4d48962eaf7dce46b84..82af2cac039a9566dfdcdcb83e4b4380feb38bc6 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2002 José Matos <jamatos@lyx.org>
+# Copyright (C) 2002-2003 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

diff --git a/lib/lyx2lyx/lyxconvert_224.py b/lib/lyx2lyx/lyxconvert_224.py
index ec744e3a67e3728de45d00bee4441715518e25c5..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, replace, strip
+from string import replace, split, find, replace, strip, join
 
 def add_end_layout(lines):
     i = find_token(lines, '\\layout', 0)
@@ -173,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
 
@@ -195,42 +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
 
         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
 
         #  Create an empty paragraph for line and page break that belong
         # above the paragraph
-        #  To simplify the code, and maintain the same insertion point,
-        # I inserted by reverse order. It looks funny. :-)
-        if pb_top !=-1 or line_top != -1:
-            k = i - 3
-            lines.insert(k, '')
-            lines.insert(k, '\\end_layout')
+        if pb_top !=-1 or line_top != -1 or vspace_bot != -1:
+            
+            paragraph_above = ['','\\begin_layout Standard','','']
+
+            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:
-                lines.insert(k, '')
-                lines.insert(k, "\\lyxline ")
-                i = i + 2
+                paragraph_above.extend(['\\lyxline ',''])
 
-            if pb_top != -1:
-                lines.insert(k, '')
-                lines.insert(k, "\\newpage ")
-                i = i + 2
+            paragraph_above.extend(['\\end_layout',''])
 
-            lines.insert(k, '')
-            lines.insert(k, '')
-            lines.insert(k, '\\begin_layout Standard')
-            i = i + 5
+            #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")
@@ -238,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)