mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fix a crash in PreviewLoader for command-line xhtml output
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:
parent
752f2e4811
commit
6e227f18ae
@ -583,20 +583,22 @@ void PreviewLoader::Impl::startLoading(bool wait)
|
||||
double const font_scaling_factor =
|
||||
buffer_.isExporting() ? 75.0 * buffer_.params().html_math_img_scale
|
||||
: 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.
|
||||
ostringstream cs;
|
||||
cs << pconverter_->command
|
||||
<< " " << quoteName(latexfile.toFilesystemEncoding())
|
||||
<< " --dpi " << int(font_scaling_factor)
|
||||
<< " --fg " << theApp()->hexName(fg)
|
||||
<< " --bg " << theApp()->hexName(bg);
|
||||
<< " --dpi " << int(font_scaling_factor);
|
||||
|
||||
// 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?
|
||||
if (buffer_.params().useNonTeXFonts)
|
||||
cs << " --latex=xelatex";
|
||||
|
Loading…
Reference in New Issue
Block a user