Fix bug 5806: http://bugzilla.lyx.org/show_bug.cgi?id=5806.

Branch names with spaces impossible

Read the whole line to catch the whole branch name.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28620 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 280db235fd9eaf057f17b96adab1991365d013ac..f04c964b16b9614323a2c34b0971291d6be18127 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -566,7 +566,7 @@ string BufferParams::readToken(Lexer & lex, string const & token,
        } else if (token == "\\output_changes") {
                lex >> outputChanges;
        } else if (token == "\\branch") {
-               lex.next();
+               lex.eatLine();
                docstring branch = lex.getDocString();
                branchlist().add(branch);
                while (true) {

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 80bfbf41315ffc3762a83db830d2be61a63f2f4e..68dfe19385cc6360223722f1ff5eeb1bda6dd296 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -298,7 +298,8 @@ void InsetBranchParams::write(ostream & os) const
 
 void InsetBranchParams::read(Lexer & lex)
 {
-       lex >> branch;
+       lex.eatLine();
+       branch = lex.getDocString();
 }
 
 } // namespace lyx