]> git.lyx.org Git - lyx.git/blobdiff - lib/lyx2lyx/lyx_1_6.py
* lib/layouts/apa.layout:
[lyx.git] / lib / lyx2lyx / lyx_1_6.py
index a285c885a00c89cb2b8512f08aa5911ca885425b..b4df663d487bbcd949573a3d4263252b9593457e 100644 (file)
@@ -22,7 +22,7 @@ import re
 import unicodedata
 import sys, os
 
-from parser_tools import find_token, find_end_of, find_tokens, get_value
+from parser_tools import find_token, find_end_of, find_tokens, get_value, get_value_string
 
 ####################################################################
 # Private helper functions
@@ -68,7 +68,15 @@ def len2value(len):
     # No number means 1.0
     return 1.0
 
-####################################################################
+# Unfortunately, this doesn't really work, since Standard isn't always default.
+# But it's as good as we can do right now.
+def find_default_layout(document, start, end):
+    l = find_token(document.body, "\\begin_layout Standard", start, end)
+    if l == -1:
+        l = find_token(document.body, "\\begin_layout PlainLayout", start, end)
+    if l == -1:
+        l = find_token(document.body, "\\begin_layout Plain Layout", start, end)
+    return l
 
 def get_option(document, m, option, default):
     l = document.body[m].find(option)
@@ -94,6 +102,91 @@ def set_option(document, m, option, value):
         document.body[m] = document.body[m][:-1] + ' ' + option + '="' + value + '">'
     return l
 
+
+####################################################################
+
+def convert_ltcaption(document):
+    i = 0
+    while True:
+        i = find_token(document.body, "\\begin_inset Tabular", i)
+        if i == -1:
+            return
+        j = find_end_of_inset(document.body, i + 1)
+        if j == -1:
+            document.warning("Malformed LyX document: Could not find end of tabular.")
+            continue
+
+        nrows = int(document.body[i+1].split('"')[3])
+        ncols = int(document.body[i+1].split('"')[5])
+
+        m = i + 1
+        for k in range(nrows):
+            m = find_token(document.body, "<row", m)
+            r = m
+            caption = 'false'
+            for k in range(ncols):
+                m = find_token(document.body, "<cell", m)
+                if (k == 0):
+                    mend = find_token(document.body, "</cell>", m + 1)
+                    # first look for caption insets
+                    mcap = find_token(document.body, "\\begin_inset Caption", m + 1, mend)
+                    # then look for ERT captions
+                    if mcap == -1:
+                        mcap = find_token(document.body, "caption", m + 1, mend)
+                        if mcap > -1:
+                            mcap = find_token(document.body, "\\backslash", mcap - 1, mcap)
+                    if mcap > -1:
+                        caption = 'true'
+                if caption == 'true':
+                    if (k == 0):
+                        set_option(document, r, 'caption', 'true')
+                        set_option(document, m, 'multicolumn', '1')
+                        set_option(document, m, 'bottomline', 'false')
+                        set_option(document, m, 'topline', 'false')
+                        set_option(document, m, 'rightline', 'false')
+                        set_option(document, m, 'leftline', 'false')
+                        #j = find_end_of_inset(document.body, j + 1)
+                    else:
+                        set_option(document, m, 'multicolumn', '2')
+                m = m + 1
+            m = m + 1
+
+        i = j + 1
+
+def revert_ltcaption(document):
+    i = 0
+    while True:
+        i = find_token(document.body, "\\begin_inset Tabular", i)
+        if i == -1:
+            return
+        j = find_end_of_inset(document.body, i + 1)
+        if j == -1:
+            document.warning("Malformed LyX document: Could not find end of tabular.")
+            continue
+
+        m = i + 1
+        nrows = int(document.body[i+1].split('"')[3])
+        ncols = int(document.body[i+1].split('"')[5])
+
+        for k in range(nrows):
+            m = find_token(document.body, "<row", m)
+            caption = get_option(document, m, 'caption', 'false')
+            if caption == 'true':
+                remove_option(document, m, 'caption')
+                for k in range(ncols):
+                    m = find_token(document.body, "<cell", m)
+                    remove_option(document, m, 'multicolumn')
+                    if k == 0:
+                        m = find_token(document.body, "\\begin_inset Caption", m)
+                        if m == -1:
+                            return
+                        m = find_end_of_inset(document.body, m + 1)
+                        document.body[m] += wrap_into_ert("","","\\backslash\n\\backslash\n%")
+                    m = m + 1
+            m = m + 1
+        i = j + 1
+
+
 def convert_tablines(document):
     i = 0
     while True:
