Update previews after doing a find/replace (#7242)

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

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index f39bd8ee1d67c88f70612b22efe7cc91110be555..addc6af224497a454f057f2af799c876746ed004 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -218,7 +218,7 @@ private:
        /// Called by the ForkedCall process that generated the bitmap files.
        void finishedGenerating(pid_t, int);
        ///
-       void dumpPreamble(otexstream &) const;
+       void dumpPreamble(otexstream &, OutputParams::FLAVOR) const;
        ///
        void dumpData(odocstream &, BitmapFile const &) const;
 
@@ -538,7 +538,7 @@ void PreviewLoader::Impl::startLoading(bool wait)
 
        // Create an InProgress instance to place in the map of all
        // such processes if it starts correctly.
-       InProgress inprogress(filename_base, pending_, pconverter_->to);
+       InProgress inprogress(filename_base, pending_, pconverter_->to());
 
        // clear pending_, so we're ready to start afresh.
        pending_.clear();
@@ -568,9 +568,44 @@ void PreviewLoader::Impl::startLoading(bool wait)
                return;
        }
        of << "\\batchmode\n";
-       dumpPreamble(os);
+
+       LYXERR(Debug::LATEX, "Format = " << buffer_.params().getDefaultOutputFormat());
+       string latexparam = "";
+       OutputParams::FLAVOR flavor = buffer_.params().getOutputFlavor();
+       if (buffer_.params().encoding().package() == Encoding::japanese) {
+               latexparam = " --latex=platex";
+               flavor = OutputParams::LATEX;
+       }
+       else if (buffer_.params().useNonTeXFonts) {
+               if (flavor == OutputParams::LUATEX)
+                       latexparam = " --latex=lualatex";
+               else {
+                       flavor = OutputParams::XETEX;
+                       latexparam = " --latex=xelatex";
+               }
+       }
+       else {
+               switch (flavor) {
+                       case OutputParams::PDFLATEX:
+                               latexparam = " --latex=pdflatex";
+                               break;
+                       case OutputParams::XETEX:
+                               latexparam = " --latex=xelatex";
+                               break;
+                       case OutputParams::LUATEX:
+                               latexparam = " --latex=lualatex";
+                               break;
+                       case OutputParams::DVILUATEX:
+                               latexparam = " --latex=dvilualatex";
+                               break;
+                       default:
+                               flavor = OutputParams::LATEX;
+               }
+       }
+       dumpPreamble(os, flavor);
        // handle inputenc etc.
-       buffer_.params().writeEncodingPreamble(os, features);
+       // I think, this is already hadled by dumpPreamble(): Kornel
+       // buffer_.params().writeEncodingPreamble(os, features);
        of << "\n\\begin{document}\n";
        dumpData(of, inprogress.snippets);
        of << "\n\\end{document}\n";
@@ -581,13 +616,11 @@ void PreviewLoader::Impl::startLoading(bool wait)
                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
+       cs << pconverter_->command()
           << " " << quoteName(latexfile.toFilesystemEncoding())
           << " --dpi " << int(font_scaling_factor);
 
@@ -600,11 +633,7 @@ void PreviewLoader::Impl::startLoading(bool wait)
                   << " --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";
+       cs << latexparam;
        if (buffer_.params().bibtex_command != "default")
                cs << " --bibtex=" << quoteName(buffer_.params().bibtex_command);
        else if (buffer_.params().encoding().package() == Encoding::japanese)
@@ -650,6 +679,11 @@ void PreviewLoader::Impl::startLoading(bool wait)
 }
 
 
+double PreviewLoader::displayPixelRatio() const
+{
+       return buffer().params().display_pixel_ratio;
+}
+
 void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
 {
        // Paranoia check!
@@ -709,14 +743,12 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
 }
 
 
-void PreviewLoader::Impl::dumpPreamble(otexstream & os) const
+void PreviewLoader::Impl::dumpPreamble(otexstream & os, OutputParams::FLAVOR flavor) const
 {
        // Dump the preamble only.
+       LYXERR(Debug::LATEX, "dumpPreamble, flavor == " << flavor);
        OutputParams runparams(&buffer_.params().encoding());
-       if (buffer_.params().useNonTeXFonts)
-               runparams.flavor = OutputParams::XETEX;
-       else
-               runparams.flavor = OutputParams::LATEX;
+       runparams.flavor = flavor;
        runparams.nice = true;
        runparams.moving_arg = true;
        runparams.free_spacing = true;