diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
new file mode 100644
index 0000000000..7647dc8304
--- /dev/null
+++ b/lib/lyx2lyx/LyX.py
@@ -0,0 +1,528 @@
+# This file is part of lyx2lyx
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002-2004 Dekel Tsur <dekel@lyx.org>, José Matos <jamatos@lyx.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+from parser_tools import get_value, check_token, find_token,\
+     find_tokens, find_end_of, find_end_of_inset
+import os.path
+import gzip
+import sys
+import re
+import string
+import time
+
+version_lyx2lyx = "1.4.0cvs"
+default_debug_level = 2
+
+# Regular expressions used
+format_re = re.compile(r"(\d)[\.,]?(\d\d)")
+fileformat = re.compile(r"\\lyxformat\s*(\S*)")
+original_version = re.compile(r"\#LyX (\S*)")
+
+##
+# file format information:
+#  file, supported formats, stable release versions
+format_relation = [("0_10",  [210], ["0.10.7","0.10"]),
+                   ("0_12",  [215], ["0.12","0.12.1","0.12"]),
+                   ("1_0_0", [215], ["1.0.0","1.0"]),
+                   ("1_0_1", [215], ["1.0.1","1.0.2","1.0.3","1.0.4", "1.1.2","1.1"]),
+                   ("1_1_4", [215], ["1.1.4","1.1"]),
+                   ("1_1_5", [216], ["1.1.5","1.1.5fix1","1.1.5fix2","1.1"]),
+                   ("1_1_6", [217], ["1.1.6","1.1.6fix1","1.1.6fix2","1.1"]),
+                   ("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"]),
+                   ("1_4", range(223,243), ["1.4.0cvs","1.4"])]
+
+
+def formats_list():
+    " Returns a list with supported file formats."
+    formats = []
+    for version in format_relation:
+        for format in version[1]:
+            if format not in formats:
+                formats.append(format)
+    return formats
+
+
+def get_end_format():
+    " Returns the more recent file format available."
+    return format_relation[-1][1][-1]
+
+
+def get_backend(textclass):
+    " For _textclass_ returns its backend."
+    if textclass == "linuxdoc" or textclass == "manpage":
+        return "linuxdoc"
+    if textclass[:7] == "docbook":
+        return "docbook"
+    return "latex"
+
+
+##
+# Class
+#
+class LyX_Base:
+    """This class carries all the information of the LyX file."""
+    def __init__(self, end_format = 0, input = "", output = "", error = "", debug = default_debug_level, try_hard = 0):
+        """Arguments:
+        end_format: final format that the file should be converted. (integer)
+        input: the name of the input source, if empty resort to standard input.
+        output: the name of the output file, if empty use the standard output.
+        error: the name of the error file, if empty use the standard error.
+        debug: debug level, O means no debug, as its value increases be more verbose.
+        """
+        if input and input != '-':
+            self.input = self.open(input)
+        else:
+            self.input = sys.stdin
+        if output:
+            self.output = open(output, "w")
+        else:
+            self.output = sys.stdout
+
+        if error:
+            self.err = open(error, "w")
+        else:
+            self.err = sys.stderr
+
+        self.debug = debug
+        self.try_hard = try_hard
+
+        if end_format:
+            self.end_format = self.lyxformat(end_format)
+        else:
+            self.end_format = get_end_format()
+
+        self.backend = "latex"
+        self.textclass = "article"
+        self.header = []
+        self.body = []
+        self.status = 0
+
+
+    def warning(self, message, debug_level= default_debug_level):
+        " Emits warning to self.error, if the debug_level is less than the self.debug."
+        if debug_level <= self.debug:
+            self.err.write("Warning: " + message + "\n")
+
+
+    def error(self, message):
+        " Emits a warning and exits if not in try_hard mode."
+        self.warning(message)
+        if not self.try_hard:
+            self.warning("Quiting.")
+            sys.exit(1)
+
+        self.status = 2
+
+
+    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]
+            # remove '\r' from line's end, if present
+            if line[-1:] == '\r':
+                line = line[:-1]
+
+            if check_token(line, '\\begin_preamble'):
+                preamble = 1
+            if check_token(line, '\\end_preamble'):
+                preamble = 0
+
+            if not preamble:
+                line = string.strip(line)
+
+            if not preamble:
+                if not line:
+                    continue
+
+                if string.split(line)[0] in ("\\layout", "\\begin_layout", "\\begin_body"):
+                    self.body.append(line)
+                    break
+
+            self.header.append(line)
+
+        while 1:
+            line = self.input.readline()
+            if not line:
+                break
+            # remove '\r' from line's end, if present
+            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)
+        self.format  = self.read_format()
+        self.language = get_value(self.header, "\\language", 0)
+        if self.language == "":
+            self.language = "english"
+        self.initial_version = self.read_version()
+
+
+    def write(self):
+        " Writes the LyX file to self.output."
+        self.set_version()
+        self.set_format()
+
+        for line in self.header:
+            self.output.write(line+"\n")
+        self.output.write("\n")
+        for line in self.body:
+            self.output.write(line+"\n")
+
+
+    def open(self, file):
+        """Transparently deals with compressed files."""
+
+        self.dir = os.path.dirname(os.path.abspath(file))
+        try:
+            gzip.open(file).readline()
+            self.output = gzip.GzipFile("","wb",6,self.output)
+            return gzip.open(file)
+        except:
+            return open(file)
+
+
+    def lyxformat(self, format):
+        " Returns the file format representation, an integer."
+        result = format_re.match(format)
+        if result:
+            format = int(result.group(1) + result.group(2))
+        else:
+            self.error(str(format) + ": " + "Invalid LyX file.")
+
+        if format in formats_list():
+            return format
+
+        self.error(str(format) + ": " + "Format not supported.")
+        return None
+
+
+    def read_version(self):
+        """ Searchs for clues of the LyX version used to write the file, returns the
+        most likely value, or None otherwise."""
+        for line in self.header:
+            if line[0] != "#":
+                return None
+
+            result = original_version.match(line)
+            if result:
+                return result.group(1)
+        return None
+
+
+    def set_version(self):
+        " Set the header with the version used."
+        self.header[0] = "#LyX %s created this file. For more info see http://www.lyx.org/" % version_lyx2lyx
+        if self.header[1][0] == '#':
+            del self.header[1]
+
+
+    def read_format(self):
+        " Read from the header the fileformat of the present LyX file."
+        for line in self.header:
+            result = fileformat.match(line)
+            if result:
+                return self.lyxformat(result.group(1))
+        else:
+            self.error("Invalid LyX File.")
+        return None
+
+
+    def set_format(self):
+        " Set the file format of the file, in the header."
+        if self.format <= 217:
+            format = str(float(self.format)/100)
+        else:
+            format = str(self.format)
+        i = find_token(self.header, "\\lyxformat", 0)
+        self.header[i] = "\\lyxformat %s" % format
+
+
+    def set_parameter(self, param, value):
+        " Set the value of the header parameter."
+        i = find_token(self.header, '\\' + param, 0)
+        if i == -1:
+            self.warning(3, 'Parameter not found in the header: %s' % param)
+            return
+        self.header[i] = '\\%s %s' % (param, str(value))
+
+
+    def convert(self):
+        "Convert from current (self.format) to self.end_format."
+        mode, convertion_chain = self.chain()
+        self.warning("convertion chain: " + str(convertion_chain), 3)
+
+        for step in convertion_chain:
+            steps = getattr(__import__("lyx_" + step), mode)
+
+            self.warning("Convertion step: %s - %s" % (step, mode), default_debug_level + 1)
+            if not steps:
+                    self.error("The convertion to an older format (%s) is not implemented." % self.format)
+
+            multi_conv = len(steps) != 1
+            for version, table in steps:
+                if multi_conv and \
+                   (self.format >= version and mode == "convert") or\
+                   (self.format <= version and mode == "revert"):
+                    continue
+
+                for conv in table:
+                    init_t = time.time()
+                    try:
+                        conv(self)
+                    except:
+                        self.warning("An error ocurred in %s, %s" % (version, str(conv)),
+                                     default_debug_level)
+                        if not self.try_hard:
+                            raise
+                        self.status = 2
+                    else:
+                        self.warning("%lf: Elapsed time on %s"  % (time.time() - init_t, str(conv)),
+                                     default_debug_level + 1)
+
+                self.format = version
+                if self.end_format == self.format:
+                    return
+
+
+    def chain(self):
+        """ This is where all the decisions related with the convertion are taken.
+        It returns a list of modules needed to convert the LyX file from
+        self.format to self.end_format"""
+
+        self.start =  self.format
+        format = self.format
+        correct_version = 0
+
+        for rel in format_relation:
+            if self.initial_version in rel[2]:
+                if format in rel[1]:
+                    initial_step = rel[0]
+                    correct_version = 1
+                    break
+
+        if not correct_version:
+            if format <= 215:
+                self.warning("Version does not match file format, discarding it.")
+            for rel in format_relation:
+                if format in rel[1]:
+                    initial_step = rel[0]
+                    break
+            else:
+                # This should not happen, really.
+                self.error("Format not supported.")
+
+        # Find the final step
+        for rel in format_relation:
+            if self.end_format in rel[1]:
+                final_step = rel[0]
+                break
+        else:
+            self.error("Format not supported.")
+
+        # Convertion mode, back or forth
+        steps = []
+        if (initial_step, self.start) < (final_step, self.end_format):
+            mode = "convert"
+            first_step = 1
+            for step in format_relation:
+                if  initial_step <= step[0] <= final_step:
+                    if first_step and len(step[1]) == 1:
+                        first_step = 0
+                        continue
+                    steps.append(step[0])
+        else:
+            mode = "revert"
+            relation_format = format_relation
+            relation_format.reverse()
+            last_step = None
+
+            for step in relation_format:
+                if  final_step <= step[0] <= initial_step:
+                    steps.append(step[0])
+                    last_step = step
+
+            if last_step[1][-1] == self.end_format:
+                steps.pop()
+
+        return mode, steps
+
+
+    def get_toc(self, depth = 4):
+        " 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"
+
+        sections = []
+        for section in paragraphs_filter.keys():
+            sections.append('\\begin_layout %s' % section)
+
+        toc_par = []
+        i = 0
+        while 1:
+            i = find_tokens(self.body, sections, i)
+            if i == -1:
+                break
+
+            j = find_end_of(self.body,  i + 1, '\\begin_layout', '\\end_layout')
+            if j == -1:
+                self.warning('Incomplete file.', 0)
+                break
+
+            section = string.split(self.body[i])[1]
+            if section[-1] == '*':
+                section = section[:-1]
+
+            par = []
+
+            k = i + 1
+            # skip paragraph parameters
+            while not string.strip(self.body[k]) and string.split(self.body[k])[0] in allowed_parameters:
+                k = k +1
+
+            while k < j:
+                if check_token(self.body[k], '\\begin_inset'):
+                    inset = string.split(self.body[k])[1]
+                    end = find_end_of_inset(self.body, k)
+                    if end == -1 or end > j:
+                        self.warning('Malformed file.', 0)
+
+                    if inset in allowed_insets:
+                        par.extend(self.body[k: end+1])
+                    k = end + 1
+                else:
+                    par.append(self.body[k])
+                    k = k + 1
+
+            # trim empty lines in the end.
+            while string.strip(par[-1]) == '' and par:
+                par.pop()
+
+            toc_par.append(Paragraph(section, par))
+
+            i = j + 1
+
+        return toc_par
+
+
+class File(LyX_Base):
+    " This class reads existing LyX files."
+    def __init__(self, end_format = 0, input = "", output = "", error = "", debug = default_debug_level, try_hard = 0):
+        LyX_Base.__init__(self, end_format, input, output, error, debug, try_hard)
+        self.read()
+
+
+class NewFile(LyX_Base):
+    " This class is to create new LyX files."
+    def set_header(self, **params):
+        # set default values
+        self.header.extend([
+            "#LyX xxxx created this file. For more info see http://www.lyx.org/",
+            "\\lyxformat xxx",
+            "\\begin_document",
+            "\\begin_header",
+            "\\textclass article",
+            "\\language english",
+            "\\inputencoding auto",
+            "\\fontscheme default",
+            "\\graphics default",
+            "\\paperfontsize default",
+            "\\papersize default",
+            "\\paperpackage none",
+            "\\use_geometry false",
+            "\\use_amsmath 1",
+            "\\cite_engine basic",
+            "\\use_bibtopic false",
+            "\\paperorientation portrait",
+            "\\secnumdepth 3",
+            "\\tocdepth 3",
+            "\\paragraph_separation indent",
+            "\\defskip medskip",
+            "\\quotes_language english",
+            "\\quotes_times 2",
+            "\\papercolumns 1",
+            "\\papersides 1",
+            "\\paperpagestyle default",
+            "\\tracking_changes false",
+            "\\end_header"])
+
+        self.format = get_end_format()
+        for param in params:
+            self.set_parameter(param, params[param])
+
+
+    def set_body(self, paragraphs):
+        self.body.extend(['\\begin_body',''])
+
+        for par in paragraphs:
+            self.body.extend(par.asLines())
+
+        self.body.extend(['','\\end_body', '\\end_document'])
+
+
+class Paragraph:
+    # unfinished implementation, it is missing the Text and Insets representation.
+    " This class represents the LyX paragraphs."
+    def __init__(self, name, body=[], settings = [], child = []):
+        """ Parameters:
+        name: paragraph name.
+        body: list of lines of body text.
+        child: list of paragraphs that descend from this paragraph.
+        """
+        self.name = name
+        self.body = body
+        self.settings = settings
+        self.child = child
+
+    def asLines(self):
+        " Converts the paragraph to a list of strings, representing it in the LyX file."
+        result = ['','\\begin_layout %s' % self.name]
+        result.extend(self.settings)
+        result.append('')
+        result.extend(self.body)
+        result.append('\\end_layout')
+
+        if not self.child:
+            return result
+
+        result.append('\\begin_deeper')
+        for node in self.child:
+            result.extend(node.asLines())
+        result.append('\\end_deeper')
+
+        return result
+
+
+class Inset:
+    " This class represents the LyX insets."
+    pass
+
+
+class Text:
+    " This class represents simple chuncks of text."
+    pass
diff --git a/lib/lyx2lyx/lyx_0_12.py b/lib/lyx2lyx/lyx_0_12.py
new file mode 100644
index 0000000000..bb89fb57bd
--- /dev/null
+++ b/lib/lyx2lyx/lyx_0_12.py
@@ -0,0 +1,303 @@
+# This file is part of lyx2lyx
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2003-2004 José Matos <jamatos@lyx.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+import re
+import string
+from parser_tools import find_token, find_re, check_token
+
+
+def space_before_layout(file):
+    lines = file.body
+    i = 2 # skip first layout
+    while 1:
+        i = find_token(lines, '\\layout', i)
+        if i == -1:
+            break
+
+        if lines[i - 1] == '' and string.find(lines[i-2],'\\protected_separator') == -1:
+            del lines[i-1]
+        i = i + 1
+
+
+def formula_inset_space_eat(file):
+    lines = file.body
+    i=0
+    while 1:
+        i = find_token(lines, "\\begin_inset Formula", i)
+        if i == -1: break
+
+        if len(lines[i]) > 22 and lines[i][21] == ' ':
+            lines[i] = lines[i][:20] + lines[i][21:]
+        i = i + 1
+
+
+# Update from tabular format 1 or 2 to 4
+def update_tabular(file):
+    lines = file.body
+    lyxtable_re = re.compile(r".*\\LyXTable$")
+    i=0
+    while 1:
+        i = find_re(lines, lyxtable_re, i)
+        if i == -1:
+            break
+        i = i + 1
+        format = lines[i][8:]
+
+        lines[i]='multicol4'
+        i = i + 1
+        rows = int(string.split(lines[i])[0])
+        columns = int(string.split(lines[i])[1])
+
+        lines[i] = lines[i] + ' 0 0 -1 -1 -1 -1'
+        i = i + 1
+
+        for j in range(rows):
+            lines[i] = lines[i] + ' 0 0'
+            i = i + 1
+
+        for j in range(columns):
+            lines[i] = lines[i] + ' '
+            i = i + 1
+
+        while string.strip(lines[i]):
+            if not format:
+                lines[i] = lines[i] + ' 1 1'
+            lines[i] = lines[i] + ' 0 0 0'
+            i = i + 1
+
+        lines[i] = string.strip(lines[i])
+
+def final_dot(file):
+    lines = file.body
+    i = 0
+    while i < len(lines):
+        if lines[i][-1:] == '.' and lines[i+1][:1] != '\\' and  lines[i+1][:1] != ' ' and len(lines[i]) + len(lines[i+1])<= 72 and lines[i+1] != '':
+            lines[i] = lines[i] + lines[i+1]
+            del lines[i+1]
+        else:
+            i = i + 1
+
+
+def update_inset_label(file):
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_token(lines, '\\begin_inset Label', i)
+        if i == -1:
+            return
+        lines[i] = '\\begin_inset LatexCommand \label{' + lines[i][19:] + '}'
+        i = i + 1
+
+
+def update_latexdel(file):
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_token(lines, '\\begin_inset LatexDel', i)
+        if i == -1:
+            return
+        lines[i] = string.replace(lines[i],'\\begin_inset LatexDel', '\\begin_inset LatexCommand')
+        i = i + 1
+
+
+def update_vfill(file):
+    lines = file.body
+    for i in range(len(lines)):
+        lines[i] = string.replace(lines[i],'\\fill_top','\\added_space_top vfill')
+        lines[i] = string.replace(lines[i],'\\fill_bottom','\\added_space_bottom vfill')
+
+
+def update_space_units(file):
+    lines = file.body
+    added_space_bottom = re.compile(r'\\added_space_bottom ([^ ]*)')
+    added_space_top    = re.compile(r'\\added_space_top ([^ ]*)')
+    for i in range(len(lines)):
+        result = added_space_bottom.search(lines[i])
+        if result:
+            old = '\\added_space_bottom ' + result.group(1)
+            new = '\\added_space_bottom ' + str(float(result.group(1))) + 'cm'
+            lines[i] = string.replace(lines[i], old, new)
+
+        result = added_space_top.search(lines[i])
+        if result:
+            old = '\\added_space_top ' + result.group(1)
+            new = '\\added_space_top ' + str(float(result.group(1))) + 'cm'
+            lines[i] = string.replace(lines[i], old, new)
+
+
+def remove_cursor(file):
+    lines = file.body
+    i = 0
+    cursor_re = re.compile(r'.*(\\cursor \d*)')
+    while 1:
+        i = find_re(lines, cursor_re, i)
+        if i == -1:
+            break
+        cursor = cursor_re.search(lines[i]).group(1)
+        lines[i]= string.replace(lines[i], cursor, '')
+        i = i + 1
+
+
+def remove_empty_insets(file):
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_token(lines, '\\begin_inset ',i)
+        if i == -1:
+            break
+        if lines[i] == '\\begin_inset ' and lines[i+1] == '\\end_inset ':
+            del lines[i]
+            del lines[i]
+        i = i + 1
+
+
+def remove_formula_latex(file):
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_token(lines, '\\latex formula_latex ', i)
+        if i == -1:
+            break
+        del lines[i]
+
+        i = find_token(lines, '\\latex default', i)
+        if i == -1:
+            break
+        del lines[i]
+
+
+def add_end_document(file):
+    lines = file.body
+    i = find_token(lines, '\\the_end', 0)
+    if i == -1:
+        lines.append('\\the_end')
+
+
+def header_update(file):
+    lines = file.header
+    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]
+
+        if check_token(lines[i], '\\epsfig'):
+            lines[i] = string.replace(lines[i], '\\epsfig', '\\graphics')
+            i = i + 1
+            continue
+
+        if check_token(lines[i], '\\papersize'):
+            size = string.split(lines[i])[1]
+            new_size = size
+            paperpackage = ""
+
+            if size == 'usletter':
+                new_size = 'letterpaper'
+            if size == 'a4wide':
+                new_size = 'Default'
+                paperpackage = "widemarginsa4"
+
+            lines[i] = '\\papersize ' + new_size
+            i = i + 1
+            if paperpackage:
+                lines.insert(i, '\\paperpackage ' + paperpackage)
+                i = i + 1
+
+            lines.insert(i,'\\use_geometry 0')
+            lines.insert(i + 1,'\\use_amsmath 0')
+            i = i + 2
+            continue
+
+
+        if check_token(lines[i], '\\baselinestretch'):
+            size = string.split(lines[i])[1]
+            if size == '1.00':
+                name = 'single'
+            elif size == '1.50':
+                name = 'onehalf'
+            elif size == '2.00':
+                name = 'double'
+            else:
+                name = 'other ' + size
+            lines[i] = '\\spacing %s ' % name
+            i = i + 1
+            continue
+
+        i = i + 1
+
+
+def update_latexaccents(file):
+    body = file.body
+    i = 1
+    while 1:
+        i = find_token(body, '\\i ', i)
+        if i == -1:
+            return
+
+        contents = string.strip(body[i][2:])
+
+        if string.find(contents, '{') != -1 and string.find(contents, '}') != -1:
+            i = i + 1
+            continue
+
+        if len(contents) == 2:
+            contents = contents + '{}'
+        elif len(contents) == 3:
+            contents = contents[:2] + '{' + contents[2] + '}'
+        elif len(contents) == 4:
+            if contents[2] == ' ':
+                contents = contents[:2] + '{' + contents[3] + '}'
+            elif contents[2:4] == '\\i' or contents[2:4] == '\\j':
+                contents = contents[:2] + '{' + contents[2:] + '}'
+
+        body[i] = '\\i ' + contents
+        i = i + 1
+
+
+def obsolete_latex_title(file):
+    body = file.body
+    i = 0
+    while 1:
+        i = find_token(body, '\\layout', i)
+        if i == -1:
+            return
+
+        if string.find(string.lower(body[i]),'latex_title') != -1:
+            body[i] = '\\layout Title'
+
+        i = i + 1
+
+
+convert = [[215, [header_update, add_end_document, remove_cursor,
+                  final_dot, update_inset_label, update_latexdel,
+                  update_space_units, space_before_layout,
+                  formula_inset_space_eat, update_tabular,
+                  update_vfill, remove_empty_insets,
+                  remove_formula_latex, update_latexaccents, obsolete_latex_title]]]
+revert  = []
+
+
+if __name__ == "__main__":
+    pass
diff --git a/lib/lyx2lyx/lyx_1_1_5.py b/lib/lyx2lyx/lyx_1_1_5.py
new file mode 100644
index 0000000000..645c1657d4
--- /dev/null
+++ b/lib/lyx2lyx/lyx_1_1_5.py
@@ -0,0 +1,246 @@
+# This file is part of lyx2lyx
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002-2004 José Matos <jamatos@lyx.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+import re
+import string
+from parser_tools import find_token, find_token_backwards, find_re
+
+
+layout_exp = re.compile(r"\\layout (\S*)")
+math_env = ["\\[","\\begin{eqnarray*}","\\begin{eqnarray}","\\begin{equation}"]
+
+def replace_protected_separator(file):
+    lines = file.body
+    i=0
+    while 1:
+        i = find_token(lines, "\\protected_separator", i)
+        if i == -1:
+            break
+        j = find_token_backwards(lines, "\\layout", i)
+        #if j == -1: print error
+        layout_m = layout_exp.match(lines[j])
+        if layout_m:
+            layout = layout_m.group(1)
+        else:
+            layout = "Standard"
+
+        if layout == "LyX-Code":
+            result = ""
+            while lines[i] == "\\protected_separator ":
+                result = result + " "
+                del lines[i]
+
+            lines[i-1] = lines[i-1] + result + lines[i]
+        else:
+            lines[i-1] = lines[i-1]+ "\\SpecialChar ~"
+
+        del lines[i]
+
+
+def merge_formula_inset(file):
+    lines = file.body
+    i=0
+    while 1:
+        i = find_token(lines, "\\begin_inset Formula", i)
+        if i == -1: break
+        if lines[i+1] in math_env:
+            lines[i] = lines[i] + lines[i+1]
+            del lines[i+1]
+        i = i + 1
+
+
+# Update from tabular format 4 to 5 if necessary
+def update_tabular(file):
+    lines = file.body
+    lyxtable_re = re.compile(r".*\\LyXTable$")
+    i=0
+    while 1:
+        i = find_re(lines, lyxtable_re, i)
+        if i == -1:
+            break
+        i = i + 1
+        format = lines[i][8]
+        if format != '4':
+            continue
+
+        lines[i]='multicol5'
+        i = i + 1
+        rows = int(string.split(lines[i])[0])
+        columns = int(string.split(lines[i])[1])
+
+        i = i + rows + 1
+        for j in range(columns):
+            col_info = string.split(lines[i])
+            if len(col_info) == 3:
+                lines[i] = lines[i] + '"" ""'
+            else:
+                lines[i] = string.join(col_info[:3]) + ' "%s" ""' % col_info[3]
+            i = i + 1
+
+        while lines[i]:
+            lines[i] = lines[i] + ' "" ""'
+            i = i + 1
+
+
+def update_toc(file):
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_token(lines, '\\begin_inset LatexCommand \\tableofcontents', i)
+        if i == -1:
+            break
+        lines[i] = lines[i] + '{}'
+        i = i + 1
+
+
+def remove_cursor(file):
+    lines = file.body
+    i = find_token(lines, '\\cursor', 0)
+    if i != -1:
+        del lines[i]
+
+
+def remove_vcid(file):
+    lines = file.header
+    i = find_token(lines, '\\lyxvcid', 0)
+    if i != -1:
+        del lines[i]
+    i = find_token(lines, '\\lyxrcsid', 0)
+    if i != -1:
+        del lines[i]
+
+
+def first_layout(file):
+    lines = file.body
+    while (lines[0] == ""):
+        del lines[0]
+    if lines[0][:7] != "\\layout":
+        lines[:0] = ["\\layout Standard"]
+
+
+def remove_space_in_units(file):
+    lines = file.header
+    margins = ["\\topmargin","\\rightmargin",
+               "\\leftmargin","\\bottommargin"]
+
+    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:
+            i = find_token(lines, margin, i)
+            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)
+            i = i + 1
+
+
+def latexdel_getargs(file, i):
+    lines = file.body
+
+    # play safe, clean empty lines
+    while 1:
+        if lines[i]:
+            break
+        del lines[i]
+
+    j = find_token(lines, '\\end_inset', i)
+
+    if i == j:
+        del lines[i]
+    else:
+        file.warning("Unexpected end of inset.")
+    j = find_token(lines, '\\begin_inset LatexDel }{', i)
+
+    ref = string.join(lines[i:j])
+    del lines[i:j + 1]
+
+    # play safe, clean empty lines
+    while 1:
+        if lines[i]:
+            break
+        del lines[i]
+
+    j = find_token(lines, '\\end_inset', i - 1)
+    if i == j:
+        del lines[i]
+    else:
+        file.warning("Unexpected end of inset.")
+    j = find_token(lines, '\\begin_inset LatexDel }', i)
+    label = string.join(lines[i:j])
+    del lines[i:j + 1]
+
+    return ref, label
+
+
+def update_ref(file):
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_token(lines, '\\begin_inset LatexCommand', i)
+        if i == -1:
+            return
+
+        if string.split(lines[i])[-1] == "\\ref{":
+            i = i + 1
+            ref, label = latexdel_getargs(file, i)
+            lines[i - 1] = "%s[%s]{%s}" % (lines[i - 1][:-1], ref, label)
+
+        i = i + 1
+
+
+def update_latexdel(file):
+    lines = file.body
+    i = 0
+    latexdel_re = re.compile(r".*\\begin_inset LatexDel")
+    while 1:
+        i = find_re(lines, latexdel_re, i)
+        if i == -1:
+            return
+        lines[i] = string.replace(lines[i],'\\begin_inset LatexDel', '\\begin_inset LatexCommand')
+
+        j = string.find(lines[i],'\\begin_inset')
+        lines.insert(i+1, lines[i][j:])
+        lines[i] = string.strip(lines[i][:j])
+        i = i + 1
+
+        if string.split(lines[i])[-1] in ("\\url{", "\\htmlurl{"):
+            i = i + 1
+
+            ref, label = latexdel_getargs(file, i)
+            lines[i -1] = "%s[%s]{%s}" % (lines[i-1][:-1], label, ref)
+
+        i = i + 1
+
+
+convert = [[216, [first_layout, remove_vcid, remove_cursor, update_toc,
+                  replace_protected_separator, merge_formula_inset,
+                  update_tabular, remove_space_in_units, update_ref, update_latexdel]]]
+revert  = []
+
+if __name__ == "__main__":
+    pass
diff --git a/lib/lyx2lyx/lyx_1_2.py b/lib/lyx2lyx/lyx_1_2.py
new file mode 100644
index 0000000000..672d44fd8c
--- /dev/null
+++ b/lib/lyx2lyx/lyx_1_2.py
@@ -0,0 +1,750 @@
+# This file is part of lyx2lyx
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2002 Dekel Tsur <dekel@lyx.org>
+# Copyright (C) 2004 José Matos <jamatos@lyx.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+import string
+import re
+
+from parser_tools import find_token, find_token_backwards, get_next_paragraph,\
+                         find_tokens, find_end_of_inset, find_re, \
+                         is_nonempty_line, get_paragraph, find_nonempty_line, \
+                         get_value, get_tabular_lines, check_token
+
+floats = {
+    "footnote": ["\\begin_inset Foot",
+		 "collapsed true"],
+    "margin":   ["\\begin_inset Marginal",
+		 "collapsed true"],
+    "fig":      ["\\begin_inset Float figure",
+		 "wide false",
+		 "collapsed false"],
+    "tab":      ["\\begin_inset Float table",
+		 "wide false",
+		 "collapsed false"],
+    "alg":      ["\\begin_inset Float algorithm",
+		 "wide false",
+		 "collapsed false"],
+    "wide-fig": ["\\begin_inset Float figure",
+		 "wide true",
+		 "collapsed false"],
+    "wide-tab": ["\\begin_inset Float table",
+		 "wide true",
+		 "collapsed false"]
+}
+
+font_tokens = ["\\family", "\\series", "\\shape", "\\size", "\\emph",
+	       "\\bar", "\\noun", "\\color", "\\lang", "\\latex"]
+
+pextra_type3_rexp = re.compile(r".*\\pextra_type\s+3")
+pextra_rexp = re.compile(r"\\pextra_type\s+(\S+)"+\
+			 r"(\s+\\pextra_alignment\s+(\S+))?"+\
+			 r"(\s+\\pextra_hfill\s+(\S+))?"+\
+			 r"(\s+\\pextra_start_minipage\s+(\S+))?"+\
+			 r"(\s+(\\pextra_widthp?)\s+(\S*))?")
+
+
+def get_width(mo):
+    if mo.group(10):
+	if mo.group(9) == "\\pextra_widthp":
+	    return mo.group(10)+"col%"
+	else:
+	    return mo.group(10)
+    else:
+	return "100col%"
+
+
+#
+# Change \begin_float .. \end_float into \begin_inset Float .. \end_inset
+#
+def remove_oldfloat(file):
+    lines = file.body
+    i = 0
+    while 1:
+	i = find_token(lines, "\\begin_float", i)
+	if i == -1:
+	    break
+	# There are no nested floats, so finding the end of the float is simple
+	j = find_token(lines, "\\end_float", i+1)
+
+	floattype = string.split(lines[i])[1]
+	if not floats.has_key(floattype):
+	    file.warning("Error! Unknown float type " + floattype)
+	    floattype = "fig"
+
+	# skip \end_deeper tokens
+	i2 = i+1
+	while check_token(lines[i2], "\\end_deeper"):
+	    i2 = i2+1
+	if i2 > i+1:
+	    j2 = get_next_paragraph(lines, j+1)
+	    lines[j2:j2] = ["\\end_deeper "]*(i2-(i+1))
+
+	new = floats[floattype]+[""]
+
+	# Check if the float is floatingfigure
+	k = find_re(lines, pextra_type3_rexp, i, j)
+	if k != -1:
+	    mo = pextra_rexp.search(lines[k])
+	    width = get_width(mo)
+	    lines[k] = re.sub(pextra_rexp, "", lines[k])
+	    new = ["\\begin_inset Wrap figure",
+		   'width "%s"' % width,
+		   "collapsed false",
+		   ""]
+
+	new = new+lines[i2:j]+["\\end_inset ", ""]
+
+	# After a float, all font attributes are reseted.
+	# We need to output '\foo default' for every attribute foo
+	# whose value is not default before the float.
+	# The check here is not accurate, but it doesn't matter
+	# as extra '\foo default' commands are ignored.
+	# In fact, it might be safer to output '\foo default' for all
+	# font attributes.
+	k = get_paragraph(lines, i)
+	flag = 0
+	for token in font_tokens:
+	    if find_token(lines, token, k, i) != -1:
+		if not flag:
+		    # This is not necessary, but we want the output to be
+		    # as similar as posible to the lyx format
+		    flag = 1
+		    new.append("")
+		if token == "\\lang":
+		    new.append(token+" "+ file.language)
+		else:
+		    new.append(token+" default ")
+
+	lines[i:j+1] = new
+	i = i+1
+
+
+pextra_type2_rexp = re.compile(r".*\\pextra_type\s+[12]")
+pextra_type2_rexp2 = re.compile(r".*(\\layout|\\pextra_type\s+2)")
+pextra_widthp = re.compile(r"\\pextra_widthp")
+
+def remove_pextra(file):
+    lines = file.body
+    i = 0
+    flag = 0
+    while 1:
+	i = find_re(lines, pextra_type2_rexp, i)
+	if i == -1:
+	    break
+
+        # Sometimes the \pextra_widthp argument comes in it own
+        # line. If that happens insert it back in this line.
+        if pextra_widthp.search(lines[i+1]):
+            lines[i] = lines[i] + ' ' + lines[i+1]
+            del lines[i+1]
+
+	mo = pextra_rexp.search(lines[i])
+        width = get_width(mo)
+
+        if mo.group(1) == "1":
+            # handle \pextra_type 1 (indented paragraph)
+            lines[i] = re.sub(pextra_rexp, "\\leftindent "+width+" ", lines[i])
+            i = i+1
+            continue
+
+        # handle \pextra_type 2 (minipage)
+	position = mo.group(3)
+	hfill = mo.group(5)
+	lines[i] = re.sub(pextra_rexp, "", lines[i])
+
+	start = ["\\begin_inset Minipage",
+		 "position " + position,
+		 "inner_position 0",
+		 'height "0pt"',
+		 'width "%s"' % width,
+		 "collapsed false"
+		 ]
+	if flag:
+	    flag = 0
+	    if hfill:
+		start = ["","\hfill",""]+start
+	else:
+	    start = ["\\layout Standard"] + start
+
+	j0 = find_token_backwards(lines,"\\layout", i-1)
+	j = get_next_paragraph(lines, i)
+
+	count = 0
+	while 1:
+	    # collect more paragraphs to the minipage
+	    count = count+1
+	    if j == -1 or not check_token(lines[j], "\\layout"):
+		break
+	    i = find_re(lines, pextra_type2_rexp2, j+1)
+	    if i == -1:
+		break
+	    mo = pextra_rexp.search(lines[i])
+	    if not mo:
+		break
+	    if mo.group(7) == "1":
+		flag = 1
+		break
+	    lines[i] = re.sub(pextra_rexp, "", lines[i])
+	    j = find_tokens(lines, ["\\layout", "\\end_float"], i+1)
+
+	mid = lines[j0:j]
+	end = ["\\end_inset "]
+
+	lines[j0:j] = start+mid+end
+	i = i+1
+
+
+def is_empty(lines):
+    return filter(is_nonempty_line, lines) == []
+
+
+move_rexp =  re.compile(r"\\(family|series|shape|size|emph|numeric|bar|noun|end_deeper)")
+ert_rexp = re.compile(r"\\begin_inset|\\hfill|.*\\SpecialChar")
+spchar_rexp = re.compile(r"(.*)(\\SpecialChar.*)")
+ert_begin = ["\\begin_inset ERT",
+	     "status Collapsed",
+	     "",
+	     "\\layout Standard"]
+
+
+def remove_oldert(file):
+    lines = file.body
+    i = 0
+    while 1:
+	i = find_tokens(lines, ["\\latex latex", "\\layout LaTeX"], i)
+	if i == -1:
+	    break
+	j = i+1
+	while 1:
+            # \end_inset is for ert inside a tabular cell. The other tokens
+            # are obvious.
+	    j = find_tokens(lines, ["\\latex default", "\\layout", "\\begin_inset", "\\end_inset", "\\end_float", "\\the_end"],
+			    j)
+	    if check_token(lines[j], "\\begin_inset"):
+		j = find_end_of_inset(lines, j)+1
+	    else:
+		break
+
+	if check_token(lines[j], "\\layout"):
+	    while j-1 >= 0 and check_token(lines[j-1], "\\begin_deeper"):
+		j = j-1
+
+	# We need to remove insets, special chars & font commands from ERT text
+	new = []
+	new2 = []
+	if check_token(lines[i], "\\layout LaTeX"):
+	    new = ["\layout Standard", "", ""]
+	    # We have a problem with classes in which Standard is not the default layout!
+
+	k = i+1
+	while 1:
+	    k2 = find_re(lines, ert_rexp, k, j)
+	    inset = hfill = specialchar = 0
+	    if k2 == -1:
+		k2 = j
+	    elif check_token(lines[k2], "\\begin_inset"):
+		inset = 1
+            elif check_token(lines[k2], "\\hfill"):
+                hfill = 1
+                del lines[k2]
+                j = j-1
+	    else:
+		specialchar = 1
+		mo = spchar_rexp.match(lines[k2])
+		lines[k2] = mo.group(1)
+		specialchar_str = mo.group(2)
+		k2 = k2+1
+
+	    tmp = []
+	    for line in lines[k:k2]:
+                # Move some lines outside the ERT inset:
+		if move_rexp.match(line):
+		    if new2 == []:
+			# This is not necessary, but we want the output to be
+			# as similar as posible to the lyx format
+			new2 = [""]
+		    new2.append(line)
+		elif not check_token(line, "\\latex"):
+		    tmp.append(line)
+
+	    if is_empty(tmp):
+		if filter(lambda x:x != "", tmp) != []:
+		    if new == []:
+			# This is not necessary, but we want the output to be
+			# as similar as posible to the lyx format
+			lines[i-1] = lines[i-1]+" "
+		    else:
+			new = new+[" "]
+	    else:
+		new = new+ert_begin+tmp+["\\end_inset ", ""]
+
+	    if inset:
+		k3 = find_end_of_inset(lines, k2)
+		new = new+[""]+lines[k2:k3+1]+[""] # Put an empty line after \end_inset
+		k = k3+1
+		# Skip the empty line after \end_inset
+		if not is_nonempty_line(lines[k]):
+		    k = k+1
+		    new.append("")
+            elif hfill:
+                new = new + ["\\hfill", ""]
+                k = k2
+	    elif specialchar:
+		if new == []:
+		    # This is not necessary, but we want the output to be
+		    # as similar as posible to the lyx format
+		    lines[i-1] = lines[i-1]+specialchar_str
+		    new = [""]
+		else:
+		    new = new+[specialchar_str, ""]
+		k = k2
+	    else:
+		break
+
+	new = new+new2
+	if not check_token(lines[j], "\\latex "):
+	    new = new+[""]+[lines[j]]
+	lines[i:j+1] = new
+	i = i+1
+
+    # Delete remaining "\latex xxx" tokens
+    i = 0
+    while 1:
+	i = find_token(lines, "\\latex ", i)
+	if i == -1:
+	    break
+	del lines[i]
+
+
+# ERT insert are hidden feature of lyx 1.1.6. This might be removed in the future.
+def remove_oldertinset(file):
+    lines = file.body
+    i = 0
+    while 1:
+	i = find_token(lines, "\\begin_inset ERT", i)
+	if i == -1:
+	    break
+	j = find_end_of_inset(lines, i)
+	k = find_token(lines, "\\layout", i+1)
+	l = get_paragraph(lines, i)
+	if lines[k] == lines[l]: # same layout
+	    k = k+1
+	new = lines[k:j]
+	lines[i:j+1] = new
+	i = i+1
+
+
+def is_ert_paragraph(lines, i):
+    if not check_token(lines[i], "\\layout Standard"):
+        return 0
+
+    i = find_nonempty_line(lines, i+1)
+    if not check_token(lines[i], "\\begin_inset ERT"):
+	return 0
+
+    j = find_end_of_inset(lines, i)
+    k = find_nonempty_line(lines, j+1)
+    return check_token(lines[k], "\\layout")
+
+
+def combine_ert(file):
+    lines = file.body
+    i = 0
+    while 1:
+	i = find_token(lines, "\\begin_inset ERT", i)
+	if i == -1:
+	    break
+	j = get_paragraph(lines, i)
+	count = 0
+	text = []
+	while is_ert_paragraph(lines, j):
+
+	    count = count+1
+	    i2 = find_token(lines, "\\layout", j+1)
+	    k = find_token(lines, "\\end_inset", i2+1)
+	    text = text+lines[i2:k]
+	    j = find_token(lines, "\\layout", k+1)
+	    if j == -1:
+		break
+
+	if count >= 2:
+	    j = find_token(lines, "\\layout", i+1)
+	    lines[j:k] = text
+
+	i = i+1
+
+
+oldunits = ["pt", "cm", "in", "text%", "col%"]
+
+def get_length(lines, name, start, end):
+    i = find_token(lines, name, start, end)
+    if i == -1:
+	return ""
+    x = string.split(lines[i])
+    return x[2]+oldunits[int(x[1])]
+
+
+def write_attribute(x, token, value):
+    if value != "":
+	x.append("\t"+token+" "+value)
+
+
+def remove_figinset(file):
+    lines = file.body
+    i = 0
+    while 1:
+	i = find_token(lines, "\\begin_inset Figure", i)
+	if i == -1:
+	    break
+	j = find_end_of_inset(lines, i)
+
+	if ( len(string.split(lines[i])) > 2 ):
+	    lyxwidth = string.split(lines[i])[3]+"pt"
+	    lyxheight = string.split(lines[i])[4]+"pt"
+	else:
+	    lyxwidth = ""
+	    lyxheight = ""
+
+	filename = get_value(lines, "file", i+1, j)
+
+	width = get_length(lines, "width", i+1, j)
+	# what does width=5 mean ?
+	height = get_length(lines, "height", i+1, j)
+	rotateAngle = get_value(lines, "angle", i+1, j)
+	if width == "" and height == "":
+	    size_type = "0"
+	else:
+	    size_type = "1"
+
+	flags = get_value(lines, "flags", i+1, j)
+	x = int(flags)%4
+	if x == 1:
+	    display = "monochrome"
+	elif x == 2:
+	    display = "gray"
+	else:
+	    display = "color"
+
+	subcaptionText = ""
+	subcaptionLine = find_token(lines, "subcaption", i+1, j)
+	if subcaptionLine != -1:
+            subcaptionText = lines[subcaptionLine][11:]
+	    if subcaptionText != "":
+	        subcaptionText = '"'+subcaptionText+'"'
+
+	k = find_token(lines, "subfigure", i+1,j)
+	if k == -1:
+	    subcaption = 0
+	else:
+	    subcaption = 1
+
+	new = ["\\begin_inset Graphics FormatVersion 1"]
+	write_attribute(new, "filename", filename)
+	write_attribute(new, "display", display)
+	if subcaption:
+	    new.append("\tsubcaption")
+	write_attribute(new, "subcaptionText", subcaptionText)
+	write_attribute(new, "size_type", size_type)
+	write_attribute(new, "width", width)
+	write_attribute(new, "height", height)
+	if rotateAngle != "":
+	    new.append("\trotate")
+	    write_attribute(new, "rotateAngle", rotateAngle)
+	write_attribute(new, "rotateOrigin", "leftBaseline")
+	write_attribute(new, "lyxsize_type", "1")
+	write_attribute(new, "lyxwidth", lyxwidth)
+	write_attribute(new, "lyxheight", lyxheight)
+	new = new + ["\\end_inset"]
+	lines[i:j+1] = new
+
+
+##
+# Convert tabular format 2 to 3
+#
+attr_re = re.compile(r' \w*="(false|0|)"')
+line_re = re.compile(r'<(features|column|row|cell)')
+
+def update_tabular(file):
+    regexp = re.compile(r'^\\begin_inset\s+Tabular')
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_re(lines, regexp, i)
+        if i == -1:
+            break
+
+	for k in get_tabular_lines(lines, i):
+	    if check_token(lines[k], "<lyxtabular"):
+		lines[k] = string.replace(lines[k], 'version="2"', 'version="3"')
+	    elif check_token(lines[k], "<column"):
+		lines[k] = string.replace(lines[k], 'width=""', 'width="0pt"')
+
+	    if line_re.match(lines[k]):
+		lines[k] = re.sub(attr_re, "", lines[k])
+
+	i = i+1
+
+
+##
+# Convert tabular format 2 to 3
+#
+# compatibility read for old longtable options. Now we can make any
+# row part of the header/footer type we want before it was strict
+# sequential from the first row down (as LaTeX does it!). So now when
+# we find a header/footer line we have to go up the rows and set it
+# on all preceding rows till the first or one with already a h/f option
+# set. If we find a firstheader on the same line as a header or a
+# lastfooter on the same line as a footer then this should be set empty.
+# (Jug 20011220)
+
+# just for compatibility with old python versions
+# python >= 2.3 has real booleans (False and True)
+false = 0
+true = 1
+
+# simple data structure to deal with long table info
+class row:
+    def __init__(self):
+        self.endhead = false		# header row
+        self.endfirsthead = false	# first header row
+        self.endfoot = false		# footer row
+        self.endlastfoot = false	# last footer row
+
+
+def haveLTFoot(row_info):
+    for row_ in row_info:
+        if row_.endfoot:
+            return true
+    return false
+
+
+def setHeaderFooterRows(hr, fhr, fr, lfr, rows_, row_info):
+    endfirsthead_empty = false
+    endlastfoot_empty = false
+    # set header info
+    while (hr > 0):
+        hr = hr - 1
+        row_info[hr].endhead = true
+
+    # set firstheader info
+    if fhr and fhr < rows_:
+        if row_info[fhr].endhead:
+            while fhr > 0:
+                fhr = fhr - 1
+                row_info[fhr].endfirsthead = true
+                row_info[fhr].endhead = false
+        elif row_info[fhr - 1].endhead:
+            endfirsthead_empty = true
+        else:
+            while fhr > 0 and not row_info[fhr - 1].endhead:
+                fhr = fhr - 1
+                row_info[fhr].endfirsthead = true
+
+    # set footer info
+    if fr and fr < rows_:
+        if row_info[fr].endhead and row_info[fr - 1].endhead:
+            while fr > 0 and not row_info[fr - 1].endhead:
+                fr = fr - 1
+                row_info[fr].endfoot = true
+                row_info[fr].endhead = false
+        elif row_info[fr].endfirsthead and row_info[fr - 1].endfirsthead:
+            while fr > 0 and not row_info[fr - 1].endfirsthead:
+                fr = fr - 1
+                row_info[fr].endfoot = true
+                row_info[fr].endfirsthead = false
+        elif not row_info[fr - 1].endhead and not row_info[fr - 1].endfirsthead:
+            while fr > 0 and not row_info[fr - 1].endhead and not row_info[fr - 1].endfirsthead:
+                fr = fr - 1
+                row_info[fr].endfoot = true
+
+    # set lastfooter info
+    if lfr and lfr < rows_:
+        if row_info[lfr].endhead and row_info[lfr - 1].endhead:
+            while lfr > 0 and not row_info[lfr - 1].endhead:
+                lfr = lfr - 1
+                row_info[lfr].endlastfoot = true
+                row_info[lfr].endhead = false
+        elif row_info[lfr].endfirsthead and row_info[lfr - 1].endfirsthead:
+            while lfr > 0 and not row_info[lfr - 1].endfirsthead:
+                lfr = lfr - 1
+                row_info[lfr].endlastfoot = true
+                row_info[lfr].endfirsthead = false
+        elif row_info[lfr].endfoot and row_info[lfr - 1].endfoot:
+            while lfr > 0 and not row_info[lfr - 1].endfoot:
+                lfr = lfr - 1
+                row_info[lfr].endlastfoot = true
+                row_info[lfr].endfoot = false
+        elif not row_info[fr - 1].endhead and not row_info[fr - 1].endfirsthead and not row_info[fr - 1].endfoot:
+            while lfr > 0 and not row_info[lfr - 1].endhead and not row_info[lfr - 1].endfirsthead and not row_info[lfr - 1].endfoot:
+                lfr = lfr - 1
+                row_info[lfr].endlastfoot = true
+        elif haveLTFoot(row_info):
+            endlastfoot_empty = true
+
+    return endfirsthead_empty, endlastfoot_empty
+
+
+def insert_attribute(lines, i, attribute):
+    last = string.find(lines[i],'>')
+    lines[i] = lines[i][:last] + ' ' + attribute + lines[i][last:]
+
+
+rows_re = re.compile(r'rows="(\d*)"')
+longtable_re = re.compile(r'islongtable="(\w)"')
+ltvalues_re = re.compile(r'endhead="(-?\d*)" endfirsthead="(-?\d*)" endfoot="(-?\d*)" endlastfoot="(-?\d*)"')
+lt_features_re = re.compile(r'(endhead="-?\d*" endfirsthead="-?\d*" endfoot="-?\d*" endlastfoot="-?\d*")')
+def update_longtables(file):
+    regexp = re.compile(r'^\\begin_inset\s+Tabular')
+    body = file.body
+    i = 0
+    while 1:
+        i = find_re(body, regexp, i)
+        if i == -1:
+            break
+        i = i + 1
+        i = find_token(body, "<lyxtabular", i)
+        if i == -1:
+            break
+
+        # get number of rows in the table
+        rows = int(rows_re.search(body[i]).group(1))
+
+        i = i + 1
+        i = find_token(body, '<features', i)
+        if i == -1:
+            break
+
+        # is this a longtable?
+        longtable = longtable_re.search(body[i])
+
+        if not longtable:
+            # islongtable is missing add it
+            body[i] = body[i][:10] + 'islongtable="false" ' + body[i][10:]
+
+        if not longtable or longtable.group(1) != "true":
+            # remove longtable elements from features
+            features = lt_features_re.search(body[i])
+            if features:
+                body[i] = string.replace(body[i], features.group(1), "")
+            continue
+
+        row_info = row() * rows
+        res = ltvalues_re.search(body[i])
+        if not res:
+            continue
+
+        endfirsthead_empty, endlastfoot_empty = setHeaderFooterRows(res.group(1), res.group(2), res.group(3), res.group(4), rows, row_info)
+
+        if endfirsthead_empty:
+            insert_attribute(body, i, 'firstHeadEmpty="true"')
+
+        if endfirsthead_empty:
+            insert_attribute(body, i, 'lastFootEmpty="true"')
+
+        i = i + 1
+        for j in range(rows):
+            i = find_token(body, '<row', i)
+
+            self.endfoot = false		# footer row
+            self.endlastfoot = false	# last footer row
+            if row_info[j].endhead:
+                insert_attribute(body, i, 'endhead="true"')
+
+            if row_info[j].endfirsthead:
+                insert_attribute(body, i, 'endfirsthead="true"')
+
+            if row_info[j].endfoot:
+                insert_attribute(body, i, 'endfoot="true"')
+
+            if row_info[j].endlastfoot:
+                insert_attribute(body, i, 'endlastfoot="true"')
+
+            i = i + 1
+
+
+# Figure insert are hidden feature of lyx 1.1.6. This might be removed in the future.
+def fix_oldfloatinset(file):
+    lines = file.body
+    i = 0
+    while 1:
+	i = find_token(lines, "\\begin_inset Float ", i)
+	if i == -1:
+	    break
+        j = find_token(lines, "collapsed", i)
+        if j != -1:
+            lines[j:j] = ["wide false"]
+        i = i+1
+
+
+def change_listof(file):
+    lines = file.body
+    i = 0
+    while 1:
+	i = find_token(lines, "\\begin_inset LatexCommand \\listof", i)
+	if i == -1:
+	    break
+        type = re.search(r"listof(\w*)", lines[i]).group(1)[:-1]
+        lines[i] = "\\begin_inset FloatList "+type
+        i = i+1
+
+
+def change_infoinset(file):
+    lines = file.body
+    i = 0
+    while 1:
+        i = find_token(lines, "\\begin_inset Info", i)
+        if i == -1:
+            break
+        txt = string.lstrip(lines[i][18:])
+        new = ["\\begin_inset Note", "collapsed true", ""]
+        j = find_token(lines, "\\end_inset", i)
+        if j == -1:
+            break
+
+        note_lines = lines[i+1:j]
+        if len(txt) > 0:
+            note_lines = [txt]+note_lines
+
+        for line in note_lines:
+            new = new + ["\layout Standard", ""]
+            tmp = string.split(line, '\\')
+            new = new + [tmp[0]]
+            for x in tmp[1:]:
+                new = new + ["\\backslash ", x]
+        lines[i:j] = new
+        i = i+5
+
+
+def change_preamble(file):
+    lines = file.header
+    i = find_token(lines, "\\use_amsmath", 0)
+    if i == -1:
+	return
+    lines[i+1:i+1] = ["\\use_natbib 0",
+		      "\use_numerical_citations 0"]
+
+
+convert = [[220, [change_preamble, change_listof, fix_oldfloatinset,
+                  update_tabular, update_longtables, remove_pextra,
+                  remove_oldfloat, remove_figinset, remove_oldertinset,
+                  remove_oldert, combine_ert, change_infoinset]]]
+revert  = []
+
+
+if __name__ == "__main__":
+    pass
diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
new file mode 100644
index 0000000000..ca253df85c
--- /dev/null
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -0,0 +1,1908 @@
+# This file is part of lyx2lyx
+# -*- 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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+import re
+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_re
+from sys import stdin
+from string import replace, split, find, strip, join
+
+from lyx_0_12 import update_latexaccents
+
+##
+# Remove \color default
+#
+def remove_color_default(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\color default", i)
+        if i == -1:
+            return
+        file.body[i] = replace(file.body[i], "\\color default",
+                           "\\color inherit")
+
+
+##
+# Add \end_header
+#
+def add_end_header(file):
+    file.header.append("\\end_header");
+
+
+def rm_end_header(file):
+    i = find_token(file.header, "\\end_header", 0)
+    if i == -1:
+        return
+    del file.header[i]
+
+
+##
+# \SpecialChar ~ -> \InsetSpace ~
+#
+def convert_spaces(file):
+    for i in range(len(file.body)):
+        file.body[i] = replace(file.body[i],"\\SpecialChar ~","\\InsetSpace ~")
+
+
+def revert_spaces(file):
+    for i in range(len(file.body)):
+        file.body[i] = replace(file.body[i],"\\InsetSpace ~", "\\SpecialChar ~")
+
+
+##
+# 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 Standard", "", "\\backslash ",
+                            "eqref" + eqref]
+        i = i + 7
+
+
+##
+# BibTeX changes
+#
+def convert_bibtex(file):
+    for i in range(len(file.body)):
+        file.body[i] = replace(file.body[i],"\\begin_inset LatexCommand \\BibTeX",
+                                  "\\begin_inset LatexCommand \\bibtex")
+
+
+def revert_bibtex(file):
+    for i in range(len(file.body)):
+        file.body[i] = replace(file.body[i], "\\begin_inset LatexCommand \\bibtex",
+                                  "\\begin_inset LatexCommand \\BibTeX")
+
+
+##
+# Remove \lyxparent
+#
+def remove_insetparent(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\begin_inset LatexCommand \\lyxparent", i)
+        if i == -1:
+            break
+        del file.body[i:i+3]
+
+
+##
+#  Inset External
+#
+def convert_external(file):
+    external_rexp = re.compile(r'\\begin_inset External ([^,]*),"([^"]*)",')
+    external_header = "\\begin_inset External"
+    i = 0
+    while 1:
+        i = find_token(file.body, external_header, i)
+        if i == -1:
+            break
+        look = external_rexp.search(file.body[i])
+        args = ['','']
+        if look:
+            args[0] = look.group(1)
+            args[1] = look.group(2)
+        #FIXME: if the previous search fails then warn
+
+        if args[0] == "RasterImage":
+            # Convert a RasterImage External Inset to a Graphics Inset.
+            top = "\\begin_inset Graphics"
+            if args[1]:
+                filename = "\tfilename " + args[1]
+            file.body[i:i+1] = [top, filename]
+            i = i + 1
+        else:
+            # Convert the old External Inset format to the new.
+            top = external_header
+            template = "\ttemplate " + args[0]
+            if args[1]:
+                filename = "\tfilename " + args[1]
+                file.body[i:i+1] = [top, template, filename]
+                i = i + 2
+            else:
+                file.body[i:i+1] = [top, template]
+                i = i + 1
+
+
+def revert_external_1(file):
+    external_header = "\\begin_inset External"
+    i = 0
+    while 1:
+        i = find_token(file.body, external_header, i)
+        if i == -1:
+            break
+
+        template = split(file.body[i+1])
+        template.reverse()
+        del file.body[i+1]
+
+        filename = split(file.body[i+1])
+        filename.reverse()
+        del file.body[i+1]
+
+        params = split(file.body[i+1])
+        params.reverse()
+        if file.body[i+1]: del file.body[i+1]
+
+        file.body[i] = file.body[i] + " " + template[0]+ ', "' + filename[0] + '", " '+ join(params[1:]) + '"'
+        i = i + 1
+
+
+def revert_external_2(file):
+    draft_token = '\tdraft'
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_inset External', i)
+        if i == -1:
+            break
+        j = find_end_of_inset(file.body, i + 1)
+        if j == -1:
+            #this should not happen
+            break
+        k = find_token(file.body, draft_token, i+1, j-1)
+        if (k != -1 and len(draft_token) == len(file.body[k])):
+            del file.body[k]
+        i = j + 1
+
+
+##
+# Comment
+#
+def convert_comment(file):
+    i = 0
+    comment = "\\layout Comment"
+    while 1:
+        i = find_token(file.body, comment, i)
+        if i == -1:
+            return
+
+        file.body[i:i+1] = ["\\layout Standard","","",
+                        "\\begin_inset Comment",
+                        "collapsed true","",
+                        "\\layout Standard"]
+        i = i + 7
+
+        while 1:
+                old_i = i
+            	i = find_token(file.body, "\\layout", i)
+                if i == -1:
+                    i = len(file.body) - 1
+                    file.body[i:i] = ["\\end_inset","",""]
+                    return
+
+                j = find_token(file.body, '\\begin_deeper', old_i, i)
+                if j == -1: j = i + 1
+                k = find_token(file.body, '\\begin_inset', old_i, i)
+                if k == -1: k = i + 1
+
+                if j < i and j < k:
+                    i = j
+                    del file.body[i]
+                    i = find_end_of( file.body, i, "\\begin_deeper","\\end_deeper")
+                    if i == -1:
+                        #This case should not happen
+                        #but if this happens deal with it greacefully adding
+                        #the missing \end_deeper.
+                        i = len(file.body) - 1
+                        file.body[i:i] = ["\end_deeper",""]
+                        return
+                    else:
+                        del file.body[i]
+                        continue
+
+                if k < i:
+                    i = k
+                    i = find_end_of( file.body, i, "\\begin_inset","\\end_inset")
+                    if i == -1:
+                        #This case should not happen
+                        #but if this happens deal with it greacefully adding
+                        #the missing \end_inset.
+                        i = len(file.body) - 1
+                        file.body[i:i] = ["\\end_inset","","","\\end_inset","",""]
+                        return
+                    else:
+                        i = i + 1
+                        continue
+
+                if find(file.body[i], comment) == -1:
+                    file.body[i:i] = ["\\end_inset"]
+                    i = i + 1
+                    break
+                file.body[i:i+1] = ["\\layout Standard"]
+                i = i + 1
+
+
+def revert_comment(file):
+    i = 0
+    while 1:
+        i = find_tokens(file.body, ["\\begin_inset Comment", "\\begin_inset Greyedout"], i)
+
+        if i == -1:
+            return
+        file.body[i] = "\\begin_inset Note"
+        i = i + 1
+
+
+##
+# Add \end_layout
+#
+def add_end_layout(file):
+    i = find_token(file.body, '\\layout', 0)
+
+    if i == -1:
+        return
+
+    i = i + 1
+    struct_stack = ["\\layout"]
+
+    while 1:
+        i = find_tokens(file.body, ["\\begin_inset", "\\end_inset", "\\layout",
+                                "\\begin_deeper", "\\end_deeper", "\\the_end"], i)
+
+        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)
+            i = i + 1
+            continue
+
+        if token == "\\end_inset":
+            tail = struct_stack.pop()
+            if tail == "\\layout":
+                file.body.insert(i,"")
+                file.body.insert(i,"\\end_layout")
+                i = i + 2
+                #Check if it is the correct tag
+                struct_stack.pop()
+            i = i + 1
+            continue
+
+        if token == "\\layout":
+            tail = struct_stack.pop()
+            if tail == token:
+                file.body.insert(i,"")
+                file.body.insert(i,"\\end_layout")
+                i = i + 3
+            else:
+                struct_stack.append(tail)
+                i = i + 1
+            struct_stack.append(token)
+            continue
+
+        if token == "\\begin_deeper":
+            file.body.insert(i,"")
+            file.body.insert(i,"\\end_layout")
+            i = i + 3
+            struct_stack.append(token)
+            continue
+
+        if token == "\\end_deeper":
+            if struct_stack[-1] == '\\layout':
+                file.body.insert(i, '\\end_layout')
+                i = i + 1
+                struct_stack.pop()
+            i = i + 1
+            continue
+
+        #case \end_document
+        file.body.insert(i, "")
+        file.body.insert(i, "\\end_layout")
+        return
+
+
+def rm_end_layout(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\end_layout', i)
+
+        if i == -1:
+            return
+
+        del file.body[i]
+
+
+##
+# Handle change tracking keywords
+#
+def insert_tracking_changes(file):
+    i = find_token(file.header, "\\tracking_changes", 0)
+    if i == -1:
+        file.header.append("\\tracking_changes 0")
+
+
+def rm_tracking_changes(file):
+    i = find_token(file.header, "\\author", 0)
+    if i != -1:
+        del file.header[i]
+
+    i = find_token(file.header, "\\tracking_changes", 0)
+    if i == -1:
+        return
+    del file.header[i]
+
+
+def rm_body_changes(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\change_", i)
+        if i == -1:
+            return
+
+        del file.body[i]
+
+
+##
+# \layout -> \begin_layout
+#
+def layout2begin_layout(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\layout', i)
+        if i == -1:
+            return
+
+        file.body[i] = replace(file.body[i], '\\layout', '\\begin_layout')
+        i = i + 1
+
+
+def begin_layout2layout(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_layout', i)
+        if i == -1:
+            return
+
+        file.body[i] = replace(file.body[i], '\\begin_layout', '\\layout')
+        i = i + 1
+
+
+##
+# valignment="center" -> valignment="middle"
+#
+def convert_valignment_middle(body, start, end):
+    for i in range(start, end):
+        if re.search('^<(column|cell) .*valignment="center".*>$', body[i]):
+            body[i] = replace(body[i], 'valignment="center"', 'valignment="middle"')
+
+
+def convert_table_valignment_middle(file):
+    regexp = re.compile(r'^\\begin_inset\s+Tabular')
+    i = 0
+    while 1:
+        i = find_re(file.body, regexp, i)
+        if i == -1:
+            return
+        j = find_end_of_inset(file.body, i + 1)
+        if j == -1:
+            #this should not happen
+            convert_valignment_middle(file.body, i + 1, len(file.body))
+            return
+        convert_valignment_middle(file.body, i + 1, j)
+        i = j + 1
+
+
+def revert_table_valignment_middle(body, start, end):
+    for i in range(start, end):
+        if re.search('^<(column|cell) .*valignment="middle".*>$', body[i]):
+            body[i] = replace(body[i], 'valignment="middle"', 'valignment="center"')
+
+
+def revert_valignment_middle(file):
+    regexp = re.compile(r'^\\begin_inset\s+Tabular')
+    i = 0
+    while 1:
+        i = find_re(file.body, regexp, i)
+        if i == -1:
+            return
+        j = find_end_of_inset(file.body, i + 1)
+        if j == -1:
+            #this should not happen
+            revert_table_valignment_middle(file.body, i + 1, len(file.body))
+            return
+        revert_table_valignment_middle(file.body, i + 1, j)
+        i = j + 1
+
+
+##
+#  \the_end -> \end_document
+#
+def convert_end_document(file):
+    i = find_token(file.body, "\\the_end", 0)
+    if i == -1:
+        file.body.append("\\end_document")
+        return
+    file.body[i] = "\\end_document"
+
+
+def revert_end_document(file):
+    i = find_token(file.body, "\\end_document", 0)
+    if i == -1:
+        file.body.append("\\the_end")
+        return
+    file.body[i] = "\\the_end"
+
+
+##
+# 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(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')
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\begin_layout", i)
+        if i == -1:
+            return
+        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")
+        pb_bot     = find(file.body[i],"\\pagebreak_bottom")
+        vspace_top = find(file.body[i],"\\added_space_top")
+        vspace_bot = find(file.body[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":
+            file.body[i] = replace(file.body[i], tag, "")
+
+        if vspace_top != -1:
+            # the position could be change because of the removal of other
+            # paragraph properties above
+            vspace_top = find(file.body[i],"\\added_space_top")
+            tmp_list = split(file.body[i][vspace_top:])
+            vspace_top_value = tmp_list[1]
+            file.body[i] = file.body[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(file.body[i],"\\added_space_bottom")
+            tmp_list = split(file.body[i][vspace_bot:])
+            vspace_bot_value = tmp_list[1]
+            file.body[i] = file.body[i][:vspace_bot] + join(tmp_list[2:])
+
+        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_top != -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
+            file.body[i-2:i-2] = paragraph_above
+            i = i + len(paragraph_above)
+
+        # Ensure that nested style are converted later.
+        k = find_end_of(file.body, i, "\\begin_layout", "\\end_layout")
+
+        if k == -1:
+            return
+
+        if pb_bot !=-1 or line_bot != -1 or vspace_bot != -1:
+
+            paragraph_below = ['','\\begin_layout Standard','','']
+
+            if line_bot != -1:
+                paragraph_below.extend(['\\lyxline ',''])
+
+            if vspace_bot != -1:
+                paragraph_below.extend(['\\begin_inset VSpace ' + vspace_bot_value,'\\end_inset','',''])
+
+            if pb_bot != -1:
+                paragraph_below.extend(['\\newpage ',''])
+
+            paragraph_below.extend(['\\end_layout',''])
+
+            #inset new paragraph above the current paragraph
+            file.body[k + 1: k + 1] = paragraph_below
+
+
+##
+#  Notes
+#
+def convert_note(file):
+    i = 0
+    while 1:
+        i = find_tokens(file.body, ["\\begin_inset Note",
+                                "\\begin_inset Comment",
+                                "\\begin_inset Greyedout"], i)
+        if i == -1:
+            break
+
+        file.body[i] = file.body[i][0:13] + 'Note ' + file.body[i][13:]
+        i = i + 1
+
+
+def revert_note(file):
+    note_header = "\\begin_inset Note "
+    i = 0
+    while 1:
+        i = find_token(file.body, note_header, i)
+        if i == -1:
+            break
+
+        file.body[i] = "\\begin_inset " + file.body[i][len(note_header):]
+        i = i + 1
+
+
+##
+# Box
+#
+def convert_box(file):
+    i = 0
+    while 1:
+        i = find_tokens(file.body, ["\\begin_inset Boxed",
+                                "\\begin_inset Doublebox",
+                                "\\begin_inset Frameless",
+                                "\\begin_inset ovalbox",
+                                "\\begin_inset Ovalbox",
+                                "\\begin_inset Shadowbox"], i)
+        if i == -1:
+            break
+
+        file.body[i] = file.body[i][0:13] + 'Box ' + file.body[i][13:]
+        i = i + 1
+
+
+def revert_box(file):
+    box_header = "\\begin_inset Box "
+    i = 0
+    while 1:
+        i = find_token(file.body, box_header, i)
+        if i == -1:
+            break
+
+        file.body[i] = "\\begin_inset " + file.body[i][len(box_header):]
+        i = i + 1
+
+
+##
+# Collapse
+#
+def convert_collapsable(file):
+    i = 0
+    while 1:
+        i = find_tokens(file.body, ["\\begin_inset Box",
+                                "\\begin_inset Branch",
+                                "\\begin_inset CharStyle",
+                                "\\begin_inset Float",
+                                "\\begin_inset Foot",
+                                "\\begin_inset Marginal",
+                                "\\begin_inset Note",
+                                "\\begin_inset OptArg",
+                                "\\begin_inset Wrap"], i)
+        if i == -1:
+            break
+
+        # Seach for a line starting 'collapsed'
+        # If, however, we find a line starting '\begin_layout'
+        # (_always_ present) then break with a warning message
+        i = i + 1
+        while 1:
+            if (file.body[i] == "collapsed false"):
+                file.body[i] = "status open"
+                break
+            elif (file.body[i] == "collapsed true"):
+                file.body[i] = "status collapsed"
+                break
+            elif (file.body[i][:13] == "\\begin_layout"):
+                file.warning("Malformed LyX file: Missing 'collapsed'.")
+                break
+            i = i + 1
+
+        i = i + 1
+
+
+def revert_collapsable(file):
+    i = 0
+    while 1:
+        i = find_tokens(file.body, ["\\begin_inset Box",
+                                "\\begin_inset Branch",
+                                "\\begin_inset CharStyle",
+                                "\\begin_inset Float",
+                                "\\begin_inset Foot",
+                                "\\begin_inset Marginal",
+                                "\\begin_inset Note",
+                                "\\begin_inset OptArg",
+                                "\\begin_inset Wrap"], i)
+        if i == -1:
+            break
+
+        # Seach for a line starting 'status'
+        # If, however, we find a line starting '\begin_layout'
+        # (_always_ present) then break with a warning message
+        i = i + 1
+        while 1:
+            if (file.body[i] == "status open"):
+                file.body[i] = "collapsed false"
+                break
+            elif (file.body[i] == "status collapsed" or
+                  file.body[i] == "status inlined"):
+                file.body[i] = "collapsed true"
+                break
+            elif (file.body[i][:13] == "\\begin_layout"):
+                file.warning("Malformed LyX file: Missing 'status'.")
+                break
+            i = i + 1
+
+        i = i + 1
+
+
+##
+#  ERT
+#
+def convert_ert(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\begin_inset ERT", i)
+        if i == -1:
+            break
+
+        # Seach for a line starting 'status'
+        # If, however, we find a line starting '\begin_layout'
+        # (_always_ present) then break with a warning message
+        i = i + 1
+        while 1:
+            if (file.body[i] == "status Open"):
+                file.body[i] = "status open"
+                break
+            elif (file.body[i] == "status Collapsed"):
+                file.body[i] = "status collapsed"
+                break
+            elif (file.body[i] == "status Inlined"):
+                file.body[i] = "status inlined"
+                break
+            elif (file.body[i][:13] == "\\begin_layout"):
+                file.warning("Malformed LyX file: Missing 'status'.")
+                break
+            i = i + 1
+
+        i = i + 1
+
+
+def revert_ert(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\begin_inset ERT", i)
+        if i == -1:
+            break
+
+        # Seach for a line starting 'status'
+        # If, however, we find a line starting '\begin_layout'
+        # (_always_ present) then break with a warning message
+        i = i + 1
+        while 1:
+            if (file.body[i] == "status open"):
+                file.body[i] = "status Open"
+                break
+            elif (file.body[i] == "status collapsed"):
+                file.body[i] = "status Collapsed"
+                break
+            elif (file.body[i] == "status inlined"):
+                file.body[i] = "status Inlined"
+                break
+            elif (file.body[i][:13] == "\\begin_layout"):
+                file.warning("Malformed LyX file : Missing 'status'.")
+                break
+            i = i + 1
+
+        i = i + 1
+
+
+##
+# Minipages
+#
+def convert_minipage(file):
+    """ Convert minipages to the box inset.
+    We try to use the same order of arguments as lyx does.
+    """
+    pos = ["t","c","b"]
+    inner_pos = ["c","t","b","s"]
+
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\begin_inset Minipage", i)
+        if i == -1:
+            return
+
+        file.body[i] = "\\begin_inset Box Frameless"
+        i = i + 1
+
+        # convert old to new position using the pos list
+        if file.body[i][:8] == "position":
+            file.body[i] = 'position "%s"' % pos[int(file.body[i][9])]
+        else:
+            file.body.insert(i, 'position "%s"' % pos[0])
+        i = i + 1
+
+        file.body.insert(i, 'hor_pos "c"')
+        i = i + 1
+        file.body.insert(i, 'has_inner_box 1')
+        i = i + 1
+
+        # convert the inner_position
+        if file.body[i][:14] == "inner_position":
+            file.body[i] = 'inner_pos "%s"' %  inner_pos[int(file.body[i][15])]
+        else:
+            file.body.insert('inner_pos "%s"' % inner_pos[0])
+        i = i + 1
+
+        # We need this since the new file format has a height and width
+        # in a different order.
+        if file.body[i][:6] == "height":
+            height = file.body[i][6:]
+            # test for default value of 221 and convert it accordingly
+            if height == ' "0pt"':
+                height = ' "1pt"'
+            del file.body[i]
+        else:
+            height = ' "1pt"'
+
+        if file.body[i][:5] == "width":
+            width = file.body[i][5:]
+            del file.body[i]
+        else:
+            width = ' "0"'
+
+        if file.body[i][:9] == "collapsed":
+            if file.body[i][9:] == "true":
+		status = "collapsed"
+            else:
+		status = "open"
+            del file.body[i]
+        else:
+	    status = "collapsed"
+
+        file.body.insert(i, 'use_parbox 0')
+        i = i + 1
+        file.body.insert(i, 'width' + width)
+        i = i + 1
+        file.body.insert(i, 'special "none"')
+        i = i + 1
+        file.body.insert(i, 'height' + height)
+        i = i + 1
+        file.body.insert(i, 'height_special "totalheight"')
+        i = i + 1
+        file.body.insert(i, 'status ' + status)
+        i = i + 1
+
+
+# -------------------------------------------------------------------------------------------
+# 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):
+    for c in ert:
+	if c == '\\':
+	    body[i] = body[i] + '\\backslash '
+	    i = i + 1
+	    body.insert(i, '')
+	elif c == '\n':
+	    body[i+1:i+1] = ['\\newline ', '']
+	    i = i + 2
+	else:
+	    body[i] = body[i] + c
+    return i
+
+
+def convert_vspace(file):
+
+    # Get default spaceamount
+    i = find_token(file.header, '\\defskip', 0)
+    if i == -1:
+	defskipamount = 'medskip'
+    else:
+	defskipamount = split(file.header[i])[1]
+
+    # Convert the insets
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_inset VSpace', 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
+
+
+# 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"}
+
+    # Convert special lengths
+    if special != 'none':
+	len = '%f\\' % len2value(len) + special
+
+    # Convert LyX units to LaTeX units
+    for unit in units.keys():
+	if find(len, unit) != -1:
+	    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):
+    # Convert backslashes and insert the converted length into body
+    return convert_ertbackslash(body, i, convert_len(len, special))
+
+
+# Return the value of len without the unit in numerical form
+def len2value(len):
+    result = re.search('([+-]?[0-9.]+)', len)
+    if result:
+	return float(result.group(1))
+    # No number means 1.0
+    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):
+    body[i:i] = ['\\begin_inset ERT', 'status ' + status, '',
+                 '\\layout Standard', '']
+    i = i + 5
+    i = convert_ertbackslash(body, i, text) + 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):
+    i = find_token(file.header, '\\begin_preamble', 0)
+    if i == -1:
+        file.warning("Malformed LyX file: Missing '\\begin_preamble'.")
+        return
+    j = find_token(file.header, '\\end_preamble', i)
+    if j == -1:
+        file.warning("Malformed LyX file: Missing '\\end_preamble'.")
+        return
+    if find_token(file.header, text[0], i, j) != -1:
+        return
+    file.header[j:j] = text
+
+
+def convert_frameless_box(file):
+    pos = ['t', 'c', 'b']
+    inner_pos = ['c', 't', 'b', 's']
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_inset Frameless', 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]
+	j = j - 1
+
+	# Gather parameters
+	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():
+	    value = replace(get_value(file.body, key, i, j), '"', '')
+	    if value != "":
+		if key == 'position':
+		    # convert new to old position: 'position "t"' -> 0
+		    value = find_token(pos, value, 0)
+		    if value != -1:
+			params[key] = value
+		elif key == 'inner_pos':
+		    # convert inner position
+		    value = find_token(inner_pos, value, 0)
+		    if value != -1:
+			params[key] = value
+		else:
+		    params[key] = value
+		j = del_token(file.body, key, i, j)
+	i = i + 1
+
+	# Convert to minipage or ERT?
+	# Note that the inner_position and height parameters of a minipage
+	# inset are ignored and not accessible for the user, although they
+	# are present in the file format and correctly read in and written.
+	# Therefore we convert to ERT if they do not have their LaTeX
+	# defaults. These are:
+	# - the value of "position" for "inner_pos"
+	# - "\totalheight"          for "height"
+	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):
+
+            # 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:
+                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)
+            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 Standard', '', '']
+            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)
+            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 Standard', '', '']
+            j = j + 2
+            ert = '\\let\\endminipage\\endlyxtolyxminipage'
+            j = insert_ert(file.body, j, 'Collapsed', ert)
+	    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)
+
+            # 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']]
+	    i = i + 6
+
+##
+# Convert jurabib
+#
+
+def convert_jurabib(file):
+    i = find_token(file.header, '\\use_numerical_citations', 0)
+    if i == -1:
+        file.warning("Malformed lyx file: Missing '\\use_numerical_citations'.")
+        return
+    file.header.insert(i + 1, '\\use_jurabib 0')
+
+
+def revert_jurabib(file):
+    i = find_token(file.header, '\\use_jurabib', 0)
+    if i == -1:
+        file.warning("Malformed lyx file: Missing '\\use_jurabib'.")
+        return
+    if get_value(file.header, '\\use_jurabib', 0) != "0":
+        file.warning("Conversion of '\\use_jurabib = 1' not yet implemented.")
+        # Don't remove '\\use_jurabib' so that people will get warnings by lyx
+        return
+    del file.header[i]
+
+##
+# Convert bibtopic
+#
+
+def convert_bibtopic(file):
+    i = find_token(file.header, '\\use_jurabib', 0)
+    if i == -1:
+        file.warning("Malformed lyx file: Missing '\\use_jurabib'.")
+        return
+    file.header.insert(i + 1, '\\use_bibtopic 0')
+
+
+def revert_bibtopic(file):
+    i = find_token(file.header, '\\use_bibtopic', 0)
+    if i == -1:
+        file.warning("Malformed lyx file: Missing '\\use_bibtopic'.")
+        return
+    if get_value(file.header, '\\use_bibtopic', 0) != "0":
+        file.warning("Conversion of '\\use_bibtopic = 1' not yet implemented.")
+        # Don't remove '\\use_jurabib' so that people will get warnings by lyx
+    del file.header[i]
+
+##
+# Sideway Floats
+#
+
+def convert_float(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_inset Float', i)
+        if i == -1:
+            return
+        # Seach for a line starting 'wide'
+        # If, however, we find a line starting '\begin_layout'
+        # (_always_ present) then break with a warning message
+        i = i + 1
+        while 1:
+            if (file.body[i][:4] == "wide"):
+                file.body.insert(i + 1, 'sideways false')
+                break
+            elif (file.body[i][:13] == "\\begin_layout"):
+                file.warning("Malformed lyx file: Missing 'wide'.")
+                break
+            i = i + 1
+        i = i + 1
+
+
+def revert_float(file):
+    i = 0
+    while 1:
+        i = find_token(file.body, '\\begin_inset Float', 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
+        if get_value(file.body, 'sideways', i, j) != "false":
+            file.warning("Conversion of 'sideways true' not yet implemented.")
+            # Don't remove 'sideways' so that people will get warnings by lyx
+            i = i + 1
+            continue
+        del_token(file.body, 'sideways', i, j)
+        i = i + 1
+
+
+def convert_graphics(file):
+    """ Add extension to filenames of insetgraphics if necessary.
+    """
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\begin_inset Graphics", i)
+        if i == -1:
+            return
+
+	j = find_token2(file.body, "filename", i)
+        if j == -1:
+            return
+        i = i + 1
+	filename = split(file.body[j])[1]
+	absname = os.path.normpath(os.path.join(file.dir, filename))
+	if file.input == stdin and not os.path.isabs(filename):
+	    # We don't know the directory and cannot check the file.
+	    # We could use a heuristic and take the current directory,
+	    # and we could try to find out if filename has an extension,
+	    # but that would be just guesses and could be wrong.
+	    file.warning("""Warning: Can not determine whether file
+         %s
+         needs an extension when reading from standard input.
+         You may need to correct the file manually or run
+         lyx2lyx again with the .lyx file as commandline argument.""" % filename)
+	    continue
+	# This needs to be the same algorithm as in pre 233 insetgraphics
+	if access(absname, F_OK):
+	    continue
+	if access(absname + ".ps", F_OK):
+	    file.body[j] = replace(file.body[j], filename, filename + ".ps")
+	    continue
+	if access(absname + ".eps", F_OK):
+	    file.body[j] = replace(file.body[j], filename, filename + ".eps")
+
+
+##
+# Convert firstname and surname from styles -> char styles
+#
+def convert_names(file):
+    """ Convert in the docbook backend from firstname and surname style
+    to charstyles.
+    """
+    if file.backend != "docbook":
+        return
+
+    i = 0
+
+    while 1:
+        i = find_token(file.body, "\\begin_layout Author", i)
+        if i == -1:
+            return
+
+        i = i + 1
+        while file.body[i] == "":
+            i = i + 1
+
+        if file.body[i][:11] != "\\end_layout" or file.body[i+2][:13] != "\\begin_deeper":
+            i = i + 1
+            continue
+
+        k = i
+        i = find_end_of( file.body, i+3, "\\begin_deeper","\\end_deeper")
+        if i == -1:
+            # something is really wrong, abort
+            file.warning("Missing \\end_deeper, after style Author.")
+            file.warning("Aborted attempt to parse FirstName and Surname.")
+            return
+        firstname, surname = "", ""
+
+        name = file.body[k:i]
+
+        j = find_token(name, "\\begin_layout FirstName", 0)
+        if j != -1:
+            j = j + 1
+            while(name[j] != "\\end_layout"):
+                firstname = firstname + name[j]
+                j = j + 1
+
+        j = find_token(name, "\\begin_layout Surname", 0)
+        if j != -1:
+            j = j + 1
+            while(name[j] != "\\end_layout"):
+                surname = surname + name[j]
+                j = j + 1
+
+        # delete name
+        del file.body[k+2:i+1]
+
+        file.body[k-1:k-1] = ["", "",
+                          "\\begin_inset CharStyle Firstname",
+                          "status inlined",
+                          "",
+                          "\\begin_layout Standard",
+                          "",
+                          "%s" % firstname,
+                          "\end_layout",
+                          "",
+                          "\end_inset",
+                          "",
+                          "",
+                          "\\begin_inset CharStyle Surname",
+                          "status inlined",
+                          "",
+                          "\\begin_layout Standard",
+                          "",
+                          "%s" % surname,
+                          "\\end_layout",
+                          "",
+                          "\\end_inset",
+                          ""]
+
+
+def revert_names(file):
+    """ Revert in the docbook backend from firstname and surname char style
+    to styles.
+    """
+    if file.backend != "docbook":
+        return
+
+
+##
+#    \use_natbib 1                       \cite_engine <style>
+#    \use_numerical_citations 0     ->   where <style> is one of
+#    \use_jurabib 0                      "basic", "natbib_authoryear",
+#                                        "natbib_numerical" or "jurabib"
+def convert_cite_engine(file):
+    a = find_token(file.header, "\\use_natbib", 0)
+    if a == -1:
+        file.warning("Malformed lyx file: Missing '\\use_natbib'.")
+        return
+
+    b = find_token(file.header, "\\use_numerical_citations", 0)
+    if b == -1 or b != a+1:
+        file.warning("Malformed lyx file: Missing '\\use_numerical_citations'.")
+        return
+
+    c = find_token(file.header, "\\use_jurabib", 0)
+    if c == -1 or c != b+1:
+        file.warning("Malformed lyx file: Missing '\\use_jurabib'.")
+        return
+
+    use_natbib = int(split(file.header[a])[1])
+    use_numerical_citations = int(split(file.header[b])[1])
+    use_jurabib = int(split(file.header[c])[1])
+
+    cite_engine = "basic"
+    if use_natbib:
+        if use_numerical_citations:
+            cite_engine = "natbib_numerical"
+        else:
+             cite_engine = "natbib_authoryear"
+    elif use_jurabib:
+        cite_engine = "jurabib"
+
+    del file.header[a:c+1]
+    file.header.insert(a, "\\cite_engine " + cite_engine)
+
+
+def revert_cite_engine(file):
+    i = find_token(file.header, "\\cite_engine", 0)
+    if i == -1:
+        file.warning("Malformed lyx file: Missing '\\cite_engine'.")
+        return
+
+    cite_engine = split(file.header[i])[1]
+
+    use_natbib = '0'
+    use_numerical = '0'
+    use_jurabib = '0'
+    if cite_engine == "natbib_numerical":
+        use_natbib = '1'
+        use_numerical = '1'
+    elif cite_engine == "natbib_authoryear":
+        use_natbib = '1'
+    elif cite_engine == "jurabib":
+        use_jurabib = '1'
+
+    del file.header[i]
+    file.header.insert(i, "\\use_jurabib " + use_jurabib)
+    file.header.insert(i, "\\use_numerical_citations " + use_numerical)
+    file.header.insert(i, "\\use_natbib " + use_natbib)
+
+
+##
+# Paper package
+#
+def convert_paperpackage(file):
+    i = find_token(file.header, "\\paperpackage", 0)
+    if i == -1:
+        file.warning("Malformed lyx file: Missing '\\paperpackage'.")
+        return
+
+    packages = {'default':'none','a4':'none', 'a4wide':'a4', 'widemarginsa4':'a4wide'}
+    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])
+
+
+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]
+    file.header[i] = replace(file.header[i], paperpackage, packages[paperpackage])
+
+
+##
+# Bullets
+#
+def convert_bullets(file):
+    i = 0
+    while 1:
+        i = find_token(file.header, "\\bullet", i)
+        if i == -1:
+            return
+        if file.header[i][:12] == '\\bulletLaTeX':
+            file.header[i] = file.header[i] + ' ' + strip(file.header[i+1])
+            n = 3
+        else:
+            file.header[i] = file.header[i] + ' ' + strip(file.header[i+1]) +\
+                        ' ' + strip(file.header[i+2]) + ' ' + strip(file.header[i+3])
+            n = 5
+        del file.header[i+1:i + n]
+        i = i + 1
+
+
+def revert_bullets(file):
+    i = 0
+    while 1:
+        i = find_token(file.header, "\\bullet", i)
+        if i == -1:
+            return
+        if file.header[i][:12] == '\\bulletLaTeX':
+            n = find(file.header[i], '"')
+            if n == -1:
+                file.warning("Malformed header.")
+                return
+            else:
+                file.header[i:i+1] = [file.header[i][:n-1],'\t' + file.header[i][n:], '\\end_bullet']
+            i = i + 3
+        else:
+            frag = split(file.header[i])
+            if len(frag) != 5:
+                file.warning("Malformed header.")
+                return
+            else:
+                file.header[i:i+1] = [frag[0] + ' ' + frag[1],
+                                 '\t' + frag[2],
+                                 '\t' + frag[3],
+                                 '\t' + frag[4],
+                                 '\\end_bullet']
+                i = i + 5
+
+
+##
+# \begin_header and \begin_document
+#
+def add_begin_header(file):
+    i = find_token(file.header, '\\lyxformat', 0)
+    file.header.insert(i+1, '\\begin_header')
+    file.header.insert(i+1, '\\begin_document')
+
+
+def remove_begin_header(file):
+    i = find_token(file.header, "\\begin_document", 0)
+    if i != -1:
+        del file.header[i]
+    i = find_token(file.header, "\\begin_header", 0)
+    if i != -1:
+        del file.header[i]
+
+
+##
+# \begin_file.body and \end_file.body
+#
+def add_begin_body(file):
+    file.body.insert(0, '\\begin_body')
+    file.body.insert(1, '')
+    i = find_token(file.body, "\\end_document", 0)
+    file.body.insert(i, '\\end_body')
+
+def remove_begin_body(file):
+    i = find_token(file.body, "\\begin_body", 0)
+    if i != -1:
+        del file.body[i]
+        if not file.body[i]:
+            del file.body[i]
+    i = find_token(file.body, "\\end_body", 0)
+    if i != -1:
+        del file.body[i]
+
+
+##
+# \papersize
+#
+def normalize_papersize(file):
+    i = find_token(file.header, '\\papersize', 0)
+    if i == -1:
+        return
+
+    tmp = split(file.header[i])
+    if tmp[1] == "Default":
+        file.header[i] = '\\papersize default'
+        return
+    if tmp[1] == "Custom":
+        file.header[i] = '\\papersize custom'
+
+
+def denormalize_papersize(file):
+    i = find_token(file.header, '\\papersize', 0)
+    if i == -1:
+        return
+
+    tmp = split(file.header[i])
+    if tmp[1] == "custom":
+        file.header[i] = '\\papersize Custom'
+
+
+##
+# Strip spaces at end of command line
+#
+def strip_end_space(file):
+    for i in range(len(file.body)):
+        if file.body[i][:1] == '\\':
+            file.body[i] = strip(file.body[i])
+
+
+##
+# Use boolean values for \use_geometry, \use_bibtopic and \tracking_changes
+#
+def use_x_boolean(file):
+    bin2bool = {'0': 'false', '1': 'true'}
+    for use in '\\use_geometry', '\\use_bibtopic', '\\tracking_changes':
+        i = find_token(file.header, use, 0)
+        if i == -1:
+            continue
+        decompose = split(file.header[i])
+        file.header[i] = decompose[0] + ' ' + bin2bool[decompose[1]]
+
+
+def use_x_binary(file):
+    bool2bin = {'false': '0', 'true': '1'}
+    for use in '\\use_geometry', '\\use_bibtopic', '\\tracking_changes':
+        i = find_token(file.header, use, 0)
+        if i == -1:
+            continue
+        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"
+
+    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 Standard"
+            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 Standard", k, j)
+            if k == -1:
+                break
+            if first_pagraph:
+                first_pagraph = 0
+                k = k + 1
+                continue
+            file.body[k:k] = ["\\begin_layout Standard", "",
+                              "\\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 Standard"]
+            k = k + 4
+            j = j + 3
+        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 Standard"]
+                j = j - l + k + 2
+                k = k + 3
+            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"
+
+
+##
+# Convertion hub
+#
+
+convert = [[223, [insert_tracking_changes, add_end_header, 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]],
+           [226, [convert_note]],
+           [227, [convert_box]],
+           [228, [convert_collapsable, convert_ert]],
+           [229, [convert_minipage]],
+           [230, [convert_jurabib]],
+           [231, [convert_float]],
+           [232, [convert_bibtopic]],
+           [233, [convert_graphics, convert_names]],
+           [234, [convert_cite_engine]],
+           [235, [convert_paperpackage]],
+           [236, [convert_bullets, add_begin_header, add_begin_body,
+                  normalize_papersize, strip_end_space]],
+           [237, [use_x_boolean]],
+           [238, [update_latexaccents]],
+           [239, [normalize_paragraph_params]],
+           [240, [convert_output_changes]],
+           [241, [convert_ert_paragraphs]],
+           [242, [convert_french]]]
+
+revert =  [[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]],
+           [234, [revert_paperpackage]],
+           [233, [revert_cite_engine]],
+           [232, [revert_names]],
+           [231, [revert_bibtopic]],
+           [230, [revert_float]],
+           [229, [revert_jurabib]],
+           [228, []],
+           [227, [revert_collapsable, revert_ert]],
+           [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, revert_eqref]],
+           [221, [rm_end_header, revert_spaces, revert_bibtex,
+                  rm_tracking_changes, rm_body_changes]]]
+
+
+if __name__ == "__main__":
+    pass