@@ -187,20 +280,29 @@ def revert_tablines(document):
             lines.append([top, bottom, left, right])
             m = m + 1
 
+        # we will want to ignore longtable captions
+        m = i + 1
+        caption_info = []
+        for k in range(nrows):
+            m = find_token(document.body, "<row", m)
+            caption = get_option(document, m, 'caption', 'false')
+            caption_info.append([caption])
+            m = m + 1
+
         m = i + 1
         col_info = []
         for k in range(ncols):
             m = find_token(document.body, "<column", m)
             left = 'true'
             for l in range(nrows):
-                left = lines[k*ncols + k][2]
-                if left == 'false':
+                left = lines[l*ncols + k][2]
+                if left == 'false' and caption_info[l] == 'false':
                     break
             set_option(document, m, 'leftline', left)
             right = 'true'
             for l in range(nrows):
-                right = lines[k*ncols + k][3]
-                if right == 'false':
+                right = lines[l*ncols + k][3]
+                if right == 'false' and caption_info[l] == 'false':
                     break
             set_option(document, m, 'rightline', right)
             m = m + 1
@@ -213,12 +315,16 @@ def revert_tablines(document):
                 top = lines[k*ncols + l][0]
                 if top == 'false':
                     break
+            if caption_info[k] == 'false':
+                top = 'false'
             set_option(document, m, 'topline', top)
             bottom = 'true'
             for l in range(ncols):
                 bottom = lines[k*ncols + l][1]
                 if bottom == 'false':
                     break
+            if caption_info[k] == 'false':
+                bottom = 'false'
             set_option(document, m, 'bottomline', bottom)
             m = m + 1
 
@@ -368,59 +474,160 @@ def revert_flex(document):
 #  Discard PDF options for hyperref
 def revert_pdf_options(document):
         "Revert PDF options for hyperref."
+        # store the PDF options and delete the entries from the Lyx file
         i = 0
+        hyperref = False
+        title = ""
+        author = ""
+        subject = ""
+        keywords = ""
+        bookmarks = ""
+        bookmarksnumbered = ""
+        bookmarksopen = ""
+        bookmarksopenlevel = ""
+        breaklinks = ""
+        pdfborder = ""
+        colorlinks = ""
+        backref = ""
+        pagebackref = ""
+        pagemode = ""
+        otheroptions = ""
         i = find_token(document.header, "\\use_hyperref", i)
         if i != -1:
+            hyperref = get_value(document.header, "\\use_hyperref", i) == 'true'
             del document.header[i]
         i = find_token(document.header, "\\pdf_store_options", i)
         if i != -1:
             del document.header[i]
         i = find_token(document.header, "\\pdf_title", 0)
         if i != -1:
+            title = get_value_string(document.header, '\\pdf_title', 0, 0, True)
+            title = ' pdftitle={' + title + '}'
             del document.header[i]
         i = find_token(document.header, "\\pdf_author", 0)
         if i != -1:
+            author = get_value_string(document.header, '\\pdf_author', 0, 0, True)
+            if title == "":
+                author = ' pdfauthor={' + author + '}'
+            else:
+                author = ',\n pdfauthor={' + author + '}'
             del document.header[i]
         i = find_token(document.header, "\\pdf_subject", 0)
         if i != -1:
+            subject = get_value_string(document.header, '\\pdf_subject', 0, 0, True)
+            if title == "" and author == "":
+                subject = ' pdfsubject={' + subject + '}'
+            else:
+                subject = ',\n pdfsubject={' + subject + '}'
             del document.header[i]
         i = find_token(document.header, "\\pdf_keywords", 0)
         if i != -1:
+            keywords = get_value_string(document.header, '\\pdf_keywords', 0, 0, True)
+            if title == "" and author == "" and subject == "":
+                keywords = ' pdfkeywords={' + keywords + '}'
+            else:
+                keywords = ',\n pdfkeywords={' + keywords + '}'
             del document.header[i]
         i = find_token(document.header, "\\pdf_bookmarks", 0)
         if i != -1:
