commit d11d44026e62407cd751823f3bda6cfad9a35784
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Mon Feb 19 18:03:52 2018 +0100
Fix convert_separator routine with ancient LyX files.
---
lib/lyx2lyx/lyx_2_2.py | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index ced6482..96b456a 100644
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -186,6 +186,13 @@ def convert_separator(document):
j = find_token_backwards(document.body, "\\end_layout", i-1)
if j != -1:
+ # Very old LyX files do not have Plain Layout in insets (but
Standard).
+ # So we additionally check here if there is no inset boundary
+ # between the previous layout and this one.
+ n = find_token(document.body, "\\end_inset", j, lay[1])
+ if n != -1:
+ i = i + 1
+ continue
lay = get_containing_layout(document.body, j-1)
if lay != False and lay[0] == "Standard" \
and find_token(document.body, "\\align", lay[1], lay[2]) == -1 \
