anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle branches with space in their name

Browse Source 
1/ Handle space in color name in set-color (with quoting)

2/ read properly branch inset when name has a space

Fixes bug #11108.
This commit is contained in:
Jean-Marc Lasgouttes 2018-09-07 15:49:21 +02:00
parent 1116335977
commit 819cf53c22
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiApplication.cpp
View File

@ -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(

5
src/insets/InsetBranch.cpp
View File

@ -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;
}