anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #7895: Do not output lines with only a single space.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40194 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2011-11-14 21:04:00 +00:00
parent 044565f535
commit b6eb513d94
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tex2lyx/text.cpp
View File

@ -1161,6 +1161,8 @@ void parse_environment(Parser & p, ostream & os, bool outer,
} }
else if (parent_context.textclass.floats().typeExist(unstarred_name)) { else if (parent_context.textclass.floats().typeExist(unstarred_name)) {
eat_whitespace(p, os, parent_context, false);
string const opt = p.hasOpt() ? p.getArg('[', ']') : string();
eat_whitespace(p, os, parent_context, false); eat_whitespace(p, os, parent_context, false);
parent_context.check_layout(os); parent_context.check_layout(os);
begin_inset(os, "Float " + unstarred_name + "\n"); begin_inset(os, "Float " + unstarred_name + "\n");
@ -1172,8 +1174,8 @@ void parse_environment(Parser & p, ostream & os, bool outer,
float_type = unstarred_name; float_type = unstarred_name;
else else
float_type = ""; float_type = "";
if (p.hasOpt()) if (!opt.empty())
os << "placement " << p.getArg('[', ']') << '\n'; os << "placement " << opt << '\n';
os << "wide " << convert<string>(is_starred) os << "wide " << convert<string>(is_starred)
<< "\nsideways false" << "\nsideways false"
<< "\nstatus open\n\n"; << "\nstatus open\n\n";

3
status.20x
View File

@ -170,6 +170,9 @@ What's new
- Fix tex2lyx handling of description \item with spaces (bug 7663). - Fix tex2lyx handling of description \item with spaces (bug 7663).
- tex2lyx does not start floats with lines containing only a single space
anymore (bug 7895).
- Store the autosave files of unnamed buffers in the correct directory - Store the autosave files of unnamed buffers in the correct directory
and make sure they are not left behind after saving (bug 7793). and make sure they are not left behind after saving (bug 7793).