[LyX/master] Revert "Try to be more pedantic wrt blank lines in lyx2lyx output"

Juergen Spitzmueller spitz at lyx.org
Sun Nov 6 15:24:27 UTC 2022


commit 069122feba922dc53f2114522eee206809e44971
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Sun Nov 6 17:17:33 2022 +0100

    Revert "Try to be more pedantic wrt blank lines in lyx2lyx output"
    
    This reverts commit 9ce0ff50c1a96b276fa1a74f358718bf571f3dfb.
---
 lib/lyx2lyx/lyx_2_4.py |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 0c30e6f..73826a5 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -4513,7 +4513,7 @@ def revert_index_macros(document):
                                 # everything before ................... or after
                                 xxicont = document.body[iimpl+1:xiim] + document.body[xiime+1:iimple]
                                 # construct the latex sequence
-                                icont = [''] + xicont + put_cmd_in_ert("@") + [''] + xxicont[1:]
+                                icont = xicont + put_cmd_in_ert("@") + xxicont[1:]
                 if len(subentry) > 0:
                     subentry2 = icont[1:]
                 else:
@@ -4537,19 +4537,15 @@ def revert_index_macros(document):
             document.warning("Malformed LyX document: Can't find end of index macro inset plain layout at line %d" % i)
             continue
         if len(see) > 0:
-            document.body[ple-2:ple] = put_cmd_in_ert("|" + pagerange + "see{") + [''] + see + put_cmd_in_ert("}") + ['','']
-            ple -= 2
+            document.body[ple:ple] = put_cmd_in_ert("|" + pagerange + "see{") + see + put_cmd_in_ert("}")
         elif len(seealso) > 0:
-            document.body[ple-2:ple] = put_cmd_in_ert("|" + pagerange + "seealso{") + [''] + seealso + put_cmd_in_ert("}") + ['','']
-            ple -= 2
+            document.body[ple:ple] = put_cmd_in_ert("|" + pagerange + "seealso{") + seealso + put_cmd_in_ert("}")
         elif pageformat != "default":
-            document.body[ple-2:ple] = put_cmd_in_ert("|" + pagerange + pageformat)
+            document.body[ple:ple] = put_cmd_in_ert("|" + pagerange + pageformat)
         if len(subentry2) > 0:
-            document.body[ple-2:ple] = put_cmd_in_ert("!") + [''] + subentry2
-            ple -= 2
+            document.body[ple:ple] = put_cmd_in_ert("!") + subentry2
         if len(subentry) > 0:
-            document.body[ple-2:ple] = put_cmd_in_ert("!") + [''] + subentry
-            ple -= 2
+            document.body[ple:ple] = put_cmd_in_ert("!") + subentry
         if len(sortkey) > 0:
             document.body[pl:pl+1] = document.body[pl:pl] + sortkey + put_cmd_in_ert("@")
             


More information about the lyx-cvs mailing list