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

Fix PDF output of clipped graphics with recent graphics package

Browse Source 
The previous redirection of the senseless option "bb" to "viewport" in
PDFLaTeX output has been removed in a recent graphics package update.

This breaks documents, since clipped graphics silently stop displaying.

This change restores the previous output by using "viewport" instaed of
"bb" for non-PS/DVI output, while leaving PS/DVI untouched (where "bb"
and "viewport" behave differently.

Fixes: #7910
This commit is contained in:
Juergen Spitzmueller 2017-10-12 15:38:59 +02:00
parent 10002fe436
commit cd626c2411
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/insets/InsetGraphics.cpp
View File

@ -304,17 +304,19 @@ void InsetGraphics::read(Lexer & lex)
} }
string InsetGraphics::createLatexOptions() const string InsetGraphics::createLatexOptions(bool const ps) const
{ {
// Calculate the options part of the command, we must do it to a string // Calculate the options part of the command, we must do it to a string
// stream since we might have a trailing comma that we would like to remove // stream since we might have a trailing comma that we would like to remove
// before writing it to the output stream. // before writing it to the output stream.
ostringstream options; ostringstream options;
if (!params().bbox.empty()) if (!params().bbox.empty()) {
options << "bb=" << params().bbox.xl.asLatexString() << ' ' string const key = ps ? "bb=" : "viewport=";
options << key << params().bbox.xl.asLatexString() << ' '
<< params().bbox.yb.asLatexString() << ' ' << params().bbox.yb.asLatexString() << ' '
<< params().bbox.xr.asLatexString() << ' ' << params().bbox.xr.asLatexString() << ' '
<< params().bbox.yt.asLatexString() << ','; << params().bbox.yt.asLatexString() << ',';
}
if (params().draft) if (params().draft)
options << "draft,"; options << "draft,";
if (params().clip) if (params().clip)
@ -765,7 +767,9 @@ void InsetGraphics::latex(otexstream & os,
before += "\\includegraphics"; before += "\\includegraphics";
// Write the options if there are any. // Write the options if there are any.
string const opts = createLatexOptions(); bool const ps = runparams.flavor == OutputParams::LATEX
|| runparams.flavor == OutputParams::DVILUATEX;
string const opts = createLatexOptions(ps);
LYXERR(Debug::GRAPHICS, "\tOpts = " << opts); LYXERR(Debug::GRAPHICS, "\tOpts = " << opts);
if (!opts.empty() && !message.empty()) if (!opts.empty() && !message.empty())

2
src/insets/InsetGraphics.h
View File

@ -112,7 +112,7 @@ private:
/// Get the status message, depends on the image loading status. /// Get the status message, depends on the image loading status.
std::string statusMessage() const; std::string statusMessage() const;
/// Create the options for the latex command. /// Create the options for the latex command.
std::string createLatexOptions() const; std::string createLatexOptions(bool const ps) const;
/// Create length values for docbook export. /// Create length values for docbook export.
docstring toDocbookLength(Length const & len) const; docstring toDocbookLength(Length const & len) const;
/// Create the atributes for docbook export. /// Create the atributes for docbook export.

2
status.22x
View File

@ -49,6 +49,8 @@ What's new
- Catch "! Incomplete \if[x]" LaTeX error (bug 10666). - Catch "! Incomplete \if[x]" LaTeX error (bug 10666).
- Fix PDF output of clipped graphics with recent graphics package (bug 7910).
- Catch xdvipdfmx driver error that breaks XeTeX compilation (bug 10076). - Catch xdvipdfmx driver error that breaks XeTeX compilation (bug 10076).
- Fix caption handling in listings insets when it is split into multiple - Fix caption handling in listings insets when it is split into multiple