X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flyx2lyx%2Flyx_1_4.py;h=c043472ff0646f56f18ebb06aae7e394c12777c7;hb=b8227ebda0a2a8127731749d2caaa5dae45ef5d7;hp=0722503a4228d2336fc45e89bf448900d8c97b5f;hpb=eb0de102db22fad861d758e411f4709f26d3f3a5;p=lyx.git

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 0722503a42..c043472ff0 100644
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -2,6 +2,7 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2002 Dekel Tsur <dekel@lyx.org>
 # Copyright (C) 2002-2004 José Matos <jamatos@lyx.org>
+# Copyright (C) 2004-2005 Georg Baum <Georg.Baum@post.rwth-aachen.de>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -22,7 +23,8 @@ from os import access, F_OK
 import os.path
 from parser_tools import find_token, find_end_of_inset, get_next_paragraph, \
                          get_paragraph, get_value, del_token, is_nonempty_line,\
-			 find_tokens, find_end_of, find_token2
+			 find_tokens, find_end_of, find_token2, find_re,\
+                         get_layout
 from sys import stdin
 from string import replace, split, find, strip, join
 
@@ -64,8 +66,73 @@ def convert_spaces(file):
 
 
 def revert_spaces(file):
+    regexp = re.compile(r'(.*)(\\InsetSpace\s+)(\S+)')
+    i = 0
+    while 1:
+        i = find_re(file.body, regexp, i)
+        if i == -1:
+            break
+        space = regexp.match(file.body[i]).group(3)
+	prepend = regexp.match(file.body[i]).group(1)
+        if space == '~':
+            file.body[i] = regexp.sub(prepend + '\\SpecialChar ~', file.body[i])
+            i = i + 1
+        else:
+            file.body[i] = regexp.sub(prepend, file.body[i])
+            file.body[i+1:i+1] = ''
+	    if space == "\\space":
+		space = "\\ "
+            i = insert_ert(file.body, i+1, 'Collapsed', space, file.format - 1, file.default_layout)
+
+##
+# \InsetSpace \, -> \InsetSpace \thinspace{}
+# \InsetSpace \space -> \InsetSpace \space{}
+#
+def rename_spaces(file):
+    for i in range(len(file.body)):
+        file.body[i] = replace(file.body[i],"\\InsetSpace \\space","\\InsetSpace \\space{}")
+	file.body[i] = replace(file.body[i],"\\InsetSpace \,","\\InsetSpace \\thinspace{}")
+
+
+def revert_space_names(file):
     for i in range(len(file.body)):
-        file.body[i] = replace(file.body[i],"\\InsetSpace ~", "\\SpecialChar ~")
+        file.body[i] = replace(file.body[i],"\\InsetSpace \\space{}","\\InsetSpace \\space")
+	file.body[i] = replace(file.body[i],"\\InsetSpace \\thinspace{}","\\InsetSpace \\,")
+
+
+##
+# equivalent to lyx::support::escape()
+#
+def lyx_support_escape(lab):
+    hexdigit = ['0', '1', '2', '3', '4', '5', '6', '7',
+                '8', '9', 'A', 'B', 'C', 'D', 'E', 'F']
+    enc = ""
+    for c in lab:
+        o = ord(c)
+        if o >= 128 or c == '=' or c == '%':
+            enc = enc + '='
+            enc = enc + hexdigit[o >> 4]
+            enc = enc + hexdigit[o & 15]
+        else:
+            enc = enc + c
+    return enc;
+
+
+##
+# \begin_inset LatexCommand \eqref -> ERT
+#
+def revert_eqref(file):
+    regexp = re.compile(r'^\\begin_inset\s+LatexCommand\s+\\eqref')
+    i = 0
+    while 1:
+        i = find_re(file.body, regexp, i)
+        if i == -1:
+            break
+        eqref = lyx_support_escape(regexp.sub("", file.body[i]))
+        file.body[i:i+1] = ["\\begin_inset ERT", "status Collapsed", "",
+                            '\\layout %s' % file.default_layout, "", "\\backslash ",
+                            "eqref" + eqref]
+        i = i + 7
 
 
 ##
@@ -185,10 +252,10 @@ def convert_comment(file):
         if i == -1:
             return
 
-        file.body[i:i+1] = ["\\layout Standard","","",
+        file.body[i:i+1] = ['\\layout %s' % file.default_layout,"","",
                         "\\begin_inset Comment",
                         "collapsed true","",
-                        "\\layout Standard"]
+                        '\\layout %s' % file.default_layout]
         i = i + 7
 
         while 1:
@@ -237,7 +304,7 @@ def convert_comment(file):
                     file.body[i:i] = ["\\end_inset"]
                     i = i + 1
                     break
-                file.body[i:i+1] = ["\\layout Standard"]
+                file.body[i:i+1] = ['\\layout %s' % file.default_layout]
                 i = i + 1
 
 
@@ -268,7 +335,13 @@ def add_end_layout(file):
         i = find_tokens(file.body, ["\\begin_inset", "\\end_inset", "\\layout",
                                 "\\begin_deeper", "\\end_deeper", "\\the_end"], i)
 
-        token = split(file.body[i])[0]
+        if i != -1:
+            token = split(file.body[i])[0]
+        else:
+            file.warning("Truncated file.")
+            i = len(file.body)
+            file.body.insert(i, '\\the_end')
+            token = ""
 
         if token == "\\begin_inset":
             struct_stack.append(token)
@@ -395,9 +468,10 @@ def convert_valignment_middle(body, start, end):
 
 
 def convert_table_valignment_middle(file):
+    regexp = re.compile(r'^\\begin_inset\s+Tabular')
     i = 0
     while 1:
-        i = find_token(file.body, '\\begin_inset  Tabular', i)
+        i = find_re(file.body, regexp, i)
         if i == -1:
             return
         j = find_end_of_inset(file.body, i + 1)
@@ -416,9 +490,10 @@ def revert_table_valignment_middle(body, start, end):
 
 
 def revert_valignment_middle(file):
+    regexp = re.compile(r'^\\begin_inset\s+Tabular')
     i = 0
     while 1:
-        i = find_token(file.body, '\\begin_inset  Tabular', i)
+        i = find_re(file.body, regexp, i)
         if i == -1:
             return
         j = find_end_of_inset(file.body, i + 1)
@@ -462,15 +537,18 @@ def revert_end_document(file):
 #\newpage
 #
 #\lyxline
-#\begin_inset VSpace xxx
+#\begin_inset ERT
+#\begin layout Standard
+#\backslash
+#vspace{-1\backslash
+#parskip}
+#\end_layout
 #\end_inset
 #
-#\end_layout
-#\begin_layout Standard
+#\begin_inset VSpace xxx
+#\end_inset
 #
 #0
-#\end_layout
-#\begin_layout Standard
 #
 #\begin_inset VSpace xxx
 #\end_inset
@@ -480,12 +558,29 @@ def revert_end_document(file):
 #
 #\end_layout
 def convert_breaks(file):
+    par_params = ('added_space_bottom', 'added_space_top', 'align',
+                 'labelwidthstring', 'line_bottom', 'line_top', 'noindent',
+                 'pagebreak_bottom', 'pagebreak_top', 'paragraph_spacing',
+                 'start_of_appendix')
+    font_attributes = ['\\family', '\\series', '\\shape', '\\emph',
+                       '\\numeric', '\\bar', '\\noun', '\\color', '\\lang']
+    attribute_values = ['default', 'default', 'default', 'default',
+                        'default', 'default', 'default', 'none', file.language]
     i = 0
     while 1:
         i = find_token(file.body, "\\begin_layout", i)
         if i == -1:
             return
+        layout = get_layout(file.body[i], file.default_layout)
         i = i + 1
+
+        # Merge all paragraph parameters into a single line
+        # We cannot check for '\\' only because paragraphs may start e.g.
+        # with '\\backslash'
+        while file.body[i + 1][:1] == '\\' and split(file.body[i + 1][1:])[0] in par_params:
+            file.body[i] = file.body[i + 1] + ' ' + file.body[i]
+            del file.body[i+1]
+
         line_top   = find(file.body[i],"\\line_top")
         line_bot   = find(file.body[i],"\\line_bottom")
         pb_top     = find(file.body[i],"\\pagebreak_top")
@@ -496,6 +591,28 @@ def convert_breaks(file):
         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
 
+        # Do we have a nonstandard paragraph? We need to create new paragraphs
+        # if yes to avoid putting lyxline etc. inside of special environments.
+        # This is wrong for itemize and enumerate environments, but it is
+        # impossible to convert these correctly.
+        # We want to avoid new paragraphs if possible becauase we want to
+        # inherit font sizes.
+        nonstandard = 0
+        if (not file.is_default_layout(layout) or
+            find(file.body[i],"\\align") != -1 or
+            find(file.body[i],"\\labelwidthstring") != -1 or
+            find(file.body[i],"\\noindent") != -1):
+            nonstandard = 1
+
+        # get the font size of the beginning of this paragraph, since we need
+        # it for the lyxline inset
+        j = i + 1
+        while not is_nonempty_line(file.body[j]):
+            j = j + 1
+        size_top = ""
+        if find(file.body[j], "\\size") != -1:
+            size_top = split(file.body[j])[1]
+
         for tag in "\\line_top", "\\line_bottom", "\\pagebreak_top", "\\pagebreak_bottom":
             file.body[i] = replace(file.body[i], tag, "")
 
