merge recent changes from master

[lyx.git] / src / graphics / PreviewLoader.cpp

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index e1a47e84390a014880d69b23b41c917eb6c9b473..93ea6b79b652bb7d8a3d39ad560d3d26f32d3376 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -74,36 +74,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. 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;
-}
-
-
 void setAscentFractions(vector<double> & ascent_fractions,
                        FileName const & metrics_file)
 {
@@ -223,6 +193,8 @@ public:
 
        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);
@@ -433,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_;
@@ -717,12 +718,7 @@ void PreviewLoader::Impl::startLoading(bool wait)
        }
 
        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";