X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyx2lyx%2Flyxconvert_224.py;h=af4c733e93697b236a20300fc77706948f71a8b0;hb=207ea41f2fd9cbd0e67e3aa6091cda2d5f3c609a;hp=a391c3c2af90df85ddaee58c89817a57baeadba6;hpb=9498f9758fcfd317c74969b12397b753846eb2f6;p=lyx.git

diff --git a/lib/lyx2lyx/lyxconvert_224.py b/lib/lyx2lyx/lyxconvert_224.py
index a391c3c2af..af4c733e93 100644
--- a/lib/lyx2lyx/lyxconvert_224.py
+++ b/lib/lyx2lyx/lyxconvert_224.py
@@ -16,10 +16,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import re
-from parser_tools import find_token, find_tokens, find_end_of_inset
+from parser_tools import find_token, find_tokens, find_end_of_inset, find_end_of
 from sys import stderr
-from string import replace, split, strip
-import re
+from string import replace, split, find, replace, strip, join
 
 def add_end_layout(lines):
     i = find_token(lines, '\\layout', 0)
@@ -65,7 +64,7 @@ def add_end_layout(lines):
             lines.insert(i,"\\end_layout")
             i = i + 2
             continue
-        
+
         #case \end_document
         lines.insert(i, "\\end_layout")
         return
@@ -106,77 +105,127 @@ def end_document(lines):
         return
     lines[i] = "\\end_document"
 
-def convert_bibtex(lines):
-    bibtex_header = "\\begin_inset LatexCommand \\bibtex"
+##
+# Convert line and page breaks
+# Old:
+#\layout Standard
+#\line_top \line_bottom \pagebreak_top \pagebreak_bottom \added_space_top xxx \added_space_bottom yyy
+#0
+#
+# New:
+#\begin layout Standard
+#
+#\newpage 
+#
+#\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
+#
+#\end_layout
+
+def convert_breaks(lines):    
     i = 0
     while 1:
-        i = find_token(lines, bibtex_header, i)
+        i = find_token(lines, "\\begin_layout", i)
         if i == -1:
-            break
-        # We've found a bibtex inset.
-        # I'd like to strip bibtex_header from the front of lines[i]
-        lines[i] = replace(lines[i], bibtex_header, "")
+            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")
+        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:])
 
-        # Trim any space at extremes
         lines[i] = strip(lines[i])
+        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 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")
+
+        if k == -1:
+            return
+
+        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',''])
+
+            #inset new paragraph above the current paragraph
+            lines[k + 1: k + 1] = paragraph_bellow
 
-        # Does the thing have an opt arg?
-        optarg_rexp = re.compile(r'^\[([^]]*)\]')
-        optarg = optarg_rexp.search(lines[i])
-        optarg_contents = ''
-        if optarg:
-                optarg_contents = optarg.group(1)
-                # strip [<optarg_contents>] from the front of lines[i]
-                lines[i] = replace (lines[i], '[' + optarg.group(0) + ']', '')
-
-        # lines[i] should now contain "{<list of databases>}"
-        mainarg_rexp = re.compile(r'{([^}]*)}')
-        mainarg = mainarg_rexp.search(lines[i])
-        mainarg_contents = ''
-        if mainarg:
-                mainarg_contents = mainarg.group(1)
-        else:
-                # complain about a mal-formed lyx file.
-                stderr.write("Mal-formed bibitem\n")
-
-        # optarg will contain either
-        #       "bibtotoc,<style>"
-        # or
-        #       "<style>"
-        # ie, these are a comma-separated list of arguments.
-        optarg_list = split(optarg_contents, ',')
-        if len(optarg_list) == 0:
-            bibtotoc, style = '',''
-        elif len(optarg_list) == 1:
-            bibtotoc, style = '',optarg_list[0]
-        else:
-            bibtotoc, style = 'true',optarg_list[1]
-        
-        # mainarg will contain a comma-separated list of files.
-        mainarg_list = split( mainarg_contents, ',')
-
-        new_syntax = ['\\begin_inset Bibtex']
-        for file in mainarg_list:
-            new_syntax.append('\t' + 'filename ' + file)
-
-        if style:
-            new_syntax.append('\t' + 'style ' + style)
-
-        if bibtotoc == 'true':
-            new_syntax.append('\t' + 'bibtotoc ' + bibtotoc)
-
-        # Replace old syntax with new
-        lines[i:i+1] = new_syntax
-
-        i = i + len(new_syntax) + 1
-
-        
 def convert(header, body):
     add_end_layout(body)
     layout2begin_layout(body)
     end_document(body)
     table_valignment_middle(body)
-    convert_bibtex(body)
+    convert_breaks(body)
 
 if __name__ == "__main__":
     pass