+            bookmarks = get_value_string(document.header, '\\pdf_bookmarks', 0)
+            bookmarks = ',\n bookmarks=' + bookmarks
             del document.header[i]
         i = find_token(document.header, "\\pdf_bookmarksnumbered", i)
         if i != -1:
+            bookmarksnumbered = get_value_string(document.header, '\\pdf_bookmarksnumbered', 0)
+            bookmarksnumbered = ',\n bookmarksnumbered=' + bookmarksnumbered
             del document.header[i]
         i = find_token(document.header, "\\pdf_bookmarksopen", i)
         if i != -1:
+            bookmarksopen = get_value_string(document.header, '\\pdf_bookmarksopen', 0)
+            bookmarksopen = ',\n bookmarksopen=' + bookmarksopen
             del document.header[i]
         i = find_token(document.header, "\\pdf_bookmarksopenlevel", i)
         if i != -1:
+            bookmarksopenlevel = get_value_string(document.header, '\\pdf_bookmarksopenlevel', 0, 0, True)
+            bookmarksopenlevel = ',\n bookmarksopenlevel=' + bookmarksopenlevel
             del document.header[i]
         i = find_token(document.header, "\\pdf_breaklinks", i)
         if i != -1:
+            breaklinks = get_value_string(document.header, '\\pdf_breaklinks', 0)
+            breaklinks = ',\n breaklinks=' + breaklinks
             del document.header[i]
         i = find_token(document.header, "\\pdf_pdfborder", i)
         if i != -1:
+            pdfborder = get_value_string(document.header, '\\pdf_pdfborder', 0)
+            if pdfborder == 'true':
+                pdfborder = ',\n pdfborder={0 0 0}'
+            else:
+                pdfborder = ',\n pdfborder={0 0 1}'
             del document.header[i]
         i = find_token(document.header, "\\pdf_colorlinks", i)
         if i != -1:
+            colorlinks = get_value_string(document.header, '\\pdf_colorlinks', 0)
+            colorlinks = ',\n colorlinks=' + colorlinks
             del document.header[i]
         i = find_token(document.header, "\\pdf_backref", i)
         if i != -1:
+            backref = get_value_string(document.header, '\\pdf_backref', 0)
+            backref = ',\n backref=' + backref
             del document.header[i]
         i = find_token(document.header, "\\pdf_pagebackref", i)
         if i != -1:
+            pagebackref = get_value_string(document.header, '\\pdf_pagebackref', 0)
+            pagebackref = ',\n pagebackref=' + pagebackref
             del document.header[i]
         i = find_token(document.header, "\\pdf_pagemode", 0)
         if i != -1:
+            pagemode = get_value_string(document.header, '\\pdf_pagemode', 0)
+            pagemode = ',\n pdfpagemode=' + pagemode
             del document.header[i]
         i = find_token(document.header, "\\pdf_quoted_options", 0)
         if i != -1:
+            otheroptions = get_value_string(document.header, '\\pdf_quoted_options', 0, 0, True)
+            if title == "" and author == "" and subject == "" and keywords == "":
+                otheroptions = ' ' + otheroptions
+            else:
+                otheroptions = ',\n ' + otheroptions
             del document.header[i]
 
+        # write to the preamble when hyperref was used
+        if hyperref == True:
+            # preamble write preparations
+            # bookmark numbers are only output when they are turned on
+            if bookmarksopen == ',\n bookmarksopen=true':
+                bookmarksopen = bookmarksopen + bookmarksopenlevel
+            if bookmarks == ',\n bookmarks=true':
+                bookmarks = bookmarks + bookmarksnumbered + bookmarksopen
+            else:
+                bookmarks = bookmarks
+            # hypersetup is only output when there are things to be set up
+            setupstart = '\\hypersetup{%\n'
+            setupend = ' }\n'
+            if otheroptions == "" and title == "" and  author == ""\
+               and  subject == "" and keywords == "":
+                setupstart = ""
+                setupend = ""
+            # write the preamble
+            add_to_preamble(document,
+                                ['% Commands inserted by lyx2lyx for PDF properties',
+                                 '\\usepackage[unicode=true'
+                                 + bookmarks
+                                 + breaklinks
+                                 + pdfborder
+                                 + backref
+                                 + pagebackref
+                                 + colorlinks
+                                 + pagemode
+                                 + ']\n'
+                                 ' {hyperref}\n'
+                                 + setupstart
+                                 + title
+                                 + author
+                                 + subject
+                                 + keywords
+                                 + otheroptions
+                                 + setupend])
+
 
 def remove_inzip_options(document):
     "Remove inzipName and embed options from the Graphics inset"
