sync lyx2lyx with 1.4

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10435 a592a061-630c-0410-9148-cb99ea01b6c8

lib/ChangeLog

@@ -1,3 +1,7 @@
+2005-09-09  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+	* lyx2lyx: sync with 1.4
+
 2005-07-20  José Matos  <jamatos@lyx.org>
 
 	* lyx2lyx/lyx_1_4.py (convert_minipage, convert_frameless_box):

lib/lyx2lyx/LyX.py

@@ -46,7 +46,7 @@ format_relation = [("0_10",  [210], ["0.10.7","0.10"]),
                    ("1_1_6fix3", [218], ["1.1.6fix3","1.1.6fix4","1.1"]),
                    ("1_2", [220], ["1.2.0","1.2.1","1.2.3","1.2.4","1.2"]),
                    ("1_3", [221], ["1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3"]),
-                   ("1_4", range(223,244), ["1.4.0cvs","1.4"])]
+                   ("1_4", range(222,244), ["1.4.0cvs","1.4"])]
 
 
 def formats_list():
@@ -73,6 +73,14 @@ def get_backend(textclass):
     return "latex"
 
 
+def trim_eol(line):
+    " Remove end of line char(s)."
+    if line[-2:-1] == '\r':
+        return line[:-2]
+    else:
+        return line[:-1]
+
+
 ##
 # Class
 #
@@ -111,6 +119,7 @@ class LyX_Base:
         self.backend = "latex"
         self.textclass = "article"
         self.header = []
+        self.preamble = []
         self.body = []
         self.status = 0
 
@@ -133,33 +142,39 @@ class LyX_Base:
 
     def read(self):
         """Reads a file into the self.header and self.body parts, from self.input."""
-        preamble = 0
 
         while 1:
             line = self.input.readline()
             if not line:
                 self.error("Invalid LyX file.")
 
-            line = line[:-1]
+            line = trim_eol(line)
-            # remove '\r' from line's end, if present
-            if line[-1:] == '\r':
-                line = line[:-1]
-
             if check_token(line, '\\begin_preamble'):
-                preamble = 1
+                while 1:
+                    line = self.input.readline()
+                    if not line:
+                        self.error("Invalid LyX file.")
+
+                    line = trim_eol(line)
+                    if check_token(line, '\\end_preamble'):
+                        break
+                    
+                    if string.split(line)[:0] in ("\\layout", "\\begin_layout", "\\begin_body"):
+                        self.warning("Malformed LyX file: Missing '\\end_preamble'.")
+                        self.warning("Adding it now and hoping for the best.")
+
+                    self.preamble.append(line)
+
             if check_token(line, '\\end_preamble'):
-                preamble = 0
+                continue
 
-            if not preamble:
+            line = string.strip(line)
-                line = string.strip(line)
+            if not line:
+                continue
 
-            if not preamble:
+            if string.split(line)[0] in ("\\layout", "\\begin_layout", "\\begin_body"):
-                if not line:
+                self.body.append(line)
-                    continue
+                break
-
-                if string.split(line)[0] in ("\\layout", "\\begin_layout", "\\begin_body"):
-                    self.body.append(line)
-                    break
 
             self.header.append(line)
 
@@ -167,11 +182,7 @@ class LyX_Base:
             line = self.input.readline()
             if not line:
                 break
-            # remove '\r' from line's end, if present
+            self.body.append(trim_eol(line))
-            if line[-2:-1] == '\r':
-                self.body.append(line[:-2])
-            else:
-                self.body.append(line[:-1])
 
         self.textclass = get_value(self.header, "\\textclass", 0)
         self.backend = get_backend(self.textclass)
@@ -187,10 +198,17 @@ class LyX_Base:
         self.set_version()
         self.set_format()
 
-        for line in self.header:
+        if self.preamble:
-            self.output.write(line+"\n")
+            i = find_token(self.header, '\\textclass', 0) + 1
-        self.output.write("\n")
+            preamble = ['\\begin_preamble'] + self.preamble + ['\\end_preamble']
-        for line in self.body:
+            if i == 0:
+                self.error("Malformed LyX file: Missing '\\textclass'.")
+            else:
+                header = self.header[:i] + preamble + self.header[i:]
+        else:
+            header = self.header
+
+        for line in header + [''] + self.body:
             self.output.write(line+"\n")
 
 
