Replace LString.h with support/std_string.h,

[features.git] / src / graphics / PreviewLoader.C

diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C
index 75d6faf587152176b07f1d9c80ce4f3d4554f9bd..decb4473691f0c3ef4dc53f5a2c8db6b59c9128b 100644 (file)
--- a/src/graphics/PreviewLoader.C
+++ b/src/graphics/PreviewLoader.C
@@ -1,11 +1,11 @@
 /**
- *  \file PreviewLoader.C
+ * \file PreviewLoader.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -18,10 +18,6 @@
 #include "format.h"
 #include "debug.h"
 #include "lyxrc.h"
-#include "LColor.h"
-#include "Lsstream.h"
-
-#include "insets/inset.h"
 
 #include "frontends/lyx_gui.h" // hexname
 
@@ -30,16 +26,16 @@
 #include "support/forkedcontr.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
+#include "support/tostr.h"
 
 #include <boost/bind.hpp>
-#include <boost/signals/trackable.hpp>
 
+#include "support/std_sstream.h"
 #include <fstream>
 #include <iomanip>
-#include <list>
-#include <map>
-#include <utility>
-#include <vector>
+
+namespace support = lyx::support;
+
 
 using std::endl;
 using std::find;
@@ -114,7 +110,8 @@ typedef InProgressProcesses::value_type InProgressProcess;
 } // namespace anon
 
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
 struct PreviewLoader::Impl : public boost::signals::trackable {
        ///
@@ -238,7 +235,8 @@ Buffer const & PreviewLoader::buffer() const
        return pimpl_->buffer();
 }
 
-} // namespace grfx
+} // namespace graphics
+} // namespace lyx
 
 
 // The details of the Impl
@@ -287,23 +285,24 @@ InProgress::InProgress(string const & filename_base,
 void InProgress::stop() const
 {
        if (pid)
-               ForkedcallsController::get().kill(pid, 0);
+               support::ForkedcallsController::get().kill(pid, 0);
 
        if (!metrics_file.empty())
-               lyx::unlink(metrics_file);
+               support::unlink(metrics_file);
 
        BitmapFile::const_iterator vit  = snippets.begin();
        BitmapFile::const_iterator vend = snippets.end();
        for (; vit != vend; ++vit) {
                if (!vit->second.empty())
-                       lyx::unlink(vit->second);
+                       support::unlink(vit->second);
        }
 }
 
 } // namespace anon
 
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
 PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
        : parent_(p), buffer_(b), font_scaling_factor_(0.0)
@@ -387,7 +386,7 @@ void PreviewLoader::Impl::add(string const & latex_snippet)
        if (!pconverter_ || status(latex_snippet) != NotFound)
                return;
 
-       string const snippet = trim(latex_snippet);
+       string const snippet = support::trim(latex_snippet);
        if (snippet.empty())
                return;
 
@@ -454,7 +453,7 @@ void PreviewLoader::Impl::startLoading()
        string directory = buffer_.tmppath;
        if (directory.empty())
                directory = buffer_.filePath();
-       
+
        string const filename_base(unique_filename(directory));
 
        // Create an InProgress instance to place in the map of all
@@ -480,14 +479,15 @@ void PreviewLoader::Impl::startLoading()
        cs << pconverter_->command << ' ' << latexfile << ' '
           << int(font_scaling_factor_) << ' ' << pconverter_->to;
 
-       string const command = "sh " + LibScriptSearch(STRCONV(cs.str()));
+       string const command = "sh " + support::LibScriptSearch(STRCONV(cs.str()));
 
        // Initiate the conversion from LaTeX to bitmap images files.
-       Forkedcall::SignalTypePtr convert_ptr(new Forkedcall::SignalType);
+       support::Forkedcall::SignalTypePtr
+               convert_ptr(new support::Forkedcall::SignalType);
        convert_ptr->connect(
                boost::bind(&Impl::finishedGenerating, this, _1, _2));
 
-       Forkedcall call;
+       support::Forkedcall call;
        int ret = call.startscript(command, convert_ptr);
 
        if (ret != 0) {
@@ -564,14 +564,19 @@ void PreviewLoader::Impl::dumpPreamble(ostream & os) const
        // Why on earth is Buffer::makeLaTeXFile a non-const method?
        Buffer & tmp = const_cast<Buffer &>(buffer_);
        // Dump the preamble only.
-       tmp.makeLaTeXFile(os, buffer_.filePath(), true, false, true);
+       LatexRunParams runparams;
+       runparams.flavor = LatexRunParams::LATEX;
+       runparams.nice = true;
+       runparams.moving_arg = true;
+       runparams.free_spacing = true;
+       tmp.makeLaTeXFile(os, buffer_.filePath(), runparams, true, false);
 
        // FIXME! This is a HACK! The proper fix is to control the 'true'
        // passed to WriteStream below:
-       // int InsetFormula::latex(Buffer const *, ostream & os,
-       //                         bool fragile, bool) const
+       // int InsetFormula::latex(Buffer const &, ostream & os,
+       //                         LatexRunParams const & runparams) const
        // {
-       //      WriteStream wi(os, fragile, true);
+       //      WriteStream wi(os, runparams.moving_arg, true);
        //      par_->write(wi);
        //      return wi.line();
        // }
@@ -584,8 +589,8 @@ void PreviewLoader::Impl::dumpPreamble(ostream & os) const
        Buffer::inset_iterator end = buffer_.inset_const_iterator_end();
 
        for (; it != end; ++it)
-               if (it->lyxCode() == Inset::MATHMACRO_CODE)
-                       it->latex(&buffer_, os, true, true);
+               if (it->lyxCode() == InsetOld::MATHMACRO_CODE)
+                       it->latex(buffer_, os, runparams);
 
        // All equation lables appear as "(#)" + preview.sty's rendering of
        // the label name
@@ -629,8 +634,8 @@ void PreviewLoader::Impl::dumpData(ostream & os,
        }
 }
 
-} // namespace grfx
-
+} // namespace graphics
+} // namespace lyx
 
 namespace {
 
@@ -638,7 +643,7 @@ string const unique_filename(string const bufferpath)
 {
        static int theCounter = 0;
        string const filename = tostr(theCounter++) + "lyxpreview";
-       return AddName(bufferpath, filename);
+       return support::AddName(bufferpath, filename);
 }
 
 
@@ -735,7 +740,7 @@ void setAscentFractions(vector<double> & ascent_fractions,
                        double const a = ascent + tp_ascent;
                        double const d = descent - tp_descent;
 
-                       if (!lyx::float_equal(a + d, 0, 0.1))
+                       if (!support::float_equal(a + d, 0, 0.1))
                                *it = a / (a + d);
 
                        if (++it == end)