X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FPreviewLoader.cpp;h=dc944b1929e36198e2fdd11b5da0cc0ee8654ded;hb=b3fe9cb7049daaacbcf357ba5e4ece479f7b1be4;hp=93ea6b79b652bb7d8a3d39ad560d3d26f32d3376;hpb=ecbd047cffa1c4af95cf4ab91a7d2fded4a5584c;p=lyx.git diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp index 93ea6b79b6..dc944b1929 100644 --- a/src/graphics/PreviewLoader.cpp +++ b/src/graphics/PreviewLoader.cpp @@ -19,8 +19,6 @@ #include "Converter.h" #include "Encoding.h" #include "Format.h" -#include "InsetIterator.h" -#include "LaTeXFeatures.h" #include "LyXRC.h" #include "output.h" #include "OutputParams.h" @@ -29,16 +27,14 @@ #include "frontends/Application.h" // hexName -#include "insets/Inset.h" - #include "support/convert.h" #include "support/debug.h" #include "support/FileName.h" #include "support/filetools.h" #include "support/ForkedCalls.h" #include "support/lstrings.h" +#include "support/os.h" -#include "support/bind.h" #include "support/TempFile.h" #include @@ -125,14 +121,10 @@ void setAscentFractions(vector & ascent_fractions, } -class FindFirst +std::function FindFirst(string const & comp) { -public: - FindFirst(string const & comp) : comp_(comp) {} - bool operator()(SnippetPair const & sp) const { return sp.first == comp_; } -private: - string const comp_; -}; + return [&comp](SnippetPair const & sp) { return sp.first == comp; }; +} /// Store info on a currently executing, forked process. @@ -147,28 +139,27 @@ public: /// Remove any files left lying around and kill the forked process. void stop() const; - /// - pid_t pid; /// string command; /// FileName metrics_file; /// BitmapFile snippets; + /// + pid_t pid; }; typedef map InProgressProcesses; typedef InProgressProcesses::value_type InProgressProcess; -} // namespace anon - +} // namespace namespace lyx { namespace graphics { -class PreviewLoader::Impl : public boost::signals2::trackable { +class PreviewLoader::Impl { public: /// Impl(PreviewLoader & p, Buffer const & b); @@ -189,7 +180,7 @@ public: void refreshPreviews(); /// Emit this signal when an image is ready for display. - boost::signals2::signal imageReady; + signal imageReady; Buffer const & buffer() const { return buffer_; } @@ -199,7 +190,7 @@ private: /// Called by the ForkedCall process that generated the bitmap files. void finishedGenerating(pid_t, int); /// - void dumpPreamble(otexstream &, OutputParams::FLAVOR) const; + void dumpPreamble(otexstream &, Flavor) const; /// void dumpData(odocstream &, BitmapFile const &) const; @@ -219,7 +210,6 @@ private: /** in_progress_ stores all forked processes so that we can proceed * thereafter. - The map uses the conversion commands as its identifiers. */ InProgressProcesses in_progress_; @@ -240,6 +230,7 @@ private: /// We don't own this static lyx::Converter const * pconverter_; + }; @@ -251,16 +242,10 @@ lyx::Converter const * PreviewLoader::Impl::pconverter_; // PreviewLoader::PreviewLoader(Buffer const & b) - : pimpl_(new Impl(*this, b)) + : pimpl_(make_shared(*this, b)) {} -PreviewLoader::~PreviewLoader() -{ - delete pimpl_; -} - - PreviewImage const * PreviewLoader::preview(string const & latex_snippet) const { return pimpl_->preview(latex_snippet); @@ -297,7 +282,7 @@ void PreviewLoader::refreshPreviews() } -boost::signals2::connection PreviewLoader::connect(slot_type const & slot) const +connection PreviewLoader::connect(slot const & slot) const { return pimpl_->imageReady.connect(slot); } @@ -334,9 +319,8 @@ public: { ostringstream os; os << base_ << counter_++ << '.' << to_format_; - string const file = os.str(); - - return make_pair(snippet, FileName(file)); + string const file_name = os.str(); + return make_pair(snippet, FileName(file_name)); } private: @@ -349,9 +333,8 @@ private: InProgress::InProgress(string const & filename_base, PendingSnippets const & pending, string const & to_format) - : pid(0), - metrics_file(filename_base + ".metrics"), - snippets(pending.size()) + : metrics_file(filename_base + ".metrics"), + snippets(pending.size()), pid(0) { PendingSnippets::const_iterator pit = pending.begin(); PendingSnippets::const_iterator pend = pending.end(); @@ -378,7 +361,7 @@ void InProgress::stop() const } } -} // namespace anon +} // namespace namespace lyx { @@ -389,8 +372,8 @@ PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b) { font_scaling_factor_ = int(buffer_.fontScalingFactor()); if (theApp()) { - fg_color_ = strtol(theApp()->hexName(foregroundColor()).c_str(), 0, 16); - bg_color_ = strtol(theApp()->hexName(backgroundColor()).c_str(), 0, 16); + fg_color_ = convert(theApp()->hexName(foregroundColor()), 16); + bg_color_ = convert(theApp()->hexName(backgroundColor()), 16); } else { fg_color_ = 0x0; bg_color_ = 0xffffff; @@ -453,8 +436,8 @@ PreviewLoader::Impl::preview(string const & latex_snippet) const int fg = 0x0; int bg = 0xffffff; if (theApp()) { - fg = strtol(theApp()->hexName(foregroundColor()).c_str(), 0, 16); - bg = strtol(theApp()->hexName(backgroundColor()).c_str(), 0, 16); + fg = convert(theApp()->hexName(foregroundColor()), 16); + bg = convert(theApp()->hexName(backgroundColor()), 16); } if (font_scaling_factor_ != fs || fg_color_ != fg || bg_color_ != bg) { // Schedule refresh of all previews on zoom or color changes. @@ -466,9 +449,10 @@ PreviewLoader::Impl::preview(string const & latex_snippet) const } // Don't try to access the cache until we are done. if (delay_refresh_->isActive() || !finished_generating_) - return 0; + return nullptr; + Cache::const_iterator it = cache_.find(latex_snippet); - return (it == cache_.end()) ? 0 : it->second.get(); + return (it == cache_.end()) ? nullptr : it->second.get(); } @@ -491,22 +475,17 @@ void PreviewLoader::Impl::refreshPreviews() namespace { -class FindSnippet { -public: - FindSnippet(string const & s) : snippet_(s) {} - bool operator()(InProgressProcess const & process) const - { +std::function FindSnippet(string const & s) +{ + return [&s](InProgressProcess const & process) { BitmapFile const & snippets = process.second.snippets; BitmapFile::const_iterator beg = snippets.begin(); BitmapFile::const_iterator end = snippets.end(); - return find_if(beg, end, FindFirst(snippet_)) != end; - } - -private: - string const snippet_; -}; + return find_if(beg, end, FindFirst(s)) != end; + }; +} -} // namespace anon +} // namespace PreviewLoader::Status PreviewLoader::Impl::status(string const & latex_snippet) const @@ -550,25 +529,20 @@ void PreviewLoader::Impl::add(string const & latex_snippet) namespace { -class EraseSnippet { -public: - EraseSnippet(string const & s) : snippet_(s) {} - void operator()(InProgressProcess & process) - { +std::function EraseSnippet(string const & s) +{ + return [&s](InProgressProcess & process) { BitmapFile & snippets = process.second.snippets; BitmapFile::iterator it = snippets.begin(); BitmapFile::iterator end = snippets.end(); - it = find_if(it, end, FindFirst(snippet_)); + it = find_if(it, end, FindFirst(s)); if (it != end) snippets.erase(it, it+1); - } - -private: - string const & snippet_; -}; + }; +} -} // namespace anon +} // namespace void PreviewLoader::Impl::remove(string const & latex_snippet) @@ -631,9 +605,6 @@ void PreviewLoader::Impl::startLoading(bool wait) } otexstream os(of); - OutputParams runparams(&enc); - LaTeXFeatures features(buffer_, buffer_.params(), runparams); - if (!openFileWrite(of, latexfile)) return; @@ -644,53 +615,48 @@ void PreviewLoader::Impl::startLoading(bool wait) } of << "\\batchmode\n"; - // Set \jobname of previews to the document name (see bug 9627) - of << "\\def\\jobname{" - << from_utf8(changeExtension(buffer_.latexName(true), "")) - << "}\n"; - - LYXERR(Debug::LATEX, "Format = " << buffer_.params().getDefaultOutputFormat()); + LYXERR(Debug::OUTFILE, "Format = " << buffer_.params().getDefaultOutputFormat()); string latexparam = ""; bool docformat = !buffer_.params().default_output_format.empty() && buffer_.params().default_output_format != "default"; // Use LATEX flavor if the document does not specify a specific // output format (see bug 9371). - OutputParams::FLAVOR flavor = docformat + Flavor flavor = docformat ? buffer_.params().getOutputFlavor() - : OutputParams::LATEX; + : Flavor::LaTeX; if (buffer_.params().encoding().package() == Encoding::japanese) { latexparam = " --latex=platex"; - flavor = OutputParams::LATEX; + flavor = Flavor::LaTeX; } else if (buffer_.params().useNonTeXFonts) { - if (flavor == OutputParams::LUATEX) + if (flavor == Flavor::LuaTeX) latexparam = " --latex=lualatex"; else { - flavor = OutputParams::XETEX; + flavor = Flavor::XeTeX; latexparam = " --latex=xelatex"; } } else { switch (flavor) { - case OutputParams::PDFLATEX: + case Flavor::PdfLaTeX: latexparam = " --latex=pdflatex"; break; - case OutputParams::XETEX: + case Flavor::XeTeX: latexparam = " --latex=xelatex"; break; - case OutputParams::LUATEX: + case Flavor::LuaTeX: latexparam = " --latex=lualatex"; break; - case OutputParams::DVILUATEX: + case Flavor::DviLuaTeX: latexparam = " --latex=dvilualatex"; break; default: - flavor = OutputParams::LATEX; + flavor = Flavor::LaTeX; } } dumpPreamble(os, flavor); // handle inputenc etc. - // I think, this is already hadled by dumpPreamble(): Kornel + // I think this is already handled by dumpPreamble(): Kornel // buffer_.params().writeEncodingPreamble(os, features); of << "\n\\begin{document}\n"; dumpData(of, inprogress.snippets); @@ -704,16 +670,16 @@ void PreviewLoader::Impl::startLoading(bool wait) // The conversion command. ostringstream cs; - cs << pconverter_->command() + cs << subst(pconverter_->command(), "$${python}", os::python()) << " " << quoteName(latexfile.toFilesystemEncoding()) << " --dpi " << font_scaling_factor_; - // FIXME XHTML + // 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) + cs << " --fg " << theApp()->hexName(fg) << " --bg " << theApp()->hexName(bg); } @@ -727,7 +693,8 @@ void PreviewLoader::Impl::startLoading(bool wait) if (wait) { ForkedCall call(buffer_.filePath(), buffer_.layoutPos()); int ret = call.startScript(ForkedProcess::Wait, command); - static atomic_int fake((2^20) + 1); + // PID_MAX_LIMIT is 2^22 so we start one after that + static atomic_int fake((1 << 22) + 1); int pid = fake++; inprogress.pid = pid; inprogress.command = command; @@ -737,9 +704,13 @@ void PreviewLoader::Impl::startLoading(bool wait) } // 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::sigPtr convert_ptr = make_shared(); + weak_ptr this_ = parent_.pimpl_; + convert_ptr->connect([this_](pid_t pid, int retval){ + if (auto p = this_.lock()) { + p->finishedGenerating(pid, retval); + } + }); ForkedCall call(buffer_.filePath()); int ret = call.startScript(command, convert_ptr); @@ -795,7 +766,7 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval) list newimages; - int metrics_counter = 0; + size_t metrics_counter = 0; for (; it != end; ++it, ++metrics_counter) { string const & snip = it->first; FileName const & file = it->second; @@ -824,27 +795,29 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval) imageReady(*nit->get()); } finished_generating_ = true; + buffer_.scheduleRedrawWorkAreas(); } -void PreviewLoader::Impl::dumpPreamble(otexstream & os, OutputParams::FLAVOR flavor) const +void PreviewLoader::Impl::dumpPreamble(otexstream & os, Flavor flavor) const { // Dump the preamble only. - LYXERR(Debug::LATEX, "dumpPreamble, flavor == " << flavor); + LYXERR(Debug::OUTFILE, "dumpPreamble, flavor == " << static_cast(flavor)); OutputParams runparams(&buffer_.params().encoding()); runparams.flavor = flavor; runparams.nice = true; runparams.moving_arg = true; runparams.free_spacing = true; runparams.is_child = buffer_.parent(); + runparams.for_preview = true; 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: + // passed to TeXMathStream below: // int InsetMathNest::latex(Buffer const &, odocstream & os, // OutputParams const & runparams) const // { - // WriteStream wi(os, runparams.moving_arg, true); + // TeXMathStream wi(os, runparams.moving_arg, true); // par_->write(wi); // return wi.line(); // } @@ -876,11 +849,30 @@ void PreviewLoader::Impl::dumpData(odocstream & os, BitmapFile::const_iterator it = vec.begin(); BitmapFile::const_iterator end = vec.end(); + Encoding const & enc = buffer_.params().encoding(); + for (; it != end; ++it) { + docstring res; + bool uncodable_content = false; + // check whether the content is encodable + // FIXME: the preview loader should be able + // to handle multiple encodings + // or we should generally use utf8 + for (char_type n : from_utf8(it->first)) { + if (!enc.encodable(n)) { + LYXERR0("Uncodable character '" + << docstring(1, n) + << "' in preview snippet!"); + uncodable_content = true; + } else + res += n; + } // FIXME UNICODE - os << "\\begin{preview}\n" - << from_utf8(it->first) - << "\n\\end{preview}\n\n"; + os << "\\begin{preview}\n"; + // do not show incomplete preview + if (!uncodable_content) + os << res; + os << "\n\\end{preview}\n\n"; } }