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

Fix a crash in PreviewLoader for command-line xhtml output

Browse Source 
While exporting from the command-line, theApp() doesn't exist.
The colors foreground and background are only needed when
previewing, so ignore this during buffer export.

This replaces the fix in 4285b0b3 (Tommaso Cucinotta, 10-12-2012).
In this case, we do not need to pull in Qt dependencies.
This commit is contained in:
Vincent van Ravesteijn 2012-12-13 20:16:50 +01:00
parent 752f2e4811
commit 6e227f18ae
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/graphics/PreviewLoader.cpp
View File

@ -584,19 +584,21 @@ void PreviewLoader::Impl::startLoading(bool wait)
buffer_.isExporting() ? 75.0 * buffer_.params().html_math_img_scale buffer_.isExporting() ? 75.0 * buffer_.params().html_math_img_scale
: 0.01 * lyxrc.dpi * lyxrc.zoom * lyxrc.preview_scale_factor; : 0.01 * lyxrc.dpi * lyxrc.zoom * lyxrc.preview_scale_factor;
// FIXME XHTML
// The colors should be customizable.
ColorCode const bg = buffer_.isExporting()
? Color_white : PreviewLoader::backgroundColor();
ColorCode const fg = buffer_.isExporting()
? Color_black : PreviewLoader::foregroundColor();
// The conversion command. // The conversion command.
ostringstream cs; ostringstream cs;
cs << pconverter_->command cs << pconverter_->command
<< " " << quoteName(latexfile.toFilesystemEncoding()) << " " << quoteName(latexfile.toFilesystemEncoding())
<< " --dpi " << int(font_scaling_factor) << " --dpi " << int(font_scaling_factor);
<< " --fg " << theApp()->hexName(fg)
<< " --bg " << theApp()->hexName(bg); // FIXME XHTML
// The colors should be customizable.
if (!buffer_.isExporting()) {
ColorCode const fg = PreviewLoader::foregroundColor();
ColorCode const bg = PreviewLoader::backgroundColor();
cs << " --fg " << theApp()->hexName(fg)
<< " --bg " << theApp()->hexName(bg);
}
// FIXME what about LuaTeX? // FIXME what about LuaTeX?
if (buffer_.params().useNonTeXFonts) if (buffer_.params().useNonTeXFonts)
cs << " --latex=xelatex"; cs << " --latex=xelatex";