anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-19 05:53:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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/branches/BRANCH_1_6_X@28623 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-02-26 19:43:01 +00:00
parent 62c2a30a07
commit 10dfb843e5
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BufferParams.cpp
View File

@ -565,7 +565,7 @@ string BufferParams::readToken(Lexer & lex, string const & token,
} else if (token == "\\output_changes") { } else if (token == "\\output_changes") {
lex >> outputChanges; lex >> outputChanges;
} else if (token == "\\branch") { } else if (token == "\\branch") {
lex.next(); lex.eatLine();
docstring branch = lex.getDocString(); docstring branch = lex.getDocString();
branchlist().add(branch); branchlist().add(branch);
while (true) { while (true) {

3
src/insets/InsetBranch.cpp
View File

@ -297,7 +297,8 @@ void InsetBranchParams::write(ostream & os) const
void InsetBranchParams::read(Lexer & lex) void InsetBranchParams::read(Lexer & lex)
{ {
lex >> branch; lex.eatLine();
branch = lex.getDocString();
} }
} // namespace lyx } // namespace lyx

2
status.16x
View File

@ -302,6 +302,8 @@ What's new
- It is no longer possible to accidentally insert a caption to a table - It is no longer possible to accidentally insert a caption to a table
that is not a longtable (part of bug 5777). that is not a longtable (part of bug 5777).
- It is now possible to include spaces in the name of a branch (bug 5806).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION