From da273a944f4b720b1da5fd737ededc2f2129e9bc Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 29 Dec 2018 13:36:39 +0100 Subject: [PATCH] Fix some parsing glitches in Autonest and IsAutonestedBy Layouts can have spaces, underlines (that must be read as spaces, and be enquoted) Candidate for stable --- src/Layout.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Layout.cpp b/src/Layout.cpp index 4f3dc14268..a109c1d931 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -605,25 +605,25 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass) } case LT_AUTONESTS: { - docstring const autonest = - subst(subst(subst(lex.getLongString(from_ascii("EndAutoNests")), - from_ascii("\n"), docstring()), - from_ascii(" "), docstring()), - from_ascii("\t"), docstring()); + docstring autonest = lex.getLongString(from_ascii("EndAutoNests")); + autonest = subst(autonest, from_ascii("\n"), docstring()); + autonest = subst(autonest, from_ascii("\t"), docstring()); + autonest = subst(autonest, from_ascii("\""), docstring()); + autonest = subst(autonest, '_', ' '); vector const autonests = - getVectorFromString(autonest); + getVectorFromString(autonest, from_ascii(","), false, true); autonests_.insert(autonests.begin(), autonests.end()); break; } case LT_AUTONESTEDBY: { - docstring const autonest = - subst(subst(subst(lex.getLongString(from_ascii("EndIsAutoNestedBy")), - from_ascii("\n"), docstring()), - from_ascii(" "), docstring()), - from_ascii("\t"), docstring()); + docstring autonest = lex.getLongString(from_ascii("EndIsAutoNestedBy")); + autonest = subst(autonest, from_ascii("\n"), docstring()); + autonest = subst(autonest, from_ascii("\t"), docstring()); + autonest = subst(autonest, from_ascii("\""), docstring()); + autonest = subst(autonest, '_', ' '); vector const autonests = - getVectorFromString(autonest); + getVectorFromString(autonest, from_ascii(","), false, true); autonested_by_.insert(autonests.begin(), autonests.end()); break; } -- 2.39.2