X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FPreviewLoader.cpp;h=b4d78e0ab5b68503d21445c7a2b652ecda124d90;hb=99c5a46c68bd605c03d4e3a86811831ed7dd3d37;hp=3c3fd9d38a43ff059084b220c1ac4f00a84af0cc;hpb=20b45450f6abbeaceafebebc4aaacb692abf63f9;p=lyx.git diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp index 3c3fd9d38a..b4d78e0ab5 100644 --- a/src/graphics/PreviewLoader.cpp +++ b/src/graphics/PreviewLoader.cpp @@ -37,7 +37,7 @@ #include "support/ForkedCalls.h" #include "support/lstrings.h" -#include +#include "support/bind.h" #include #include @@ -46,7 +46,7 @@ using namespace std; using namespace lyx::support; -using boost::bind; + namespace { @@ -67,10 +67,8 @@ string const unique_filename(string const & bufferpath) } -lyx::Converter const * setConverter() +lyx::Converter const * setConverter(string const from) { - string const from = "lyxpreview"; - typedef vector FmtList; typedef lyx::graphics::Cache GCache; FmtList const & loadableFormats = GCache::get().loadableFormats(); @@ -91,7 +89,7 @@ lyx::Converter const * setConverter() if (first) { first = false; LYXERR0("PreviewLoader::startLoading()\n" - << "No converter from \"lyxpreview\" format has been defined."); + << "No converter from \"" << from << "\" format has been defined."); } return 0; } @@ -205,8 +203,9 @@ public: void add(string const & latex_snippet); /// void remove(string const & latex_snippet); - /// - void startLoading(); + /// \p wait whether to wait for the process to complete or, instead, + /// to do it in the background. + void startLoading(bool wait = false); /// Emit this signal when an image is ready for display. boost::signal imageReady; @@ -217,14 +216,14 @@ private: /// Called by the ForkedCall process that generated the bitmap files. void finishedGenerating(pid_t, int); /// - void dumpPreamble(odocstream &) const; + void dumpPreamble(otexstream &) const; /// void dumpData(odocstream &, BitmapFile const &) const; /** cache_ allows easy retrieval of already-generated images * using the LaTeX snippet as the identifier. */ - typedef boost::shared_ptr PreviewImagePtr; + typedef shared_ptr PreviewImagePtr; /// typedef map Cache; /// @@ -245,8 +244,6 @@ private: PreviewLoader & parent_; /// Buffer const & buffer_; - /// - double font_scaling_factor_; /// We don't own this static lyx::Converter const * pconverter_; @@ -295,9 +292,9 @@ void PreviewLoader::remove(string const & latex_snippet) const } -void PreviewLoader::startLoading() const +void PreviewLoader::startLoading(bool wait) const { - pimpl_->startLoading(); + pimpl_->startLoading(wait); } @@ -354,7 +351,7 @@ InProgress::InProgress(string const & filename_base, PendingSnippets const & pending, string const & to_format) : pid(0), - metrics_file(FileName(filename_base + ".metrics")), + metrics_file(filename_base + ".metrics"), snippets(pending.size()) { PendingSnippets::const_iterator pit = pending.begin(); @@ -389,16 +386,10 @@ namespace lyx { namespace graphics { PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b) - : parent_(p), buffer_(b), font_scaling_factor_(0.0) + : parent_(p), buffer_(b) { - font_scaling_factor_ = 0.01 * lyxrc.dpi * lyxrc.zoom * - convert(lyxrc.preview_scale_factor); - - LYXERR(Debug::GRAPHICS, "The font scaling factor is " - << font_scaling_factor_); - if (!pconverter_) - pconverter_ = setConverter(); + pconverter_ = setConverter("lyxpreview"); } @@ -526,7 +517,7 @@ void PreviewLoader::Impl::remove(string const & latex_snippet) } -void PreviewLoader::Impl::startLoading() +void PreviewLoader::Impl::startLoading(bool wait) { if (pending_.empty() || !pconverter_) return; @@ -554,15 +545,16 @@ void PreviewLoader::Impl::startLoading() // we use the encoding of the buffer Encoding const & enc = buffer_.params().encoding(); - odocfstream of; + 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; } TexRow texrow; + otexstream os(of, texrow); OutputParams runparams(&enc); LaTeXFeatures features(buffer_, buffer_.params(), runparams); @@ -575,9 +567,9 @@ void PreviewLoader::Impl::startLoading() return; } of << "\\batchmode\n"; - dumpPreamble(of); + dumpPreamble(os); // handle inputenc etc. - buffer_.params().writeEncodingPreamble(of, features, texrow); + buffer_.params().writeEncodingPreamble(os, features); of << "\n\\begin{document}\n"; dumpData(of, inprogress.snippets); of << "\n\\end{document}\n"; @@ -588,22 +580,59 @@ void PreviewLoader::Impl::startLoading() 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; + // The conversion command. ostringstream cs; - cs << pconverter_->command << ' ' << pconverter_->to << ' ' - << quoteName(latexfile.toFilesystemEncoding()) << ' ' - << int(font_scaling_factor_) << ' ' - << theApp()->hexName(Color_preview) << ' ' - << theApp()->hexName(Color_background); + cs << pconverter_->command + << " " << quoteName(latexfile.toFilesystemEncoding()) + << " --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"; + 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()); + if (wait) { + ForkedCall call(buffer_.filePath()); + int ret = call.startScript(ForkedProcess::Wait, command); + static int fake = (2^20) + 1; + int pid = fake++; + inprogress.pid = pid; + inprogress.command = command; + in_progress_[pid] = inprogress; + finishedGenerating(pid, ret); + return; + } + // Initiate the conversion from LaTeX to bitmap images files. ForkedCall::SignalTypePtr 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) { @@ -654,10 +683,14 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval) FileName const & file = it->second; double af = ascent_fractions[metrics_counter]; - PreviewImagePtr ptr(new PreviewImage(parent_, snip, file, af)); - cache_[snip] = ptr; + // Add the image to the cache only if it's actually present + if (file.isReadableFile()) { + PreviewImagePtr ptr(new PreviewImage(parent_, snip, file, af)); + cache_[snip] = ptr; + + newimages.push_back(ptr); + } - newimages.push_back(ptr); } // Remove the item from the list of still-executing processes. @@ -674,19 +707,19 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval) } -void PreviewLoader::Impl::dumpPreamble(odocstream & os) const +void PreviewLoader::Impl::dumpPreamble(otexstream & os) const { - // Why on earth is Buffer::makeLaTeXFile a non-const method? - Buffer & tmp = const_cast(buffer_); // Dump the preamble only. - // We don't need an encoding for runparams since it is not used by - // the preamble. - OutputParams runparams(0); - runparams.flavor = OutputParams::LATEX; + OutputParams runparams(&buffer_.params().encoding()); + if (buffer_.params().useNonTeXFonts) + runparams.flavor = OutputParams::XETEX; + else + runparams.flavor = OutputParams::LATEX; runparams.nice = true; runparams.moving_arg = true; runparams.free_spacing = true; - tmp.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: @@ -701,15 +734,6 @@ void PreviewLoader::Impl::dumpPreamble(odocstream & os) const << "\\def\\lyxlock{}\n" << "\n"; - // Loop over the insets in the buffer and dump all the math-macros. - Inset & inset = buffer_.inset(); - InsetIterator it = inset_iterator_begin(inset); - InsetIterator const end = inset_iterator_end(inset); - - for (; it != end; ++it) - if (it->lyxCode() == MATHMACRO_CODE) - it->latex(os, runparams); - // All equation labels appear as "(#)" + preview.sty's rendering of // the label name if (lyxrc.preview_hashed_labels) @@ -717,8 +741,10 @@ void PreviewLoader::Impl::dumpPreamble(odocstream & os) const // Use the preview style file to ensure that each snippet appears on a // fresh page. + // Also support PDF output (automatically generated e.g. when + // \usepackage[pdftex]{hyperref} is used and XeTeX. os << "\n" - << "\\usepackage[active,delayed,dvips,showlabels,lyx]{preview}\n" + << "\\usepackage[active,delayed,showlabels,lyx]{preview}\n" << "\n"; }