@@ -581,7 +788,7 @@ def convert_latexcommand_index(document):
           document.body.insert(i + 4, "\\end_inset")
           i += 2
         # Generic, \\ -> \backslash:
-        g = wrap_into_ert(g, r'\\', '\\backslash{}')
+        g = wrap_into_ert(g, r'\\', '\\backslash')
         g = wrap_into_ert(g, '{', '{')
         g = wrap_into_ert(g, '}', '}')
         document.body.insert(i + 3, g)
@@ -613,6 +820,8 @@ def revert_latexcommand_index(document):
             line = line[20:]
           if line.startswith("\\begin_layout Standard"):
             line = line[22:]
+          if line.startswith("\\begin_layout Plain"):
+            line = line[22:]
           if line.startswith("\\end_layout"):
             line = line[11:]
           if line.startswith("\\end_inset"):
@@ -1173,9 +1382,9 @@ def revert_framed_notes(document):
             document.warning("Malformed LyX document: Missing `status' tag in Box inset.")
             return
         status = document.body[k]
-        l = find_token(document.body, "\\begin_layout Standard", i + 1, j)
+        l = find_default_layout(document, i + 1, j)
         if l == -1:
-            document.warning("Malformed LyX document: Missing `\\begin_layout Standard' in Box inset.")
+            document.warning("Malformed LyX document: Missing `\\begin_layout' in Box inset.")
             return
         m = find_token(document.body, "\\end_layout", i + 1, j)
         if m == -1:
@@ -1339,12 +1548,17 @@ def revert_rotfloat(document):
     " Revert sideways custom floats. "
     i = 0
     while 1:
-        i = find_token(document.body, "\\begin_inset Float", i)
+        # whitespace intended (exclude \\begin_inset FloatList)
+        i = find_token(document.body, "\\begin_inset Float ", i)
         if i == -1:
             return
         line = document.body[i]
         r = re.compile(r'\\begin_inset Float (.*)$')
         m = r.match(line)
+        if m == None:
+            document.warning("Unable to match line " + str(i) + " of body!")
+            i += 1
+            continue
         floattype = m.group(1)
         if floattype == "figure" or floattype == "table":
             i = i + 1
@@ -1355,9 +1569,9 @@ def revert_rotfloat(document):
             i = i + 1
             continue
         if get_value(document.body, 'sideways', i, j) != "false":
-            l = find_token(document.body, "\\begin_layout Standard", i + 1, j)
+            l = find_default_layout(document, i + 1, j)
             if l == -1:
-                document.warning("Malformed LyX document: Missing `\\begin_layout Standard' in Float inset.")
+                document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.")
                 return
             document.body[j] = '\\begin_layout Standard\n\\begin_inset ERT\nstatus collapsed\n\n' \
             '\\begin_layout Standard\n\n\n\\backslash\n' \
@@ -1384,12 +1598,17 @@ def revert_widesideways(document):
     " Revert wide sideways floats. "
     i = 0
     while 1:
-        i = find_token(document.body, '\\begin_inset Float', i)
+        # whitespace intended (exclude \\begin_inset FloatList)
+        i = find_token(document.body, '\\begin_inset Float ', i)
         if i == -1:
             return
         line = document.body[i]
         r = re.compile(r'\\begin_inset Float (.*)$')
         m = r.match(line)
+        if m == None:
+            document.warning("Unable to match line " + str(i) + " of body!")
+            i += 1
+            continue
         floattype = m.group(1)
         if floattype != "figure" and floattype != "table":
             i = i + 1
@@ -1401,9 +1620,9 @@ def revert_widesideways(document):
             continue
         if get_value(document.body, 'sideways', i, j) != "false":
             if get_value(document.body, 'wide', i, j) != "false":
-                l = find_token(document.body, "\\begin_layout Standard", i + 1, j)
+                l = find_default_layout(document, i + 1, j)
                 if l == -1:
-                    document.warning("Malformed LyX document: Missing `\\begin_layout Standard' in Float inset.")
+                    document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.")
                     return
                 document.body[j] = '\\begin_layout Standard\n\\begin_inset ERT\nstatus collapsed\n\n' \
                 '\\begin_layout Standard\n\n\n\\backslash\n' \
