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

fix bug 1776

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9605 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-02-08 17:15:17 +00:00
parent d03113557b
commit d436597a44
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/ChangeLog
View File

@ -1,3 +1,8 @@
2005-02-08 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* insetgraphics.C (latex): Remove line continuation '%\n' (bug xxx,
workaround for broken HTML converter)
2005-02-08 Lars Gullik Bjonnes <larsbj@gullik.net> 2005-02-08 Lars Gullik Bjonnes <larsbj@gullik.net>
* insetcollapsable.C (leaveInset): size() -> depth() * insetcollapsable.C (leaveInset): size() -> depth()

31
src/insets/insetgraphics.C
View File

@ -294,48 +294,47 @@ string const InsetGraphics::createLatexOptions() const
// before writing it to the output stream. // before writing it to the output stream.
ostringstream options; ostringstream options;
if (!params().bb.empty()) if (!params().bb.empty())
options << " bb=" << rtrim(params().bb) << ",\n"; options << "bb=" << rtrim(params().bb) << ',';
if (params().draft) if (params().draft)
options << " draft,\n"; options << "draft,";
if (params().clip) if (params().clip)
options << " clip,\n"; options << "clip,";
double const scl = convert<double>(params().scale); double const scl = convert<double>(params().scale);
if (!params().scale.empty() && !float_equal(scl, 0.0, 0.05)) { if (!params().scale.empty() && !float_equal(scl, 0.0, 0.05)) {
if (!float_equal(scl, 100.0, 0.05)) if (!float_equal(scl, 100.0, 0.05))
options << " scale=" << scl / 100.0 options << "scale=" << scl / 100.0 << ',';
<< ",\n";
} else { } else {
if (!params().width.zero()) if (!params().width.zero())
options << " width=" << params().width.asLatexString() << ",\n"; options << "width=" << params().width.asLatexString() << ',';
if (!params().height.zero()) if (!params().height.zero())
options << " height=" << params().height.asLatexString() << ",\n"; options << "height=" << params().height.asLatexString() << ',';
if (params().keepAspectRatio) if (params().keepAspectRatio)
options << " keepaspectratio,\n"; options << "keepaspectratio,";
} }
// Make sure rotation angle is not very close to zero; // Make sure rotation angle is not very close to zero;
// a float can be effectively zero but not exactly zero. // a float can be effectively zero but not exactly zero.
if (!params().rotateAngle.empty() if (!params().rotateAngle.empty()
&& !float_equal(convert<double>(params().rotateAngle), 0.0, 0.001)) { && !float_equal(convert<double>(params().rotateAngle), 0.0, 0.001)) {
options << " angle=" << params().rotateAngle << ",\n"; options << "angle=" << params().rotateAngle << ',';
if (!params().rotateOrigin.empty()) { if (!params().rotateOrigin.empty()) {
options << " origin=" << params().rotateOrigin[0]; options << "origin=" << params().rotateOrigin[0];
if (contains(params().rotateOrigin,"Top")) if (contains(params().rotateOrigin,"Top"))
options << 't'; options << 't';
else if (contains(params().rotateOrigin,"Bottom")) else if (contains(params().rotateOrigin,"Bottom"))
options << 'b'; options << 'b';
else if (contains(params().rotateOrigin,"Baseline")) else if (contains(params().rotateOrigin,"Baseline"))
options << 'B'; options << 'B';
options << ",\n"; options << ',';
} }
} }
if (!params().special.empty()) if (!params().special.empty())
options << params().special << ",\n"; options << params().special << ',';
string opts = options.str(); string opts = options.str();
// delete last ",\n" // delete last ','
return opts.substr(0, opts.size() - 2); return opts.substr(0, opts.size() - 1);
} }
@ -722,9 +721,9 @@ int InsetGraphics::latex(Buffer const & buf, ostream & os,
lyxerr[Debug::GRAPHICS] << "\tOpts = " << opts << endl; lyxerr[Debug::GRAPHICS] << "\tOpts = " << opts << endl;
if (!opts.empty() && !message.empty()) if (!opts.empty() && !message.empty())
before += ("[%\n" + opts + ',' + message + ']'); before += ('[' + opts + ',' + message + ']');
else if (!opts.empty() || !message.empty()) else if (!opts.empty() || !message.empty())
before += ("[%\n" + opts + message + ']'); before += ('[' + opts + message + ']');
lyxerr[Debug::GRAPHICS] lyxerr[Debug::GRAPHICS]
<< "\tBefore = " << before << "\tBefore = " << before