[LyX/master] Handle branches with space in their name

[Jean-Marc Lasgouttes]

commit 819cf53c2254f17e9bb6c6b971904451cfaaae6d
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Fri Sep 7 15:49:21 2018 +0200

    Handle branches with space in their name
    
    1/ Handle space in color name in set-color (with quoting)
    
    2/ read properly branch inset when name has a space
    
    Fixes bug #11108.
---
 src/frontends/qt4/GuiApplication.cpp |    4 ++--
 src/insets/InsetBranch.cpp           |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt4/GuiApplication.cpp 
b/src/frontends/qt4/GuiApplication.cpp
index d4b1701..cbea58a 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1738,8 +1738,8 @@ void GuiApplication::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
        }
 
        case LFUN_SET_COLOR: {
-               string lyx_name;
-               string const x11_name = split(to_utf8(cmd.argument()), 
lyx_name, ' ');
+               string const lyx_name = cmd.getArg(0);
+               string const x11_name = cmd.getArg(1);
                if (lyx_name.empty() || x11_name.empty()) {
                        if (current_view_)
                                current_view_->message(
diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index a214820..d30e348 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -402,7 +402,10 @@ void InsetBranchParams::write(ostream & os) const
 
 void InsetBranchParams::read(Lexer & lex)
 {
-       lex >> branch;
+       // There may be a space in branch name
+       // if we wanted to use lex>>, the branch name should be properly in 
quotes
+       lex.eatLine();
+       branch = lex.getDocString();
        lex >> "inverted" >> inverted;
 }