@@ -1419,6 +1638,31 @@ def revert_widesideways(document):
         i = i + 1
 
 
+def revert_inset_embedding(document, type):
+    ' Remove embed tag from certain type of insets'
+    i = 0
+    while 1:
+        i = find_token(document.body, "\\begin_inset %s" % type, i)
+        if i == -1:
+            return
+        j = find_end_of_inset(document.body, i)
+        if j == -1:
+            document.warning("Malformed lyx document: Missing '\\end_inset'.")
+            i = i + 1
+            continue
+        k = find_token(document.body, "\tembed", i, j)
+        if k == -1:
+            k = find_token(document.body, "embed", i, j)
+        if k != -1:
+            del document.body[k]
+        i = i + 1
+
+
+def revert_external_embedding(document):
+    ' Remove embed tag from external inset '
+    revert_inset_embedding(document, 'External')
+
+
 def convert_subfig(document):
     " Convert subfigures to subfloats. "
     i = 0
@@ -1441,8 +1685,8 @@ def convert_subfig(document):
         del document.body[l]
         del document.body[k]
         document.body[i] = '\\begin_inset Float figure\nwide false\nsideways false\n' \
-        'status open\n\n\\begin_layout PlainLayout\n\\begin_inset Caption\n\n\\begin_layout PlainLayout\n' \
-        + caption + '\n\\end_layout\n\n\\end_inset\n\n\\end_layout\n\n\\begin_layout PlainLayout\n' + savestr
+        'status open\n\n\\begin_layout Plain Layout\n\\begin_inset Caption\n\n\\begin_layout Plain Layout\n' \
+        + caption + '\n\\end_layout\n\n\\end_inset\n\n\\end_layout\n\n\\begin_layout Plain Layout\n' + savestr
         savestr = document.body[j]
         document.body[j] = '\n\\end_layout\n\n\\end_inset\n' + savestr
 
@@ -1451,7 +1695,8 @@ def revert_subfig(document):
     " Revert subfloats. "
     i = 0
     while 1:
-        i = find_token(document.body, '\\begin_inset Float', i)
+        # whitespace intended (exclude \\begin_inset FloatList)
+        i = find_token(document.body, '\\begin_inset Float ', i)
         if i == -1:
             return
         while 1:
@@ -1461,7 +1706,8 @@ def revert_subfig(document):
                 i = i + 1
                 continue
             # look for embedded float (= subfloat)
-            k = find_token(document.body, '\\begin_inset Float', i + 1, j)
+            # whitespace intended (exclude \\begin_inset FloatList)
+            k = find_token(document.body, '\\begin_inset Float ', i + 1, j)
             if k == -1:
                 break
             l = find_end_of_inset(document.body, k)
@@ -1469,7 +1715,7 @@ def revert_subfig(document):
                 document.warning("Malformed lyx document: Missing '\\end_inset' (embedded float).")
                 i = i + 1
                 continue
-            m = find_token(document.body, "\\begin_layout PlainLayout", k + 1, l)
+            m = find_default_layout(document, k + 1, l)
             # caption?
             cap = find_token(document.body, '\\begin_inset Caption', k + 1, l)
             caption = ''
@@ -1502,9 +1748,9 @@ def revert_subfig(document):
                     if optend == -1:
                         document.warning("Malformed lyx document: Missing '\\end_inset' (OptArg).")
                         return
-                    optc = find_token(document.body, "\\begin_layout PlainLayout", opt, optend)
+                    optc = find_default_layout(document, opt, optend)
                     if optc == -1:
-                        document.warning("Malformed LyX document: Missing `\\begin_layout PlainLayout' in Float inset.")
+                        document.warning("Malformed LyX document: Missing `\\begin_layout' in Float inset.")
                         return
                     optcend = find_end_of(document.body, optc, "\\begin_layout", "\\end_layout")
                     for line in document.body[optc:optcend]:
@@ -1522,12 +1768,12 @@ def revert_subfig(document):
                         caption += line.strip()
                 if len(label) > 0:
                     caption += "\\backslash\nlabel{" + label + "}"
