X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FPreviewLoader.cpp;h=ac14fbb6a904591e9b8a0182bef5b230eb7ae3e6;hb=19b840ae23a888300f9a5c03971351b546cce93d;hp=e9b1d47202c2a4a4288a6f97227eeeddce48c66d;hpb=f323a64fc34b83268b769fe549d1bc5801dd19b3;p=lyx.git

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index e9b1d47202..ac14fbb6a9 100644
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -38,7 +38,6 @@
 #include "support/ForkedCalls.h"
 #include "support/lstrings.h"
 
-#include "support/bind.h"
 #include "support/TempFile.h"
 
 #include <atomic>
@@ -74,45 +73,6 @@ FileName const unique_tex_filename(FileName const & bufferpath)
 }
 
 
-lyx::Converter const * setConverter(string const & from)
-{
-	typedef vector<string> FmtList;
-	typedef lyx::graphics::Cache GCache;
-	FmtList const & loadableFormats = GCache::get().loadableFormats();
-	FmtList::const_iterator it = loadableFormats.begin();
-	FmtList::const_iterator const end = loadableFormats.end();
-
-	for (; it != end; ++it) {
-		string const to = *it;
-		if (from == to)
-			continue;
-
-		lyx::Converter const * ptr = lyx::theConverters().getConverter(from, to);
-		if (ptr)
-			return ptr;
-	}
-
-	// Show the error only once
-#ifdef LYX_USE_STD_CALL_ONCE
-	// This is thread-safe.
-	static once_flag flag;
-	call_once(flag, [&](){
-			LYXERR0("PreviewLoader::startLoading()\n"
-			        << "No converter from \"" << from
-			        << "\" format has been defined.");
-		});
-#else
-	// This is also thread-safe according to §6.7.4 of the C++11 standard.
-	static bool once = ([&]{
-			LYXERR0("PreviewLoader::startLoading()\n"
-			        << "No converter from \"" << from
-			        << "\" format has been defined.");
-		} (), true);
-#endif
-	return 0;
-}
-
-
 void setAscentFractions(vector<double> & ascent_fractions,
 			FileName const & metrics_file)
 {
@@ -200,14 +160,13 @@ typedef map<pid_t, InProgress>  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);
@@ -228,10 +187,12 @@ public:
 	void refreshPreviews();
 
 	/// Emit this signal when an image is ready for display.
-	boost::signals2::signal<void(PreviewImage const &)> imageReady;
+	signals2::signal<void(PreviewImage const &)> imageReady;
 
 	Buffer const & buffer() const { return buffer_; }
 
+	lyx::Converter const * setConverter(string const & from);
+
 private:
 	/// Called by the ForkedCall process that generated the bitmap files.
 	void finishedGenerating(pid_t, int);
@@ -277,6 +238,8 @@ private:
 
 	/// We don't own this
 	static lyx::Converter const * pconverter_;
+
+	Trackable trackable_;
 };
 
 
@@ -334,7 +297,7 @@ void PreviewLoader::refreshPreviews()
 }
 
 
-boost::signals2::connection PreviewLoader::connect(slot_type const & slot) const
+signals2::connection PreviewLoader::connect(slot const & slot) const
 {
 	return pimpl_->imageReady.connect(slot);
 }
@@ -415,7 +378,7 @@ void InProgress::stop() const
 	}
 }
 
-} // namespace anon
+} // namespace
 
 
 namespace lyx {
@@ -442,6 +405,35 @@ PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
 }
 
 
+lyx::Converter const * PreviewLoader::Impl::setConverter(string const & from)
+{
+	typedef vector<string> FmtList;
+	FmtList const & loadableFormats = graphics::Cache::get().loadableFormats();
+	FmtList::const_iterator it = loadableFormats.begin();
+	FmtList::const_iterator const end = loadableFormats.end();
+
+	for (; it != end; ++it) {
+		string const to = *it;
+		if (from == to)
+			continue;
+
+		lyx::Converter const * ptr = lyx::theConverters().getConverter(from, to);
+		if (ptr)
+			return ptr;
+	}
+
+	// Show the error only once. This is thread-safe.
+	static nullptr_t no_conv = [&]{
+		LYXERR0("PreviewLoader::startLoading()\n"
+		        << "No converter from \"" << from
+		        << "\" format has been defined.");
+		return nullptr;
+	} ();
+
+	return no_conv;
+}
+
+
 PreviewLoader::Impl::~Impl()
 {
 	delete delay_refresh_;
@@ -514,7 +506,7 @@ private:
 	string const snippet_;
 };
 
-} // namespace anon
+} // namespace
 
 PreviewLoader::Status
 PreviewLoader::Impl::status(string const & latex_snippet) const
@@ -576,7 +568,7 @@ private:
 	string const & snippet_;
 };
 
-} // namespace anon
+} // namespace
 
 
 void PreviewLoader::Impl::remove(string const & latex_snippet)
@@ -716,22 +708,17 @@ void PreviewLoader::Impl::startLoading(bool wait)
 	   << " " << 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);
 	}
 
 	cs << latexparam;
-	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);
+	cs << " --bibtex=" << quoteName(buffer_.params().bibtexCommand());
 	if (buffer_.params().bufferFormat() == "lilypond-book")
 		cs << " --lilypond";
 
@@ -750,9 +737,10 @@ 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<ForkedCall::sig>();
+	convert_ptr->connect(ForkedProcess::slot([this](pid_t pid, int retval){
+				finishedGenerating(pid, retval);
+			}).track_foreign(trackable_.p()));
 
 	ForkedCall call(buffer_.filePath());
 	int ret = call.startScript(command, convert_ptr);