commit 50a77ab2d1fc917e024dffda38f37f9fab85d33e
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Sat Nov 29 10:54:05 2014 +0100
Fix and simplify par params parsing in get_containing_layout.
The previous verion did not catch \align <alignment>.
Richard, this should go to branch as well.
diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index 9707f7a..f1be0f0 100644
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -470,13 +470,12 @@ def get_containing_layout(lines, i):
# shouldn't happen
return False
par_params = ["\\noindent", "\\indent", "\\indent-toggle", "\\leftindent",
- "\\start_of_appendix", "\\paragraph_spacing single",
- "\\paragraph_spacing onehalf", "\\paragraph_spacing double",
- "\\paragraph_spacing other", "\\align", "\\labelwidthstring"]
+ "\\start_of_appendix", "\\paragraph_spacing", "\\align",
+ "\\labelwidthstring"]
stpar = stlay
while True:
stpar += 1
- if lines[stpar] not in par_params:
+ if lines[stpar].split(' ', 1)[0] not in par_params:
break
return (lay, stlay, endlay, stpar)