-            document.body[l] = '\\begin_layout PlainLayout\n\\begin_inset ERT\nstatus collapsed\n\n' \
-            '\\begin_layout PlainLayout\n\n}\n\\end_layout\n\n\\end_inset\n\n\\end_layout\n\n\\begin_layout PlainLayout\n'
+            document.body[l] = '\\begin_layout Plain Layout\n\\begin_inset ERT\nstatus collapsed\n\n' \
+            '\\begin_layout Plain Layout\n\n}\n\\end_layout\n\n\\end_inset\n\n\\end_layout\n\n\\begin_layout Plain Layout\n'
             del document.body[cap:capend+1]
             del document.body[k+1:m-1]
             insertion = '\\begin_inset ERT\nstatus collapsed\n\n' \
-            '\\begin_layout PlainLayout\n\n\\backslash\n' \
+            '\\begin_layout Plain Layout\n\n\\backslash\n' \
             'subfloat'
             if len(shortcap) > 0:
                 insertion = insertion + "[" + shortcap + "]"
@@ -1562,7 +1808,6 @@ def remove_extra_embedded_files(document):
     " Remove \extra_embedded_files from buffer params "
     i = find_token(document.header, '\\extra_embedded_files', 0)
     if i == -1:
-        document.warning("Malformed lyx document: Missing '\\extra_embedded_files'.")
         return
     document.header.pop(i)
 
@@ -1654,6 +1899,78 @@ def revert_protected_hfill(document):
         'hspace*{\n\\backslash\nfill}\n\\end_layout\n\n\\end_inset\n\n')
 
 
+def revert_leftarrowfill(document):
+    ' Revert \\begin_inset Space \\leftarrowfill{} to ERT '
+    i = 0
+    while True:
+        i = find_token(document.body, '\\begin_inset Space \\leftarrowfill{}', i)
+        if i == -1:
+            return
+        j = find_end_of_inset(document.body, i)
+        if j == -1:
+            document.warning("Malformed LyX document: Could not find end of space inset.")
+            continue
+        del document.body[j]
+        document.body[i] = document.body[i].replace('\\begin_inset Space \\leftarrowfill{}', \
+        '\\begin_inset ERT\nstatus collapsed\n\n' \
+        '\\begin_layout Standard\n\n\n\\backslash\n' \
+        'leftarrowfill{}\n\\end_layout\n\n\\end_inset\n\n')
+
+
+def revert_rightarrowfill(document):
+    ' Revert \\begin_inset Space \\rightarrowfill{} to ERT '
+    i = 0
+    while True:
+        i = find_token(document.body, '\\begin_inset Space \\rightarrowfill{}', i)
+        if i == -1:
+            return
+        j = find_end_of_inset(document.body, i)
+        if j == -1:
+            document.warning("Malformed LyX document: Could not find end of space inset.")
+            continue
+        del document.body[j]
+        document.body[i] = document.body[i].replace('\\begin_inset Space \\rightarrowfill{}', \
+        '\\begin_inset ERT\nstatus collapsed\n\n' \
+        '\\begin_layout Standard\n\n\n\\backslash\n' \
+        'rightarrowfill{}\n\\end_layout\n\n\\end_inset\n\n')
+
+
+def revert_upbracefill(document):
+    ' Revert \\begin_inset Space \\upbracefill{} to ERT '
+    i = 0
+    while True:
+        i = find_token(document.body, '\\begin_inset Space \\upbracefill{}', i)
+        if i == -1:
+            return
+        j = find_end_of_inset(document.body, i)
+        if j == -1:
+            document.warning("Malformed LyX document: Could not find end of space inset.")
+            continue
+        del document.body[j]
+        document.body[i] = document.body[i].replace('\\begin_inset Space \\upbracefill{}', \
+        '\\begin_inset ERT\nstatus collapsed\n\n' \
+        '\\begin_layout Standard\n\n\n\\backslash\n' \
+        'upbracefill{}\n\\end_layout\n\n\\end_inset\n\n')
+
+
+def revert_downbracefill(document):
+    ' Revert \\begin_inset Space \\downbracefill{} to ERT '
+    i = 0
+    while True:
+        i = find_token(document.body, '\\begin_inset Space \\downbracefill{}', i)
+        if i == -1:
+            return
+        j = find_end_of_inset(document.body, i)
+        if j == -1:
+            document.warning("Malformed LyX document: Could not find end of space inset.")
+            continue
+        del document.body[j]
+        document.body[i] = document.body[i].replace('\\begin_inset Space \\downbracefill{}', \
+        '\\begin_inset ERT\nstatus collapsed\n\n' \
+        '\\begin_layout Standard\n\n\n\\backslash\n' \
+        'downbracefill{}\n\\end_layout\n\n\\end_inset\n\n')
+
+
 def revert_local_layout(document):
     ' Revert local layout headers.'
     i = 0