@@ -376,7 +394,7 @@ class LyX_Base:
         " Returns the TOC of this LyX document."
         paragraphs_filter = {'Title' : 0,'Chapter' : 1, 'Section' : 2, 'Subsection' : 3, 'Subsubsection': 4}
         allowed_insets = ['Quotes']
-        allowed_parameters = '\\paragraph_spacing', '\\noindent', '\\align', '\\labelwidthstring', "\\start_of_appendix"
+        allowed_parameters = '\\paragraph_spacing', '\\noindent', '\\align', '\\labelwidthstring', "\\start_of_appendix", "\\leftindent"
 
         sections = []
         for section in paragraphs_filter.keys():

lib/lyx2lyx/lyx_0_12.py

@@ -193,13 +193,6 @@ def header_update(file):
     i = 0
     l = len(lines)
     while i < l:
-        if check_token(lines[i], '\\begin_preamble'):
-            i = find_token(lines, '\\end_preamble', i)
-            if i == -1:
-                file.error('Unfinished preamble')
-            i = i + 1
-            continue
-
         if lines[i][-1:] == ' ':
             lines[i] = lines[i][:-1]
 

lib/lyx2lyx/lyx_1_1_5.py

@@ -140,8 +140,6 @@ def remove_space_in_units(file):
 
     unit_rexp = re.compile(r'[^ ]* (.*) (.*)')
 
-    begin_preamble = find_token(lines,"\\begin_preamble", 0)
-    end_preamble = find_token(lines, "\\end_preamble", 0)
     for margin in margins:
         i = 0
         while 1:
@@ -149,10 +147,6 @@ def remove_space_in_units(file):
             if i == -1:
                 break
 
-            if i > begin_preamble and i < end_preamble:
-                i = i + 1
-                continue
-
             result = unit_rexp.search(lines[i])
             if result:
                 lines[i] = margin + " " + result.group(1) + result.group(2)

lib/lyx2lyx/lyx_1_1_6fix3.py

@@ -27,6 +27,7 @@ def bool_table(item):
     return "true"
 
 
+align_vertical = {"0": "top", "1": "bottom", "2": "center"}
 align_table = {"0": "top", "2": "left", "4": "right", "8": "center"}
 use_table = {"0": "none", "1": "parbox"}
 table_meta_re = re.compile(r'<LyXTabular version="?1"? rows="?(\d*)"? columns="?(\d*)"?>')
@@ -95,7 +96,7 @@ def table_update(lines):
         res = cell_re.match(lines[i])
         if res:
             val = res.groups()
-            lines[i] = '<cell multicolumn="%s" alignment="%s" valignment="%s" topline="%s" bottomline="%s" leftline="%s" rightline="%s" rotate="%s" usebox="%s" width="%s" special="%s">' % ( val[0], align_table[val[1]], align_table[val[2]], bool_table(val[3]), bool_table(val[4]), bool_table(val[5]), bool_table(val[6]), bool_table(val[7]), use_table[val[8]], val[9], val[10])
+            lines[i] = '<cell multicolumn="%s" alignment="%s" valignment="%s" topline="%s" bottomline="%s" leftline="%s" rightline="%s" rotate="%s" usebox="%s" width="%s" special="%s">' % ( val[0], align_table[val[1]], align_vertical[val[2]], bool_table(val[3]), bool_table(val[4]), bool_table(val[5]), bool_table(val[6]), bool_table(val[7]), use_table[val[8]], val[9], val[10])
 
         res = row_re.match(lines[i])
         if res:
@@ -110,7 +111,7 @@ def table_update(lines):
         if res:
             val = res.groups()
             col_info[i] = '<column alignment="%s" valignment="%s" leftline="%s" rightline="%s" width="%s" special="%s">' \
-                          % ( align_table[val[0]], align_table[val[1]], bool_table(val[2]), bool_table(val[3]), val[4],val[5])
+                          % ( align_table[val[0]], align_vertical[val[1]], bool_table(val[2]), bool_table(val[3]), val[4],val[5])
 
     return lines[:2] + col_info + lines[2:]
 

lib/lyx2lyx/lyx_1_2.py

@@ -730,7 +730,7 @@ def change_infoinset(file):
         i = i+5
 
 