@@ -518,11 +635,14 @@ def convert_breaks(file):
         file.body[i] = strip(file.body[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:
+        # Create an empty paragraph or paragraph fragment for line and
+        # page break that belong above the paragraph
+        if pb_top !=-1 or line_top != -1 or vspace_top != -1:
 
-            paragraph_above = ['','\\begin_layout Standard','','']
+            paragraph_above = list()
+            if nonstandard:
+                # We need to create an extra paragraph for nonstandard environments
+                paragraph_above = ['\\begin_layout %s' % file.default_layout, '']
 
             if pb_top != -1:
                 paragraph_above.extend(['\\newpage ',''])
@@ -531,12 +651,23 @@ def convert_breaks(file):
                 paragraph_above.extend(['\\begin_inset VSpace ' + vspace_top_value,'\\end_inset','',''])
 
             if line_top != -1:
-                paragraph_above.extend(['\\lyxline ',''])
-
-            paragraph_above.extend(['\\end_layout',''])
+                if size_top != '':
+                    paragraph_above.extend(['\\size ' + size_top + ' '])
+                # We need an additional vertical space of -\parskip.
+                # We can't use the vspace inset because it does not know \parskip.
+                paragraph_above.extend(['\\lyxline ', '', ''])
+                insert_ert(paragraph_above, len(paragraph_above) - 1, 'Collapsed',
+                           '\\vspace{-1\\parskip}\n', file.format + 1, file.default_layout)
+                paragraph_above.extend([''])
+
+            if nonstandard:
+                paragraph_above.extend(['\\end_layout ',''])
+                # insert new paragraph above the current paragraph
+                file.body[i-2:i-2] = paragraph_above
+            else:
+                # insert new lines at the beginning of the current paragraph
+                file.body[i:i] = paragraph_above
 
-            #inset new paragraph above the current paragraph
-            file.body[i-2:i-2] = paragraph_above
             i = i + len(paragraph_above)
 
         # Ensure that nested style are converted later.
@@ -545,23 +676,50 @@ def convert_breaks(file):
         if k == -1:
             return
 
-        if pb_top !=-1 or line_top != -1 or vspace_bot != -1:
-
-            paragraph_bellow = ['','\\begin_layout Standard','','']
+        if pb_bot !=-1 or line_bot != -1 or vspace_bot != -1:
+
+            # get the font size of the end of this paragraph
+            size_bot = size_top
+            j = i + 1
+            while j < k:
+                if find(file.body[j], "\\size") != -1:
+                    size_bot = split(file.body[j])[1]
+                    j = j + 1
+                elif find(file.body[j], "\\begin_inset") != -1:
+                    # skip insets
+                    j = find_end_of_inset(file.body, j)
+                else:
+                    j = j + 1
+
+            paragraph_below = list()
+            if nonstandard:
+                # We need to create an extra paragraph for nonstandard environments
+                paragraph_below = ['', '\\begin_layout %s' % file.default_layout, '']
+            else:
+                for a in range(len(font_attributes)):
+                    if find_token(file.body, font_attributes[a], i, k) != -1:
+                        paragraph_below.extend([font_attributes[a] + ' ' + attribute_values[a]])
 
             if line_bot != -1:
-                paragraph_bellow.extend(['\\lyxline ',''])
+                if nonstandard and size_bot != '':
+                    paragraph_below.extend(['\\size ' + size_bot + ' '])
+                paragraph_below.extend(['\\lyxline ',''])
+                if size_bot != '':
+                    paragraph_below.extend(['\\size default '])
 
             if vspace_bot != -1:
-                paragraph_bellow.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset','',''])
+                paragraph_below.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset','',''])
 
             if pb_bot != -1:
-                paragraph_bellow.extend(['\\newpage ',''])
+                paragraph_below.extend(['\\newpage ',''])
 
-            paragraph_bellow.extend(['\\end_layout',''])
-
-            #inset new paragraph above the current paragraph
-            file.body[k + 1: k + 1] = paragraph_bellow
+            if nonstandard:
+                paragraph_below.extend(['\\end_layout '])
+                # insert new paragraph below the current paragraph
+                file.body[k+1:k+1] = paragraph_below
+            else:
+                # insert new lines at the end of the current paragraph
+                file.body[k:k] = paragraph_below
 
 
 ##
@@ -653,7 +811,7 @@ def convert_collapsable(file):
                 file.body[i] = "status collapsed"
                 break
             elif (file.body[i][:13] == "\\begin_layout"):
-                file.warning("Malformed LyX file.")
+                file.warning("Malformed LyX file: Missing 'collapsed'.")
                 break
             i = i + 1
 
@@ -688,7 +846,7 @@ def revert_collapsable(file):
                 file.body[i] = "collapsed true"
                 break
             elif (file.body[i][:13] == "\\begin_layout"):
-                file.warning("Malformed LyX file.")
+                file.warning("Malformed LyX file: Missing 'status'.")
                 break
             i = i + 1
 
@@ -720,7 +878,7 @@ def convert_ert(file):
                 file.body[i] = "status inlined"
                 break
             elif (file.body[i][:13] == "\\begin_layout"):
-                file.warning("Malformed LyX file.")
+                file.warning("Malformed LyX file: Missing 'status'.")
                 break
             i = i + 1
 
@@ -749,7 +907,7 @@ def revert_ert(file):
                 file.body[i] = "status Inlined"
                 break
             elif (file.body[i][:13] == "\\begin_layout"):
-                file.warning("Malformed LyX file.")
+                file.warning("Malformed LyX file : Missing 'status'.")
                 break
             i = i + 1
 
@@ -799,7 +957,7 @@ def convert_minipage(file):
         if file.body[i][:6] == "height":
             height = file.body[i][6:]
             # test for default value of 221 and convert it accordingly
-            if height == ' "0pt"':
+            if height == ' "0pt"' or height == ' "0"':
                 height = ' "1pt"'
             del file.body[i]
         else:
@@ -835,110 +993,388 @@ def convert_minipage(file):
 
 
 # -------------------------------------------------------------------------------------------
-# Convert backslashes into valid ERT code, append the converted text to
-# file.body[i] and return the (maybe incremented) line index i
-def convert_ertbackslash(body, i, ert):
+# Convert backslashes and '\n' into valid ERT code, append the converted
+# text to body[i] and return the (maybe incremented) line index i
+def convert_ertbackslash(body, i, ert, format, default_layout):
     for c in ert:
 	if c == '\\':
 	    body[i] = body[i] + '\\backslash '
 	    i = i + 1
 	    body.insert(i, '')
+	elif c == '\n':
+            if format <= 240:
+                body[i+1:i+1] = ['\\newline ', '']
+                i = i + 2
+            else:
+                body[i+1:i+1] = ['\\end_layout', '', '\\begin_layout %s' % default_layout, '']
+                i = i + 4
 	else:
 	    body[i] = body[i] + c
     return i
 
 
-def convert_vspace(file):
+# Converts lines in ERT code to LaTeX
+# The surrounding \begin_layout ... \end_layout pair must not be included
+def ert2latex(lines, format):
+    backslash = re.compile(r'\\backslash\s*$')
+    newline = re.compile(r'\\newline\s*$')
+    if format <= 224:
+        begin_layout = re.compile(r'\\layout\s*\S+$')
+    else:
+        begin_layout = re.compile(r'\\begin_layout\s*\S+$')
+    end_layout = re.compile(r'\\end_layout\s*$')
+    ert = ''
+    for i in range(len(lines)):
+        line = backslash.sub('\\\\', lines[i])
+        if format <= 240:
+            if begin_layout.match(line):
+                line = '\n\n'
+            else:
+                line = newline.sub('\n', line)
+        else:
+            if begin_layout.match(line):
+                line = '\n'
+        if format > 224 and end_layout.match(line):
+            line = ''
+        ert = ert + line
+    return ert
+
+
+# get all paragraph parameters. They can be all on one line or on several lines.
+# lines[i] must be the first parameter line
+def get_par_params(lines, i):
+    par_params = ('added_space_bottom', 'added_space_top', 'align',
+                 'labelwidthstring', 'line_bottom', 'line_top', 'noindent',
+                 'pagebreak_bottom', 'pagebreak_top', 'paragraph_spacing',
+                 'start_of_appendix')
+    # We cannot check for '\\' only because paragraphs may start e.g.
+    # with '\\backslash'
+    params = ''
+    while lines[i][:1] == '\\' and split(lines[i][1:])[0] in par_params:
+        params = params + ' ' + strip(lines[i])
+	i = i + 1
+    return strip(params)
+
+
+# convert LyX font size to LaTeX fontsize
+def lyxsize2latexsize(lyxsize):
+    sizes = {"tiny" : "tiny", "scriptsize" : "scriptsize",
+             "footnotesize" : "footnotesize", "small" : "small",
+             "normal" : "normalsize", "large" : "large", "larger" : "Large",
+             "largest" : "LARGE", "huge" : "huge", "giant" : "Huge"}
+    if lyxsize in sizes:
+        return '\\' + sizes[lyxsize]
+    return ''
+
+
+# Change vspace insets, page breaks and lyxlines to paragraph options
+# (if possible) or ERT
+def revert_breaks(file):
 
     # Get default spaceamount
     i = find_token(file.header, '\\defskip', 0)
     if i == -1:
-	defskipamount = 'medskip'
+        defskipamount = 'medskip'
     else:
-	defskipamount = split(file.header[i])[1]
+        defskipamount = split(file.header[i])[1]
+
+    keys = {"\\begin_inset" : "vspace", "\\lyxline" : "lyxline",
+            "\\newpage" : "newpage"}
+    keywords_top = {"vspace" : "\\added_space_top", "lyxline" : "\\line_top",
+                    "newpage" : "\\pagebreak_top"}
+    keywords_bot = {"vspace" : "\\added_space_bottom", "lyxline" : "\\line_bottom",
+                    "newpage" : "\\pagebreak_bottom"}
+    tokens = ["\\begin_inset VSpace", "\\lyxline", "\\newpage"]
 
     # Convert the insets
     i = 0
     while 1:
-        i = find_token(file.body, '\\begin_inset VSpace', i)
+        i = find_tokens(file.body, tokens, i)
         if i == -1:
             return
-	spaceamount = split(file.body[i])[2]
-
-	# Are we at the beginning or end of a paragraph?
-	paragraph_start = 1
-	start = get_paragraph(file.body, i) + 1
-	for k in range(start, i):
-	    if is_nonempty_line(file.body[k]):
-		paragraph_start = 0
-		break
-	paragraph_end = 1
-	j = find_end_of_inset(file.body, i)
-	if j == -1:
-	    file.warning("Malformed LyX file: Missing '\\end_inset'.")
-	    i = i + 1
-	    continue
-	end = get_next_paragraph(file.body, i)
-	for k in range(j + 1, end):
-	    if is_nonempty_line(file.body[k]):
-		paragraph_end = 0
-		break
-
-	# Convert to paragraph formatting if we are at the beginning or end
-	# of a paragraph and the resulting paragraph would not be empty
-	if ((paragraph_start and not paragraph_end) or
-	    (paragraph_end   and not paragraph_start)):
-	    # The order is important: del and insert invalidate some indices
-	    del file.body[j]
-	    del file.body[i]
-	    if paragraph_start:
-		file.body.insert(start, '\\added_space_top ' + spaceamount + ' ')
-	    else:
-		file.body.insert(start, '\\added_space_bottom ' + spaceamount + ' ')
-	    continue
-
-	# Convert to ERT
-	file.body[i:i+1] = ['\\begin_inset ERT', 'status Collapsed', '',
-	                '\\layout Standard', '', '\\backslash ']
-	i = i + 6
-	if spaceamount[-1] == '*':
-	    spaceamount = spaceamount[:-1]
-	    keep = 1
-	else:
-	    keep = 0
-
-	# Replace defskip by the actual value
-	if spaceamount == 'defskip':
-	    spaceamount = defskipamount
-
-	# LaTeX does not know \\smallskip* etc
-	if keep:
-	    if spaceamount == 'smallskip':
-		spaceamount = '\\smallskipamount'
-	    elif spaceamount == 'medskip':
-		spaceamount = '\\medskipamount'
-	    elif spaceamount == 'bigskip':
-		spaceamount = '\\bigskipamount'
-	    elif spaceamount == 'vfill':
-		spaceamount = '\\fill'
-
-	# Finally output the LaTeX code
-	if (spaceamount == 'smallskip' or spaceamount == 'medskip' or
-	    spaceamount == 'bigskip'   or spaceamount == 'vfill'):
-	    file.body.insert(i, spaceamount)
-	else :
-	    if keep:
-		file.body.insert(i, 'vspace*{')
-	    else:
-		file.body.insert(i, 'vspace{')
-	    i = convert_ertbackslash(file.body, i, spaceamount)
-            file.body[i] =  file.body[i] + '}'
-        i = i + 1
 
+        # Are we at the beginning of a paragraph?
+        paragraph_start = 1
+        this_par = get_paragraph(file.body, i, file.format - 1)
+        start = this_par + 1
+        params = get_par_params(file.body, start)
+        size = "normal"
+        # Paragraph parameters may be on one or more lines.
+        # Find the start of the real paragraph text.
+        while file.body[start][:1] == '\\' and split(file.body[start])[0] in params:
+            start = start + 1
+        for k in range(start, i):
+            if find(file.body[k], "\\size") != -1:
+                # store font size
+                size = split(file.body[k])[1]
+            elif is_nonempty_line(file.body[k]):
+                paragraph_start = 0
+                break
+        # Find the end of the real paragraph text.
+        next_par = get_next_paragraph(file.body, i, file.format - 1)
+        if next_par == -1:
+            file.warning("Malformed LyX file: Missing next paragraph.")
+            i = i + 1
+            continue
 
-# Convert a LyX length into valid ERT code and append it to body[i]
-# Return the (maybe incremented) line index i
-def convert_ertlen(body, i, len, special):
+        # first line of our insets
+        inset_start = i
+        # last line of our insets
+        inset_end = inset_start
+        # Are we at the end of a paragraph?
+        paragraph_end = 1
+        # start and end line numbers to delete if we convert this inset
+        del_lines = list()
+        # is this inset a lyxline above a paragraph?
+        top = list()
+        # raw inset information
+        lines = list()
+        # name of this inset
+        insets = list()
+        # font size of this inset
+        sizes = list()
+
+        # Detect subsequent lyxline, vspace and pagebreak insets created by convert_breaks()
+        n = 0
+        k = inset_start
+        while k < next_par:
+            if find_tokens(file.body, tokens, k) == k:
+                # inset to convert
+                lines.append(split(file.body[k]))
+                insets.append(keys[lines[n][0]])
+                del_lines.append([k, k])
+                top.append(0)
+                sizes.append(size)
+                n = n + 1
+                inset_end = k
+            elif find(file.body[k], "\\size") != -1:
+                # store font size
+                size = split(file.body[k])[1]
+            elif find_token(file.body, "\\begin_inset ERT", k) == k:
+                ert_begin = find_token(file.body, "\\layout", k) + 1
+                if ert_begin == 0:
+                    file.warning("Malformed LyX file: Missing '\\layout'.")
+                    continue
+                ert_end = find_end_of_inset(file.body, k)
+                if ert_end == -1:
+                    file.warning("Malformed LyX file: Missing '\\end_inset'.")
+                    continue
+                ert = ert2latex(file.body[ert_begin:ert_end], file.format - 1)
+                if (n > 0 and insets[n - 1] == "lyxline" and
+                    ert == '\\vspace{-1\\parskip}\n'):
+                    # vspace ERT created by convert_breaks() for top lyxline
+                    top[n - 1] = 1
+                    del_lines[n - 1][1] = ert_end
+                    inset_end = ert_end
+                    k = ert_end
+                else:
+                    paragraph_end = 0
+                    break
+            elif (n > 0 and insets[n - 1] == "vspace" and
+                  find_token(file.body, "\\end_inset", k) == k):
+                # ignore end of vspace inset
+                del_lines[n - 1][1] = k
+                inset_end = k
+            elif is_nonempty_line(file.body[k]):
+                paragraph_end = 0
+                break
+            k = k + 1
+
+        # Determine space amount for vspace insets
+        spaceamount = list()
+        arguments = list()
+        for k in range(n):
+            if insets[k] == "vspace":
+                spaceamount.append(lines[k][2])
+                arguments.append(' ' + spaceamount[k] + ' ')
+            else:
+                spaceamount.append('')
+                arguments.append(' ')
+
+        # Can we convert to top paragraph parameters?
+        before = 0
+        if ((n == 3 and insets[0] == "newpage" and insets[1] == "vspace" and
+             insets[2] == "lyxline" and top[2]) or
+            (n == 2 and
+             ((insets[0] == "newpage" and insets[1] == "vspace") or
+              (insets[0] == "newpage" and insets[1] == "lyxline" and top[1]) or
+              (insets[0] == "vspace"  and insets[1] == "lyxline" and top[1]))) or
+            (n == 1 and insets[0] == "lyxline" and top[0])):
+            # These insets have been created before a paragraph by
+            # convert_breaks()
+            before = 1
+
+        # Can we convert to bottom paragraph parameters?
+        after = 0
+        if ((n == 3 and insets[0] == "lyxline" and not top[0] and
+             insets[1] == "vspace" and insets[2] == "newpage") or
+            (n == 2 and
+             ((insets[0] == "lyxline" and not top[0] and insets[1] == "vspace") or
+              (insets[0] == "lyxline" and not top[0] and insets[1] == "newpage") or
+              (insets[0] == "vspace"  and insets[1] == "newpage"))) or
+            (n == 1 and insets[0] == "lyxline" and not top[0])):
+            # These insets have been created after a paragraph by
+            # convert_breaks()
+            after = 1
+
+        if paragraph_start and paragraph_end:
+            # We are in a paragraph of our own.
+            # We must not delete this paragraph if it has parameters
+            if params == '':
+                # First try to merge with the previous paragraph.
+                # We try the previous paragraph first because we would
+                # otherwise need ERT for two subsequent vspaces.
+                prev_par = get_paragraph(file.body, this_par - 1, file.format - 1) + 1
+                if prev_par > 0 and not before:
+                    prev_params = get_par_params(file.body, prev_par + 1)
+                    ert = 0
+                    # determine font size
+                    prev_size = "normal"
+                    k = prev_par + 1
+                    while file.body[k][:1] == '\\' and split(file.body[k])[0] in prev_params:
+                        k = k + 1
+                    while k < this_par:
+                        if find(file.body[k], "\\size") != -1:
+                            prev_size = split(file.body[k])[1]
+                            break
+                        elif find(file.body[k], "\\begin_inset") != -1:
+                            # skip insets
+                            k = find_end_of_inset(file.body, k)
+                        elif is_nonempty_line(file.body[k]):
+                            break
+                        k = k + 1
+                    for k in range(n):
+                        if (keywords_bot[insets[k]] in prev_params or
+                            (insets[k] == "lyxline" and sizes[k] != prev_size)):
+                            ert = 1
+                            break
+                    if not ert:
+                        for k in range(n):
+                            file.body.insert(prev_par + 1,
+                                             keywords_bot[insets[k]] + arguments[k])
+                        del file.body[this_par+n:next_par-1+n]
+                        i = this_par + n
+                        continue
+                # Then try next paragraph
+                if next_par > 0 and not after:
+                    next_params = get_par_params(file.body, next_par + 1)
+                    ert = 0
+                    while file.body[k][:1] == '\\' and split(file.body[k])[0] in next_params:
+                        k = k + 1
+                    # determine font size
+                    next_size = "normal"
+                    k = next_par + 1
+                    while k < this_par:
+                        if find(file.body[k], "\\size") != -1:
+                            next_size = split(file.body[k])[1]
+                            break
+                        elif is_nonempty_line(file.body[k]):
+                            break
+                        k = k + 1
+                    for k in range(n):
+                        if (keywords_top[insets[k]] in next_params or
+                            (insets[k] == "lyxline" and sizes[k] != next_size)):
+                            ert = 1
+                            break
+                    if not ert:
+                        for k in range(n):
+                            file.body.insert(next_par + 1,
+                                             keywords_top[insets[k]] + arguments[k])
+                        del file.body[this_par:next_par-1]
+                        i = this_par
+                        continue
+        elif paragraph_start or paragraph_end:
+            # Convert to paragraph formatting if we are at the beginning or end
+            # of a paragraph and the resulting paragraph would not be empty
+            # The order is important: del and insert invalidate some indices
+            if paragraph_start:
+                keywords = keywords_top
+            else:
+                keywords = keywords_bot
+            ert = 0
+            for k in range(n):
+                if keywords[insets[k]] in params:
+                    ert = 1
+                    break
+            if not ert:
+                for k in range(n):
+                    file.body.insert(this_par + 1,
+                                     keywords[insets[k]] + arguments[k])
+                    for j in range(k, n):
+                        del_lines[j][0] = del_lines[j][0] + 1
+                        del_lines[j][1] = del_lines[j][1] + 1
+                    del file.body[del_lines[k][0]:del_lines[k][1]+1]
+                    deleted = del_lines[k][1] - del_lines[k][0] + 1
+                    for j in range(k + 1, n):
+                        del_lines[j][0] = del_lines[j][0] - deleted
+                        del_lines[j][1] = del_lines[j][1] - deleted
+                i = this_par
+                continue
+
+        # Convert the first inset to ERT.
+        # The others are converted in the next loop runs (if they exist)
+        if insets[0] == "vspace":
+            file.body[i:i+1] = ['\\begin_inset ERT', 'status Collapsed', '',
+                                '\\layout %s' % file.default_layout, '', '\\backslash ']
+            i = i + 6
+            if spaceamount[0][-1] == '*':
+                spaceamount[0] = spaceamount[0][:-1]
+                keep = 1
+            else:
+                keep = 0
+
+            # Replace defskip by the actual value
+            if spaceamount[0] == 'defskip':
+                spaceamount[0] = defskipamount
+
+            # LaTeX does not know \\smallskip* etc
+            if keep:
+                if spaceamount[0] == 'smallskip':
+                    spaceamount[0] = '\\smallskipamount'
+                elif spaceamount[0] == 'medskip':
+                    spaceamount[0] = '\\medskipamount'
+                elif spaceamount[0] == 'bigskip':
+                    spaceamount[0] = '\\bigskipamount'
+                elif spaceamount[0] == 'vfill':
+                    spaceamount[0] = '\\fill'
+
+            # Finally output the LaTeX code
+            if (spaceamount[0] == 'smallskip' or spaceamount[0] == 'medskip' or
+                spaceamount[0] == 'bigskip'   or spaceamount[0] == 'vfill'):
+                file.body.insert(i, spaceamount[0] + '{}')
+            else :
+                if keep:
+                    file.body.insert(i, 'vspace*{')
+                else:
+                    file.body.insert(i, 'vspace{')
+                i = convert_ertbackslash(file.body, i, spaceamount[0], file.format - 1, file.default_layout)
+                file.body[i] = file.body[i] + '}'
+            i = i + 1
+        elif insets[0] == "lyxline":
+            file.body[i] = ''
+            latexsize = lyxsize2latexsize(size)
+            if latexsize == '':
+                file.warning("Could not convert LyX fontsize '%s' to LaTeX font size." % size)
+                latexsize = '\\normalsize'
+            i = insert_ert(file.body, i, 'Collapsed',
+                           '\\lyxline{%s}' % latexsize,
+                           file.format - 1, file.default_layout)
+            # We use \providecommand so that we don't get an error if native
+            # lyxlines are used (LyX writes first its own preamble and then
+            # the user specified one)
+            add_to_preamble(file,
+                            ['% Commands inserted by lyx2lyx for lyxlines',
+                             '\\providecommand{\\lyxline}[1]{',
+                             '  {#1 \\vspace{1ex} \\hrule width \\columnwidth \\vspace{1ex}}'
+                             '}'])
+        elif insets[0] == "newpage":
+            file.body[i] = ''
+            i = insert_ert(file.body, i, 'Collapsed', '\\newpage{}',
+                           file.format - 1, file.default_layout)
+
+
+# Convert a LyX length into a LaTeX length
+def convert_len(len, special):
     units = {"text%":"\\textwidth", "col%":"\\columnwidth",
              "page%":"\\pagewidth", "line%":"\\linewidth",
              "theight%":"\\textheight", "pheight%":"\\pageheight"}
@@ -953,8 +1389,14 @@ def convert_ertlen(body, i, len, special):
 	    len = '%f' % (len2value(len) / 100) + units[unit]
 	    break
 
+    return len
+
+
+# Convert a LyX length into valid ERT code and append it to body[i]
+# Return the (maybe incremented) line index i
+def convert_ertlen(body, i, len, special, format, default_layout):
     # Convert backslashes and insert the converted length into body
-    return convert_ertbackslash(body, i, len)
+    return convert_ertbackslash(body, i, convert_len(len, special), format, default_layout)
 
 
 # Return the value of len without the unit in numerical form
@@ -966,6 +1408,34 @@ def len2value(len):
     return 1.0
 
 
+# Convert text to ERT and insert it at body[i]
+# Return the index of the line after the inserted ERT
+def insert_ert(body, i, status, text, format, default_layout):
+    body[i:i] = ['\\begin_inset ERT', 'status ' + status, '']
+    i = i + 3
+    if format <= 224:
+        body[i:i] = ['\\layout %s' % default_layout, '']
+    else:
+        body[i:i] = ['\\begin_layout %s' % default_layout, '']
+    i = i + 1       # i points now to the just created empty line
+    i = convert_ertbackslash(body, i, text, format, default_layout) + 1
+    if format > 224:
+        body[i:i] = ['\\end_layout']
+        i = i + 1
+    body[i:i] = ['', '\\end_inset', '']
+    i = i + 3
+    return i
+
+
+# Add text to the preamble if it is not already there.
+# Only the first line is checked!
+def add_to_preamble(file, text):
+    if find_token(file.preamble, text[0], 0) != -1:
+        return
+
+    file.preamble.extend(text)
+
+
 def convert_frameless_box(file):
     pos = ['t', 'c', 'b']
     inner_pos = ['c', 't', 'b', 's']
@@ -980,10 +1450,11 @@ def convert_frameless_box(file):
 	    i = i + 1
 	    continue
 	del file.body[i]
+	j = j - 1
 
 	# Gather parameters
-	params = {'position':'0', 'hor_pos':'c', 'has_inner_box':'1',
-                  'inner_pos':'1', 'use_parbox':'0', 'width':'100col%',
+	params = {'position':0, 'hor_pos':'c', 'has_inner_box':'1',
+                  'inner_pos':1, 'use_parbox':'0', 'width':'100col%',
 	          'special':'none', 'height':'1in',
 	          'height_special':'totalheight', 'collapsed':'false'}
 	for key in params.keys():
@@ -1015,55 +1486,180 @@ def convert_frameless_box(file):
 	if (params['use_parbox'] != '0' or
 	    params['has_inner_box'] != '1' or
 	    params['special'] != 'none' or
-	    inner_pos[params['inner_pos']] != pos[params['position']] or
 	    params['height_special'] != 'totalheight' or
 	    len2value(params['height']) != 1.0):
 
-	    # Convert to ERT
-	    if params['collapsed'] == 'true':
-		params['collapsed'] = 'Collapsed'
-	    else:
-		params['collapsed'] = 'Open'
-	    file.body[i : i] = ['\\begin_inset ERT', 'status ' + params['collapsed'],
-	                    '', '\\layout Standard', '', '\\backslash ']
-	    i = i + 6
-	    if params['use_parbox'] == '1':
-		file.body.insert(i, 'parbox')
-	    else:
-		file.body.insert(i, 'begin{minipage}')
-	    file.body[i] = file.body[i] + '[' + pos[params['position']] + ']['
-	    i = convert_ertlen(file.body, i, params['height'], params['height_special'])
-	    file.body[i] = file.body[i] + '][' + inner_pos[params['inner_pos']] + ']{'
-	    i = convert_ertlen(file.body, i, params['width'], params['special'])
-            if params['use_parbox'] == '1':
-                file.body[i] = file.body[i] + '}{'
+            # Here we know that this box is not supported in file format 224.
+            # Therefore we need to convert it to ERT. We can't simply convert
+            # the beginning and end of the box to ERT, because the
+            # box inset may contain layouts that are different from the
+            # surrounding layout. After the conversion the contents of the
+            # box inset is on the same level as the surrounding text, and
+            # paragraph layouts and align parameters can get mixed up.
+
+            # A possible solution for this problem:
+            # Convert the box to a minipage and redefine the minipage
+            # environment in ERT so that the original box is simulated.
+            # For minipages we could do this in a way that the width and
+            # position can still be set from LyX, but this did not work well.
+            # This is not possible for parboxes either, so we convert the
+            # original box to ERT, put the minipage inset inside the box
+            # and redefine the minipage environment to be empty.
+
+            # Commands that are independant of a particular box can go to
+            # the preamble.
+            # We need to define lyxtolyxrealminipage with 3 optional
+            # arguments although LyX 1.3 uses only the first one.
+            # Otherwise we will get LaTeX errors if this document is
+            # converted to format 225 or above again (LyX 1.4 uses all
+            # optional arguments).
+            add_to_preamble(file,
+                ['% Commands inserted by lyx2lyx for frameless boxes',
+                 '% Save the original minipage environment',
+                 '\\let\\lyxtolyxrealminipage\\minipage',
+                 '\\let\\endlyxtolyxrealminipage\\endminipage',
+                 '% Define an empty lyxtolyximinipage environment',
+                 '% with 3 optional arguments',
+                 '\\newenvironment{lyxtolyxiiiminipage}[4]{}{}',
+                 '\\newenvironment{lyxtolyxiiminipage}[2][\\lyxtolyxargi]%',
+                 '  {\\begin{lyxtolyxiiiminipage}{\\lyxtolyxargi}{\\lyxtolyxargii}{#1}{#2}}%',
+                 '  {\\end{lyxtolyxiiiminipage}}',
+                 '\\newenvironment{lyxtolyximinipage}[1][\\totalheight]%',
+                 '  {\\def\\lyxtolyxargii{{#1}}\\begin{lyxtolyxiiminipage}}%',
+                 '  {\\end{lyxtolyxiiminipage}}',
+                 '\\newenvironment{lyxtolyxminipage}[1][c]%',
+                 '  {\\def\\lyxtolyxargi{{#1}}\\begin{lyxtolyximinipage}}',
+                 '  {\\end{lyxtolyximinipage}}'])
+
+            if params['use_parbox'] != '0':
+                ert = '\\parbox'
             else:
-                file.body[i] = file.body[i] + '}'
-	    i = i + 1
-	    file.body[i:i] = ['', '\\end_inset']
-	    i = i + 2
-	    j = find_end_of_inset(file.body, i)
-	    if j == -1:
-		file.warning("Malformed LyX file: Missing '\\end_inset'.")
-		break
-            file.body[j-1:j-1] = ['\\begin_inset ERT', 'status ' + params['collapsed'],
-	                       '', '\\layout Standard', '']
-	    j = j + 4
-	    if params['use_parbox'] == '1':
-		file.body.insert(j, '}')
-	    else:
-		file.body[j:j] = ['\\backslash ', 'end{minipage}']
+                ert = '\\begin{lyxtolyxrealminipage}'
+
+            # convert optional arguments only if not latex default
+            if (pos[params['position']] != 'c' or
+                inner_pos[params['inner_pos']] != pos[params['position']] or
+                params['height_special'] != 'totalheight' or
+                len2value(params['height']) != 1.0):
+                ert = ert + '[' + pos[params['position']] + ']'
+            if (inner_pos[params['inner_pos']] != pos[params['position']] or
+                params['height_special'] != 'totalheight' or
+                len2value(params['height']) != 1.0):
+                ert = ert + '[' + convert_len(params['height'],
+                                              params['height_special']) + ']'
+            if inner_pos[params['inner_pos']] != pos[params['position']]:
+                ert = ert + '[' + inner_pos[params['inner_pos']] + ']'
+
+            ert = ert + '{' + convert_len(params['width'],
+                                          params['special']) + '}'
+
+            if params['use_parbox'] != '0':
+                ert = ert + '{'
+            ert = ert + '\\let\\minipage\\lyxtolyxminipage%\n'
+            ert = ert + '\\let\\endminipage\\endlyxtolyxminipage%\n'
+
+            old_i = i
+            i = insert_ert(file.body, i, 'Collapsed', ert, file.format - 1, file.default_layout)
+            j = j + i - old_i - 1
+
+            file.body[i:i] = ['\\begin_inset Minipage',
+                              'position %d' % params['position'],
+                              'inner_position 1',
+                              'height "1in"',
+                              'width "' + params['width'] + '"',
+                              'collapsed ' + params['collapsed']]
+            i = i + 6
+            j = j + 6
+
+            # Restore the original minipage environment since we may have
+            # minipages inside this box.
+            # Start a new paragraph because the following may be nonstandard
+            file.body[i:i] = ['\\layout %s' % file.default_layout, '', '']
+            i = i + 2
+            j = j + 3
+            ert = '\\let\\minipage\\lyxtolyxrealminipage%\n'
+            ert = ert + '\\let\\endminipage\\lyxtolyxrealendminipage%'
+            old_i = i
+            i = insert_ert(file.body, i, 'Collapsed', ert, file.format - 1, file.default_layout)
+            j = j + i - old_i - 1
+
+            # Redefine the minipage end before the inset end.
+            # Start a new paragraph because the previous may be nonstandard
+            file.body[j:j] = ['\\layout %s' % file.default_layout, '', '']
+            j = j + 2
+            ert = '\\let\\endminipage\\endlyxtolyxminipage'
+            j = insert_ert(file.body, j, 'Collapsed', ert, file.format - 1, file.default_layout)
+	    j = j + 1
+            file.body.insert(j, '')
+	    j = j + 1
+
+            # LyX writes '%\n' after each box. Therefore we need to end our
+            # ERT with '%\n', too, since this may swallow a following space.
+            if params['use_parbox'] != '0':
+                ert = '}%\n'
+            else:
+                ert = '\\end{lyxtolyxrealminipage}%\n'
+            j = insert_ert(file.body, j, 'Collapsed', ert, file.format - 1, file.default_layout)
+
+            # We don't need to restore the original minipage after the inset
+            # end because the scope of the redefinition is the original box.
+
 	else:
 
 	    # Convert to minipage
 	    file.body[i:i] = ['\\begin_inset Minipage',
-	                  'position %d' % params['position'],
-			  'inner_position %d' % params['inner_pos'],
-			  'height "' + params['height'] + '"',
-	                  'width "' + params['width'] + '"',
-	                  'collapsed ' + params['collapsed']]
+	                      'position %d' % params['position'],
+			      'inner_position %d' % params['inner_pos'],
+			      'height "' + params['height'] + '"',
+	                      'width "' + params['width'] + '"',
+	                      'collapsed ' + params['collapsed']]
 	    i = i + 6
 
+
+def remove_branches(file):
+    i = 0
+    while 1:
+        i = find_token(file.header, "\\branch", i)
+        if i == -1:
+            break
+        file.warning("Removing branch %s." % split(file.header[i])[1])
+        j = find_token(file.header, "\\end_branch", i)
+        if j == -1:
+            file.warning("Malformed LyX file: Missing '\\end_branch'.")
+            break
+        del file.header[i:j+1]
+
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\begin_inset Branch", i)
+        if i == -1:
+            return
+        j = find_end_of_inset(file.body, i)
+        if j == -1:
+            file.warning("Malformed LyX file: Missing '\\end_inset'.")
+            i = i + 1
+            continue
+        del file.body[i]
+        del file.body[j - 1]
+        # Seach for a line starting 'collapsed'
+        # If, however, we find a line starting '\layout'
+        # (_always_ present) then break with a warning message
+        collapsed_found = 0
+        while 1:
+            if (file.body[i][:9] == "collapsed"):
+                del file.body[i]
+                collapsed_found = 1
+                continue
+            elif (file.body[i][:7] == "\\layout"):
+                if collapsed_found == 0:
+                    file.warning("Malformed LyX file: Missing 'collapsed'.")
+                # Delete this new paragraph, since it would not appear in
+                # .tex output. This avoids also empty paragraphs.
+                del file.body[i]
+                break
+            i = i + 1
+
+
 ##
 # Convert jurabib
 #
@@ -1128,7 +1724,7 @@ def convert_float(file):
                 file.body.insert(i + 1, 'sideways false')
                 break
             elif (file.body[i][:13] == "\\begin_layout"):
-                file.warning("Malformed lyx file.")
+                file.warning("Malformed lyx file: Missing 'wide'.")
                 break
             i = i + 1
         i = i + 1
@@ -1247,7 +1843,7 @@ def convert_names(file):
                           "\\begin_inset CharStyle Firstname",
                           "status inlined",
                           "",
-                          "\\begin_layout Standard",
+                          '\\begin_layout %s' % file.default_layout,
                           "",
                           "%s" % firstname,
                           "\end_layout",
@@ -1258,7 +1854,7 @@ def convert_names(file):
                           "\\begin_inset CharStyle Surname",
                           "status inlined",
                           "",
-                          "\\begin_layout Standard",
+                          '\\begin_layout %s' % file.default_layout,
                           "",
                           "%s" % surname,
                           "\\end_layout",
@@ -1344,23 +1940,27 @@ def revert_cite_engine(file):
 def convert_paperpackage(file):
     i = find_token(file.header, "\\paperpackage", 0)
     if i == -1:
-        file.warning("Malformed lyx file: Missing '\\paperpackage'.")
         return
 
-    packages = {'a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
-    paperpackage = split(file.header[i])[1]
-    file.header[i] = replace(file.header[i], paperpackage, packages[paperpackage])
+    packages = {'default':'none','a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
+    if len(split(file.header[i])) > 1:
+        paperpackage = split(file.header[i])[1]
+        file.header[i] = replace(file.header[i], paperpackage, packages[paperpackage])
+    else:
+        file.header[i] = file.header[i] + ' widemarginsa4'
 
 
 def revert_paperpackage(file):
     i = find_token(file.header, "\\paperpackage", 0)
     if i == -1:
-        file.warning("Malformed lyx file: Missing '\\paperpackage'.")
         return
 
     packages = {'none':'a4', 'a4':'a4wide', 'a4wide':'widemarginsa4',
-                'widemarginsa4':''}
-    paperpackage = split(file.header[i])[1]
+                'widemarginsa4':'', 'default': 'default'}
+    if len(split(file.header[i])) > 1:
+        paperpackage = split(file.header[i])[1]
+    else:
+        paperpackage = 'default'
     file.header[i] = replace(file.header[i], paperpackage, packages[paperpackage])
 
 
@@ -1507,12 +2107,227 @@ def use_x_binary(file):
         decompose = split(file.header[i])
         file.header[i] = decompose[0] + ' ' + bool2bin[decompose[1]]
 
+##
+# Place all the paragraph parameters in their own line
+#
+def normalize_paragraph_params(file):
+    body = file.body
+    allowed_parameters = '\\paragraph_spacing', '\\noindent', '\\align', '\\labelwidthstring', "\\start_of_appendix", "\\leftindent"
+
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_layout', i)
+        if i == -1:
+            return
+
+        i = i + 1
+        while 1:
+            if strip(body[i]) and split(body[i])[0] not in allowed_parameters:
+                break
+
+            j = find(body[i],'\\', 1)
+
+            if j != -1:
+                body[i:i+1] = [strip(body[i][:j]), body[i][j:]]
+
+            i = i + 1
+
+
+##
+# Add/remove output_changes parameter
+#
+def convert_output_changes (file):
+    i = find_token(file.header, '\\tracking_changes', 0)
+    if i == -1:
+        file.warning("Malformed lyx file: Missing '\\tracking_changes'.")
+        return
+    file.header.insert(i+1, '\\output_changes true')
+
+
+def revert_output_changes (file):
+    i = find_token(file.header, '\\output_changes', 0)
+    if i == -1:
+        return
+    del file.header[i]
+
+
+##
+# Convert paragraph breaks and sanitize paragraphs
+#
+def convert_ert_paragraphs(file):
+    forbidden_settings = [
+                          # paragraph parameters
+                          '\\paragraph_spacing', '\\labelwidthstring',
+                          '\\start_of_appendix', '\\noindent',
+                          '\\leftindent', '\\align',
+                          # font settings
+                          '\\family', '\\series', '\\shape', '\\size',
+                          '\\emph', '\\numeric', '\\bar', '\\noun',
+                          '\\color', '\\lang']
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_inset ERT', i)
+        if i == -1:
+            return
+        j = find_end_of_inset(file.body, i)
+        if j == -1:
+            file.warning("Malformed lyx file: Missing '\\end_inset'.")
+            i = i + 1
+            continue
+
+        # convert non-standard paragraphs to standard
+        k = i
+        while 1:
+            k = find_token(file.body, "\\begin_layout", k, j)
+            if k == -1:
+                break
+            file.body[k] = '\\begin_layout %s' % file.default_layout
+            k = k + 1
+
+        # remove all paragraph parameters and font settings
+        k = i
+        while k < j:
+            if (strip(file.body[k]) and
+                split(file.body[k])[0] in forbidden_settings):
+                del file.body[k]
+                j = j - 1
+            else:
+                k = k + 1
+
+        # insert an empty paragraph before each paragraph but the first
+        k = i
+        first_pagraph = 1
+        while 1:
+            k = find_token(file.body, "\\begin_layout", k, j)
+            if k == -1:
+                break
+            if first_pagraph:
+                first_pagraph = 0
+                k = k + 1
+                continue
+            file.body[k:k] = ['\\begin_layout %s' % file.default_layout, "",
+                              "\\end_layout", ""]
+            k = k + 5
+            j = j + 4
+
+        # convert \\newline to new paragraph
+        k = i
+        while 1:
+            k = find_token(file.body, "\\newline", k, j)
+            if k == -1:
+                break
+            file.body[k:k+1] = ["\\end_layout", "", '\\begin_layout %s' % file.default_layout]
+            k = k + 4
+            j = j + 3
+            # We need an empty line if file.default_layout == ''
+            if file.body[k-1] != '':
+                file.body.insert(k-1, '')
+                k = k + 1
+                j = j + 1
+        i = i + 1
+
+
+##
+# Remove double paragraph breaks
+#
+def revert_ert_paragraphs(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_inset ERT', i)
+        if i == -1:
+            return
+        j = find_end_of_inset(file.body, i)
+        if j == -1:
+            file.warning("Malformed lyx file: Missing '\\end_inset'.")
+            i = i + 1
+            continue
+
+        # replace paragraph breaks with \newline
+        k = i
+        while 1:
+            k = find_token(file.body, "\\end_layout", k, j)
+            l = find_token(file.body, "\\begin_layout", k, j)
+            if k == -1 or l == -1:
+                break
+            file.body[k:l+1] = ["\\newline"]
+            j = j - l + k
+            k = k + 1
+
+        # replace double \newlines with paragraph breaks
+        k = i
+        while 1:
+            k = find_token(file.body, "\\newline", k, j)
+            if k == -1:
+                break
+            l = k + 1
+            while file.body[l] == "":
+                l = l + 1
+            if strip(file.body[l]) and split(file.body[l])[0] == "\\newline":
+                file.body[k:l+1] = ["\\end_layout", "",
+                                    '\\begin_layout %s' % file.default_layout]
+                j = j - l + k + 2
+                k = k + 3
+                # We need an empty line if file.default_layout == ''
+                if file.body[l+1] != '':
+                    file.body.insert(l+1, '')
+                    k = k + 1
+                    j = j + 1
+            else:
+                k = k + 1
+        i = i + 1
+
+
+def convert_french(file):
+    regexp = re.compile(r'^\\language\s+frenchb')
+    i = find_re(file.header, regexp, 0)
+    if i != -1:
+        file.header[i] = "\\language french"
+
+    # Change language in the document body
+    regexp = re.compile(r'^\\lang\s+frenchb')
+    i = 0
+    while 1:
+        i = find_re(file.body, regexp, i)
+        if i == -1:
+            break
+        file.body[i] = "\\lang french"
+        i = i + 1
+
+
+def remove_paperpackage(file):
+    i = find_token(file.header, '\\paperpackage', 0)
+
+    if i == -1:
+        return
+
+    paperpackage = split(file.header[i])[1]
+
+    if paperpackage in ("a4", "a4wide", "widemarginsa4"):
+        conv = {"a4":"\\usepackage{a4}","a4wide": "\\usepackage{a4wide}",
+                "widemarginsa4": "\\usepackage[widemargins]{a4}"}
+        # for compatibility we ensure it is the first entry in preamble
+        file.preamble[0:0] = [conv[paperpackage]]
+
+    del file.header[i]
+
+    i = find_token(file.header, '\\papersize', 0)
+    if i != -1:
+        file.header[i] = "\\papersize default"
+
+
+def remove_quotestimes(file):
+    i = find_token(file.header, '\\quotes_times', 0)
+    if i == -1:
+        return
+    del file.header[i]
+
+
 ##
 # Convertion hub
 #
 
-convert = [[223, [insert_tracking_changes, add_end_header, remove_color_default,
-                  convert_spaces, convert_bibtex, remove_insetparent]],
+convert = [[222, [insert_tracking_changes, add_end_header]],
+           [223, [remove_color_default, convert_spaces, convert_bibtex, remove_insetparent]],
            [224, [convert_external, convert_comment]],
            [225, [add_end_layout, layout2begin_layout, convert_end_document,
                   convert_table_valignment_middle, convert_breaks]],
@@ -1529,9 +2344,23 @@ convert = [[223, [insert_tracking_changes, add_end_header, remove_color_default,
            [236, [convert_bullets, add_begin_header, add_begin_body,
                   normalize_papersize, strip_end_space]],
            [237, [use_x_boolean]],
-           [238, [update_latexaccents]]]
-
-revert =  [[237, []],
+           [238, [update_latexaccents]],
+           [239, [normalize_paragraph_params]],
+           [240, [convert_output_changes]],
+           [241, [convert_ert_paragraphs]],
+           [242, [convert_french]],
+           [243, [remove_paperpackage]],
+	   [244, [rename_spaces]],
+	   [245, [remove_quotestimes]]]
+
+revert =  [[244, []],
+	   [243, [revert_space_names]],
+	   [242, []],
+           [241, []],
+           [240, [revert_ert_paragraphs]],
+           [239, [revert_output_changes]],
+           [238, []],
+           [237, []],
            [236, [use_x_binary]],
            [235, [denormalize_papersize, remove_begin_body,remove_begin_header,
                   revert_bullets]],
@@ -1546,10 +2375,11 @@ revert =  [[237, []],
            [226, [revert_box, revert_external_2]],
            [225, [revert_note]],
            [224, [rm_end_layout, begin_layout2layout, revert_end_document,
-                  revert_valignment_middle, convert_vspace, convert_frameless_box]],
-           [223, [revert_external_2, revert_comment]],
-           [221, [rm_end_header, revert_spaces, revert_bibtex,
-                  rm_tracking_changes, rm_body_changes]]]
+                  revert_valignment_middle, revert_breaks, convert_frameless_box,
+                  remove_branches]],
+           [223, [revert_external_2, revert_comment, revert_eqref]],
+           [222, [revert_spaces, revert_bibtex]],
+           [221, [rm_end_header, rm_tracking_changes, rm_body_changes]]]
 
 
 if __name__ == "__main__":