#include "support/lstrings.h"
#include "support/bind.h"
+#include "support/TempFile.h"
#include <sstream>
#include <fstream>
typedef vector<SnippetPair> BitmapFile;
-string const unique_filename(string const & bufferpath)
+FileName const unique_tex_filename(FileName const & bufferpath)
{
- static int theCounter = 0;
- string const filename = lyx::convert<string>(theCounter++) + "lyxpreview";
- return addName(bufferpath, filename);
+ TempFile tempfile(bufferpath, "lyxpreviewXXXXXX.tex");
+ tempfile.setAutoRemove(false);
+ return tempfile.name();
}
-lyx::Converter const * setConverter(string const from)
+lyx::Converter const * setConverter(string const & from)
{
typedef vector<string> FmtList;
typedef lyx::graphics::Cache GCache;
return ptr;
}
+ // FIXME THREAD
static bool first = true;
if (first) {
first = false;
PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
: parent_(p), buffer_(b)
{
- if (b.params().bufferFormat() == "lilypond-book")
- pconverter_ = setConverter("lyxpreview-lytex");
- else if (b.params().encoding().package() == Encoding::japanese)
- pconverter_ = setConverter("lyxpreview-platex");
- else
+ if (!pconverter_)
pconverter_ = setConverter("lyxpreview");
}
LYXERR(Debug::GRAPHICS, "PreviewLoader::startLoading()");
// As used by the LaTeX file and by the resulting image files
- string const directory = buffer_.temppath();
+ FileName const directory(buffer_.temppath());
- string const filename_base = unique_filename(directory);
+ FileName const latexfile = unique_tex_filename(directory);
+ string const filename_base = removeExtension(latexfile.absFileName());
// Create an InProgress instance to place in the map of all
// such processes if it starts correctly.
pending_.clear();
// Output the LaTeX file.
- FileName const latexfile(filename_base + ".tex");
-
// we use the encoding of the buffer
Encoding const & enc = buffer_.params().encoding();
ofdocstream of;
try { of.reset(enc.iconvName()); }
- catch (iconv_codecvt_facet_exception & e) {
+ catch (iconv_codecvt_facet_exception const & e) {
LYXERR0("Caught iconv exception: " << e.what()
<< "\nUnable to create LaTeX file: " << latexfile);
return;
return;
}
- 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;
+ double const font_scaling_factor = buffer_.fontScalingFactor();
+
+ // The conversion command.
+ ostringstream cs;
+ cs << pconverter_->command
+ << " " << quoteName(latexfile.toFilesystemEncoding())
+ << " --dpi " << int(font_scaling_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 << ' ' << pconverter_->to << ' '
- << quoteName(latexfile.toFilesystemEncoding()) << ' '
- << int(font_scaling_factor) << ' '
- << theApp()->hexName(fg) << ' '
- << theApp()->hexName(bg);
+ 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 << " xelatex";
+ cs << " --latex=xelatex";
+ if (buffer_.params().encoding().package() == Encoding::japanese)
+ cs << " --latex=platex";
+ if (buffer_.params().bibtex_command != "default")
+ cs << " --bibtex=" << quoteName(buffer_.params().bibtex_command);
+ else if (buffer_.params().encoding().package() == Encoding::japanese)
+ cs << " --bibtex=" << quoteName(lyxrc.jbibtex_command);
+ else
+ cs << " --bibtex=" << quoteName(lyxrc.bibtex_command);
+ if (buffer_.params().bufferFormat() == "lilypond-book")
+ cs << " --lilypond";
- string const command = libScriptSearch(cs.str());
+ string const command = cs.str();
if (wait) {
- ForkedCall call;
+ ForkedCall call(buffer_.filePath());
int ret = call.startScript(ForkedProcess::Wait, command);
+ // FIXME THREAD
static int fake = (2^20) + 1;
int pid = fake++;
inprogress.pid = pid;
convert_ptr(new ForkedCall::SignalType);
convert_ptr->connect(bind(&Impl::finishedGenerating, this, _1, _2));
- ForkedCall call;
+ ForkedCall call(buffer_.filePath());
int ret = call.startScript(command, convert_ptr);
if (ret != 0) {
}
+double PreviewLoader::displayPixelRatio() const
+{
+ return buffer().params().display_pixel_ratio;
+}
+
void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
{
// Paranoia check!
runparams.nice = true;
runparams.moving_arg = true;
runparams.free_spacing = true;
- buffer_.writeLaTeXSource(os, buffer_.filePath(), runparams, true, false);
+ runparams.is_child = buffer_.parent();
+ buffer_.writeLaTeXSource(os, buffer_.filePath(), runparams, Buffer::OnlyPreamble);
// FIXME! This is a HACK! The proper fix is to control the 'true'
// passed to WriteStream below:
// Also support PDF output (automatically generated e.g. when
// \usepackage[pdftex]{hyperref} is used and XeTeX.
os << "\n"
- << "\\newif\\ifxetex\n"
- << "\\expandafter\\ifx\\csname XeTeXrevision\\endcsname\\relax\n"
- << " \\xetexfalse\n"
- << "\\else\n"
- << " \\xetextrue\n"
- << "\\fi\n"
- << "\\newif\\ifpdf\n"
- << "\\ifx\\pdfoutput\\undefined\n"
- << "\\else\\ifx\\pdfoutput\\relax\n"
- << "\\else\\ifnum0=\\pdfoutput\n"
- << "\\else\\pdftrue\\fi\\fi\\fi\n"
- << "\\ifxetex\n"
- << " \\usepackage[active,delayed,tightpage,showlabels,lyx,xetex]{preview}\n"
- << "\\else\n"
- << "\\ifpdf\n"
- << " \\usepackage[active,delayed,tightpage,showlabels,lyx,pdftex]{preview}\n"
- << "\\else\n"
- << " \\usepackage[active,delayed,showlabels,lyx,dvips]{preview}\n"
- << "\\fi\n"
- << "\\fi\n"
+ << "\\usepackage[active,delayed,showlabels,lyx]{preview}\n"
<< "\n";
}
projects / lyx.git / blobdiff