-def change_preamble(file):
+def change_header(file):
     lines = file.header
     i = find_token(lines, "\\use_amsmath", 0)
     if i == -1:
@@ -739,7 +739,7 @@ def change_preamble(file):
 		      "\use_numerical_citations 0"]
 
 
-convert = [[220, [change_preamble, change_listof, fix_oldfloatinset,
+convert = [[220, [change_header, change_listof, fix_oldfloatinset,
                   update_tabular, update_longtables, remove_pextra,
                   remove_oldfloat, remove_figinset, remove_oldertinset,
                   remove_oldert, combine_ert, change_infoinset]]]

lib/lyx2lyx/lyx_1_4.py

@@ -907,92 +907,258 @@ def convert_ertbackslash(body, i, ert):
     return i
 
 
-def convert_vspace(file):
+# 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)
+
+
+# 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]
+        lines = list()
+        insets = list()
+        lines.append(split(file.body[i]))
+        insets.append(keys[lines[0][0]])
 
-	# Are we at the beginning or end of a paragraph?
+        # Are we at the beginning of a paragraph?
-	paragraph_start = 1
+        paragraph_start = 1
-	start = get_paragraph(file.body, i) + 1
+        start = get_paragraph(file.body, i) + 1
-	for k in range(start, i):
+        params = get_par_params(file.body, start)
-	    if is_nonempty_line(file.body[k]):
+        # Paragraph parameters may be on one or more lines.
-		paragraph_start = 0
+        # Find the start of the real paragraph text.
-		break
+        while file.body[start][:1] == '\\' and split(file.body[start])[0] in params:
-	paragraph_end = 1
+            start = start + 1
-	j = find_end_of_inset(file.body, i)
+        for k in range(start, i):
-	if j == -1:
+            if is_nonempty_line(file.body[k]):
-	    file.warning("Malformed LyX file: Missing '\\end_inset'.")
+                paragraph_start = 0
-	    i = i + 1
+                break
-	    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
+        # Are we at the end of a paragraph?
-	# of a paragraph and the resulting paragraph would not be empty
+        paragraph_end = 1
-	if ((paragraph_start and not paragraph_end) or
+        if insets[0] == "vspace":
-	    (paragraph_end   and not paragraph_start)):
+            j = find_end_of_inset(file.body, i)
-	    # The order is important: del and insert invalidate some indices
+            if j == -1:
-	    del file.body[j]
+                file.warning("Malformed lyx file: Missing '\\end_inset'.")
-	    del file.body[i]
+                i = i + 1
-	    if paragraph_start:
+                continue
-		file.body.insert(start, '\\added_space_top ' + spaceamount + ' ')
+        else:
-	    else:
+            j = i
-		file.body.insert(start, '\\added_space_bottom ' + spaceamount + ' ')
+        end = get_next_paragraph(file.body, i)
-	    continue
+        for k in range(j + 1, end):
+            if is_nonempty_line(file.body[k]):
+                paragraph_end = 0
+                break
 
-	# Convert to ERT
+        # Detect paragraphs created by convert_breaks()
-	file.body[i:i+1] = ['\\begin_inset ERT', 'status Collapsed', '',
+        before = 0
-	                '\\layout Standard', '', '\\backslash ']
+        after = 0
-	i = i + 6
+        if paragraph_start:
-	if spaceamount[-1] == '*':
+            # Make a copy of the paragraph, since we need to strip empty lines
-	    spaceamount = spaceamount[:-1]
+            paragraph = list()
-	    keep = 1
+            for k in range(start, end):
-	else:
+                if is_nonempty_line(file.body[k]):
-	    keep = 0
+                    if (len(paragraph) > 0 and
+		        find_token(file.body, "\\end_inset", k) == k):
+                        paragraph[len(paragraph) - 1] = paragraph[len(paragraph) - 1] + ' ' + file.body[k]
+                    else:
+                        paragraph.append(file.body[k])
 
-	# Replace defskip by the actual value
+            # Do we have a second inset to convert in this paragraph?
-	if spaceamount == 'defskip':
+            if ((len(paragraph) == 2 or len(paragraph) == 3) and
-	    spaceamount = defskipamount
+	        find_tokens(paragraph, tokens, 1) == 1):
+                lines.append(split(paragraph[1]))
+                insets.append(keys[lines[1][0]])
+                del paragraph[1]
+                # Do we have a third inset to convert in this paragraph?
+                if (len(paragraph) == 2 and
+		    find_tokens(paragraph, tokens, 1) == 1):
+                    lines.append(split(paragraph[1]))
+                    insets.append(keys[lines[2][0]])
+                    del paragraph[1]
 
-	# LaTeX does not know \\smallskip* etc
+            if len(paragraph) == 1:
-	if keep:
+                # We have only insets that need to be converted in this paragraph
-	    if spaceamount == 'smallskip':
+                if ((len(insets) == 3 and insets[0] == "newpage" and
-		spaceamount = '\\smallskipamount'
+		     insets[1] == "vspace" and insets[2] == "lyxline") or
-	    elif spaceamount == 'medskip':
+                    (len(insets) == 2 and
-		spaceamount = '\\medskipamount'
+		     ((insets[0] == "newpage" and insets[1] == "vspace") or
-	    elif spaceamount == 'bigskip':
+                      (insets[0] == "newpage" and insets[1] == "lyxline") or
-		spaceamount = '\\bigskipamount'
+                      (insets[0] == "vspace"  and insets[1] == "lyxline")))):
-	    elif spaceamount == 'vfill':
+                    # This paragraph has been created before a paragraph by
-		spaceamount = '\\fill'
+                    # convert_breaks()
+                    before = 1
+                    paragraph_start = 1
+                    paragraph_end = 1
+                if ((len(insets) == 3 and insets[0] == "lyxline" and
+		     insets[1] == "vspace" and insets[2] == "newpage") or
+                    (len(insets) == 2 and
+		     ((insets[0] == "lyxline" and insets[1] == "vspace") or
+                      (insets[0] == "lyxline" and insets[1] == "newpage") or
+                      (insets[0] == "vspace"  and insets[1] == "newpage")))):
+                    # This paragraph has been created after a paragraph by
+                    # convert_breaks()
+                    paragraph_start = 1
+                    paragraph_end = 1
+                    after = 1
 
-	# Finally output the LaTeX code
+        # Determine space amount for vspace insets
-	if (spaceamount == 'smallskip' or spaceamount == 'medskip' or
+        spaceamount = list()
-	    spaceamount == 'bigskip'   or spaceamount == 'vfill'):
+        arguments = list()
-	    file.body.insert(i, spaceamount)
+        for k in range(len(lines)):
-	else :
+            if insets[k] == "vspace":
-	    if keep:
+                spaceamount.append(lines[k][2])
-		file.body.insert(i, 'vspace*{')
+                arguments.append(' ' + spaceamount[k] + ' ')
-	    else:
+            else:
-		file.body.insert(i, 'vspace{')
+                spaceamount.append('')
-	    i = convert_ertbackslash(file.body, i, spaceamount)
+                arguments.append(' ')
-            file.body[i] =  file.body[i] + '}'
+
-        i = i + 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, start - 2) + 1
+                if prev_par > 0 and not before:
+                    prev_params = get_par_params(file.body, prev_par + 1)
+                    ert = 0
+                    n = len(insets)
+                    for k in range(n):
+                        if keywords_bot[insets[k]] in prev_params:
+                            ert = 1
+                            break
+                    if not ert:
+                        for k in range(len(insets)):
+                            file.body.insert(prev_par + 1,
+                                             keywords_bot[insets[k]] + arguments[k])
+                        del file.body[start-1+n:end+n]
+                        i = start + n
+                        continue
+                # Then try next paragraph
+                next_par = end
+                if next_par > 0 and not after:
+                    next_params = get_par_params(file.body, next_par + 1)
+                    ert = 0
+                    n = len(insets)
+                    for k in range(n):
+                        if keywords_top[insets[k]] in next_params:
+                            ert = 1
+                            break
+                    if not ert:
+                        for k in range(len(insets)):
+                            file.body.insert(next_par + 1,
+                                             keywords_top[insets[k]] + arguments[k])
+                        del file.body[start-1:end]
+                        i = start
+                        continue
+        else:
+            # 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:
+                if j != i:
+                    del file.body[j]
+                del file.body[i]
+                file.body.insert(start, keywords_top[insets[0]] + arguments[0])
+                continue
+            elif paragraph_end:
+                if j != i:
+                    del file.body[j]
+                del file.body[i]
+                file.body.insert(start, keywords_bot[insets[0]] + arguments[0])
+                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 Standard', '', '\\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.body[i] = file.body[i] + '}'
+            i = i + 1
+        elif insets[0] == "lyxline":
+            file.body[i:i+1] = ['\\begin_inset ERT', 'status Collapsed', '',
+                                '\\layout Standard', '', '\\backslash',
+                                'lyxline{}', '', '\\end_inset', '']
+            i = i + 10
+            # 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+1] = ['\\begin_inset ERT', 'status Collapsed', '',
+                                '\\layout Standard', '', '\\backslash',
+                                'newpage{}', '', '\\end_inset', '']
+            i = i + 10
 
 
 # Convert a LyX length into a LaTeX length
@@ -1045,21 +1211,10 @@ def insert_ert(body, i, status, text):
 # Add text to the preamble if it is not already there.
 # Only the first line is checked!
 def add_to_preamble(file, text):
-    i = find_token(file.header, '\\begin_preamble', 0)
+    if find_token(file.preamble, text[0], 0) != -1:
-    if i == -1:
-        file.header.extend(['\\begin_preamble'] + text + ['\\end_preamble'])
         return
 
-    j = find_token(file.header, '\\end_preamble', i)
+    file.preamble.extend(text)
-    if j == -1:
-        file.warning("Malformed LyX file: Missing '\\end_preamble'.")
-        file.warning("Adding it now and hoping for the best.")
-        file.header.append('\\end_preamble')
-        j = len(file.header)
-
-    if find_token(file.header, text[0], i, j) != -1:
-        return
-    file.header[j:j] = text
 
 
 def convert_frameless_box(file):
@@ -1526,9 +1681,9 @@ def convert_paperpackage(file):
     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:
-        paperpackage = "default"
+        file.header[i] = file.header[i] + ' widemarginsa4'
-    file.header[i] = replace(file.header[i], paperpackage, packages[paperpackage])
 
 
 def revert_paperpackage(file):
@@ -1693,7 +1848,7 @@ def use_x_binary(file):
 #
 def normalize_paragraph_params(file):
     body = file.body
-    allowed_parameters = '\\paragraph_spacing', '\\noindent', '\\align', '\\labelwidthstring', "\\start_of_appendix"
+    allowed_parameters = '\\paragraph_spacing', '\\noindent', '\\align', '\\labelwidthstring', "\\start_of_appendix", "\\leftindent"
 
     i = 0
     while 1:
@@ -1874,16 +2029,10 @@ def remove_paperpackage(file):
     paperpackage = split(file.header[i])[1]
 
     if paperpackage in ("a4", "a4wide", "widemarginsa4"):
-        j = find_token(file.header, '\\begin_preamble', 0)
         conv = {"a4":"\\usepackage{a4}","a4wide": "\\usepackage{a4wide}",
                 "widemarginsa4": "\\usepackage[widemargins]{a4}"}
-        if j == -1:
+        # for compatibility we ensure it is the first entry in preamble
-            # Add preamble
+        file.preamble[0:0] = [conv[paperpackage]]
-            j = len(file.header) - 2
-            file.header[j:j]=["\\begin_preamble",
-                              conv[paperpackage],"\\end_preamble"]
-        else:
-            file.header[j+1:j+1] = conv[paperpackage]
 
     del file.header[i]
 
@@ -1896,8 +2045,8 @@ def remove_paperpackage(file):
 # Convertion hub
 #
 
-convert = [[223, [insert_tracking_changes, add_end_header, remove_color_default,
+convert = [[222, [insert_tracking_changes, add_end_header]],
-                  convert_spaces, convert_bibtex, remove_insetparent]],
+           [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]],
@@ -1941,10 +2090,10 @@ revert =  [[242, []],
            [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]],
+                  revert_valignment_middle, revert_breaks, convert_frameless_box]],
            [223, [revert_external_2, revert_comment, revert_eqref]],
-           [221, [rm_end_header, revert_spaces, revert_bibtex,
+           [222, [revert_spaces, revert_bibtex]],
-                  rm_tracking_changes, rm_body_changes]]]
+           [221, [rm_end_header, rm_tracking_changes, rm_body_changes]]]
 
 
 if __name__ == "__main__":