Get lots of nice icons from the desktop theme

[lyx.git] / lib / lyx2lyx / lyx_1_4.py

diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 05a0102ac7dbdc18e43a0e6555f6295f1995781e..cc83bd3a9d4e7cdc2e4be8ca627121bc8e57adaf 100644 (file)
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -1557,7 +1557,7 @@ def convert_frameless_box(file):
             ert = ert + '\\let\\endminipage\\endlyxtolyxminipage%\n'
 
             old_i = i
-            i = insert_ert(file.body, i, 'Collapsed', ert, file.format + 1)
+            i = insert_ert(file.body, i, 'Collapsed', ert, file.format - 1)
             j = j + i - old_i - 1
 
             file.body[i:i] = ['\\begin_inset Minipage',
@@ -1578,7 +1578,7 @@ def convert_frameless_box(file):
             ert = '\\let\\minipage\\lyxtolyxrealminipage%\n'
             ert = ert + '\\let\\endminipage\\lyxtolyxrealendminipage%'
             old_i = i
-            i = insert_ert(file.body, i, 'Collapsed', ert, file.format + 1)
+            i = insert_ert(file.body, i, 'Collapsed', ert, file.format - 1)
             j = j + i - old_i - 1
 
             # Redefine the minipage end before the inset end.
@@ -1586,7 +1586,7 @@ def convert_frameless_box(file):
             file.body[j:j] = ['\\layout Standard', '', '']
             j = j + 2
             ert = '\\let\\endminipage\\endlyxtolyxminipage'
-            j = insert_ert(file.body, j, 'Collapsed', ert, file.format + 1)
+            j = insert_ert(file.body, j, 'Collapsed', ert, file.format - 1)
            j = j + 1
             file.body.insert(j, '')
            j = j + 1
@@ -1597,7 +1597,7 @@ def convert_frameless_box(file):
                 ert = '}%\n'
             else:
                 ert = '\\end{lyxtolyxrealminipage}%\n'
-            j = insert_ert(file.body, j, 'Collapsed', ert, file.format + 1)
+            j = insert_ert(file.body, j, 'Collapsed', ert, file.format - 1)
 
             # We don't need to restore the original minipage after the inset
             # end because the scope of the redefinition is the original box.
@@ -1613,6 +1613,51 @@ def convert_frameless_box(file):
                              'collapsed ' + params['collapsed']]
            i = i + 6
 
+
+def remove_branches(file):
+    i = 0
+    while 1:
+        i = find_token(file.header, "\\branch", i)
+        if i == -1:
+            break
+        file.warning("Removing branch %s." % split(file.header[i])[1])
+        j = find_token(file.header, "\\end_branch", i)
+        if j == -1:
+            file.warning("Malformed LyX file: Missing '\\end_branch'.")
+            break
+        del file.header[i:j+1]
+
+    i = 0
+    while 1:
+        i = find_token(file.body, "\\begin_inset Branch", i)
+        if i == -1:
+            return
+        j = find_end_of_inset(file.body, i)
+        if j == -1:
+            file.warning("Malformed LyX file: Missing '\\end_inset'.")
+            i = i + 1
+            continue
+        del file.body[i]
+        del file.body[j - 1]
+        # Seach for a line starting 'collapsed'
+        # If, however, we find a line starting '\layout'
+        # (_always_ present) then break with a warning message
+        collapsed_found = 0
+        while 1:
+            if (file.body[i][:9] == "collapsed"):
+                del file.body[i]
+                collapsed_found = 1
+                continue
+            elif (file.body[i][:7] == "\\layout"):
+                if collapsed_found == 0:
+                    file.warning("Malformed LyX file: Missing 'collapsed'.")
+                # Delete this new paragraph, since it would not appear in
+                # .tex output. This avoids also empty paragraphs.
+                del file.body[i]
+                break
+            i = i + 1
+
+
 ##
 # Convert jurabib
 #
@@ -2258,6 +2303,13 @@ def remove_paperpackage(file):
         file.header[i] = "\\papersize default"
 
 
+def remove_quotestimes(file):
+    i = find_token(file.header, '\\quotes_times', 0)
+    if i == -1:
+        return
+    del file.header[i]
+
+
 ##
 # Convertion hub
 #
@@ -2286,9 +2338,11 @@ convert = [[222, [insert_tracking_changes, add_end_header]],
            [241, [convert_ert_paragraphs]],
            [242, [convert_french]],
            [243, [remove_paperpackage]],
-          [244, [rename_spaces]]]
+          [244, [rename_spaces]],
+          [245, [remove_quotestimes]]]
 
-revert =  [[243, [revert_space_names]],
+revert =  [[244, []],
+          [243, [revert_space_names]],
           [242, []],
            [241, []],
            [240, [revert_ert_paragraphs]],
@@ -2309,7 +2363,8 @@ revert =  [[243, [revert_space_names]],
            [226, [revert_box, revert_external_2]],
            [225, [revert_note]],
            [224, [rm_end_layout, begin_layout2layout, revert_end_document,
-                  revert_valignment_middle, revert_breaks, convert_frameless_box]],
+                  revert_valignment_middle, revert_breaks, convert_frameless_box,
+                  remove_branches]],
            [223, [revert_external_2, revert_comment, revert_eqref]],
            [222, [revert_spaces, revert_bibtex]],
            [221, [rm_end_header, rm_tracking_changes, rm_body_changes]]]