@@ -1839,6 +2156,82 @@ def revert_pdfpages(document):
         i = i + 1
 
 
+def revert_mexican(document):
+    ' Set language Spanish(Mexico) to Spanish '
+    i = 0
+    if document.language == "spanish-mexico":
+        document.language = "spanish"
+        i = find_token(document.header, "\\language", 0)
+        if i != -1:
+            document.header[i] = "\\language spanish"
+    j = 0
+    while True:
+        j = find_token(document.body, "\\lang spanish-mexico", j)
+        if j == -1:
+            return
+        document.body[j] = document.body[j].replace("\\lang spanish-mexico", "\\lang spanish")
+        j = j + 1
+
+
+def remove_embedding(document):
+    ' Remove embed tag from all insets '
+    revert_inset_embedding(document, 'Graphics')
+    revert_inset_embedding(document, 'External')
+    revert_inset_embedding(document, 'CommandInset include')
+    revert_inset_embedding(document, 'CommandInset bibtex')
+
+
+def revert_master(document):
+    ' Remove master param '
+    i = find_token(document.header, "\\master", 0)
+    if i != -1:
+        del document.header[i]
+
+
+def revert_graphics_group(document):
+    ' Revert group information from graphics insets '
+    i = 0
+    while 1:
+        i = find_token(document.body, "\\begin_inset Graphics", i)
+        if i == -1:
+            return
+        j = find_end_of_inset(document.body, i)
+        if j == -1:
+            document.warning("Malformed lyx document: Missing '\\end_inset'.")
+            i = i + 1
+            continue
+        k = find_token(document.body, "        groupId", i, j)
+        if k == -1:
+            i = i + 1
+            continue
+        del document.body[k]
+        i = i + 1
+
+
+def update_apa_styles(document):
+    ' Replace obsolete styles'
+
+    if document.textclass != "apa":
+        return
+
+    obsoletedby = { "Acknowledgments": "Acknowledgements",
+                    "Section*":        "Section",
+                    "Subsection*":     "Subsection",
+                    "Subsubsection*":  "Subsubsection",
+                    "Paragraph*":      "Paragraph",
+                    "Subparagraph*":   "Subparagraph"}
+    i = 0
+    while 1:
+        i = find_token(document.body, "\\begin_layout", i)
+        if i == -1:
+            return
+
+        layout = document.body[i][14:]
+        if layout in obsoletedby:
+            document.body[i] = "\\begin_layout " + obsoletedby[layout]
+
+        i += 1
+
 ##
 # Conversion hub
 #
@@ -1893,10 +2286,24 @@ convert = [[277, [fix_wrong_tables]],
            [323, [convert_pagebreaks]],
            [324, [convert_linebreaks]],
            [325, [convert_japanese_plain]],
-           [326, []]
+           [326, []],
+           [327, []],
+           [328, [remove_embedding, remove_extra_embedded_files, remove_inzip_options]],
+           [329, []],
+           [330, []],
+           [331, [convert_ltcaption]],
+           [332, []],
+           [333, [update_apa_styles]],
           ]
 
-revert =  [[325, [revert_pdfpages]],
+revert =  [[332, []],
+           [331, [revert_graphics_group]],
+           [330, [revert_ltcaption]],
+           [329, [revert_leftarrowfill, revert_rightarrowfill, revert_upbracefill, revert_downbracefill]],
+           [328, [revert_master]],
+           [327, []],
+           [326, [revert_mexican]],
+           [325, [revert_pdfpages]],
            [324, []],
            [323, [revert_linebreaks]],
            [322, [revert_pagebreaks]],
@@ -1911,7 +2318,7 @@ revert =  [[325, [revert_pdfpages]],
            [313, []],
            [312, [revert_module_names]],
            [311, [revert_rotfloat, revert_widesideways]],
-           [310, []],
+           [310, [revert_external_embedding]],
            [309, [revert_btprintall]],
            [308, [revert_nocite]],
            [307, [revert_serbianlatin]],