Fix revert btprint lyx2lyx.

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

diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index da391efb15a2b7c78e920ca71fe2a14890b85edd..dc12990c563acdca2e27c422d03f5125055f9ed5 100644 (file)
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -1457,22 +1457,19 @@ def revert_nobreakdash(document):
         r = re.compile(r'\\SpecialChar \\nobreakdash-')
         m = r.match(line)
         if m:
-            found = 1
-        subst = ['\\begin_inset ERT',
-                 'status collapsed', '',
-                 '\\begin_layout Standard', '', '',
-                 '\\backslash',
-                 'nobreakdash-',
-                 '\\end_layout', '',
-                 '\\end_inset', '']
-        document.body[i:i+1] = subst
-    if not found:
-        return
-    j = find_token(document.header, "\\use_amsmath", 0)
-    if j == -1:
-        document.warning("Malformed LyX document: Missing '\\use_amsmath'.")
-        return
-    document.header[j] = "\\use_amsmath 2"
+            subst = ['\\begin_inset ERT',
+                    'status collapsed', '',
+                    '\\begin_layout Standard', '', '',
+                    '\\backslash',
+                    'nobreakdash-',
+                    '\\end_layout', '',
+                    '\\end_inset', '']
+            document.body[i:i+1] = subst
+            j = find_token(document.header, "\\use_amsmath", 0)
+            if j == -1:
+                document.warning("Malformed LyX document: Missing '\\use_amsmath'.")
+                return
+            document.header[j] = "\\use_amsmath 2"
 
 
 def revert_nocite_key(body, start, end):
@@ -1502,9 +1499,8 @@ def revert_nocite(document):
                 return
             revert_nocite_key(document.body, i + 1, j)
             document.body[i-1] = "\\begin_inset ERT"
-            document.body[i] = "status collapsed\n\n" \
-            "\\begin_layout Standard"
-            document.body.insert(j, "\\end_layout\n");
+            document.body[i:i+1] = ["status collapsed", "", "\\begin_layout Standard"]
+            document.body[j+1:j+1] = ["\\end_layout", ""]
             i = j
 
 
@@ -1528,10 +1524,14 @@ def revert_btprintall(document):
             for k in range(i, j):
                 if (document.body[k] == 'btprint "btPrintAll"'):
                     del document.body[k]
-                    document.body.insert(i, "\\begin_inset ERT\n" \
-                    "status collapsed\n\n\\begin_layout Standard\n\n" \
-                    "\\backslash\nnocite{*}\n" \
-                    "\\end_layout\n\\end_inset\n")
+                    subst = ["\\begin_inset ERT",
+                             "status collapsed", "",
+                             "\\begin_layout Standard", "",
+                             "\\backslash",
+                             "nocite{*}",
+                             "\\end_layout",
+                             "\\end_inset"]
+                    document.body[i:i] = subst
             i = j