anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +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 which name has a space

Fixes bug #11108.

(cherry picked from commit 819cf53c22)
This commit is contained in:
Jean-Marc Lasgouttes 2018-09-07 15:49:21 +02:00
parent b5892e58f0
commit b956265be3
3 changed files with 8 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

@ -1724,8 +1724,8 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
} }
case LFUN_SET_COLOR: { case LFUN_SET_COLOR: {
string lyx_name; string const lyx_name = cmd.getArg(0);
string const x11_name = split(to_utf8(cmd.argument()), lyx_name, ' '); string const x11_name = cmd.getArg(1);
if (lyx_name.empty() || x11_name.empty()) { if (lyx_name.empty() || x11_name.empty()) {
if (current_view_) if (current_view_)
current_view_->message( current_view_->message(

5
src/insets/InsetBranch.cpp
View File

@ -403,7 +403,10 @@ void InsetBranchParams::write(ostream & os) const
void InsetBranchParams::read(Lexer & lex) 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; lex >> "inverted" >> inverted;
} }

2
status.23x
View File

@ -59,6 +59,8 @@ What's new
- When using formal tables, draw top/bottom rules thicker when adequate. - When using formal tables, draw top/bottom rules thicker when adequate.
- Handle properly branches with a space in their name (bug 11108).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION