"Inter-word Space"

[lyx.git] / src / exporter.C

diff --git a/src/exporter.C b/src/exporter.C
index 1882a89fe2d07d4c2dcb80c45496a10cb7d056f1..c84c7cd49d77d89c7fe0d0d5743f593a5478bacc 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -10,13 +10,10 @@
 
 #include <config.h>
 
-#include <algorithm>
-
 #include "exporter.h"
 #include "buffer.h"
 #include "lyx_cb.h" //ShowMessage()
 #include "support/filetools.h"
-#include "support/BoostFormat.h"
 #include "lyxrc.h"
 #include "converter.h"
 #include "format.h"
@@ -24,28 +21,17 @@
 #include "gettext.h"
 #include "BufferView.h"
 
+#include <algorithm>
+
 using std::vector;
 using std::find;
 
-bool pdf_mode = false;
-
 bool Exporter::Export(Buffer * buffer, string const & format,
                      bool put_in_tempdir, string & result_file)
 {
-       // There are so many different places that this function can be called
-       // from that the removal of auto insets is best done here.  This ensures
-       // we always have a clean buffer for inserting errors found during export.
-       BufferView * bv = buffer->getUser();
-       if (bv) {
-               // Remove all error insets
-               if (bv->removeAutoInsets()) {
-#warning repaint() or update() or nothing ?
-                       bv->repaint();
-                       bv->fitCursor();
-               }
-       }
-
        string backend_format;
+       LatexRunParams runparams;
+       runparams.flavor = LatexRunParams::LATEX;
        vector<string> backends = Backends(buffer);
        if (find(backends.begin(), backends.end(), format) == backends.end()) {
                for (vector<string>::const_iterator it = backends.begin();
@@ -53,22 +39,16 @@ bool Exporter::Export(Buffer * buffer, string const & format,
                        Graph::EdgePath p =
                                converters.getPath(*it, format);
                        if (!p.empty()) {
-                               pdf_mode = converters.usePdflatex(p);
+                               if (converters.usePdflatex(p))
+                                       runparams.flavor = LatexRunParams::PDFLATEX;
                                backend_format = *it;
                                break;
                        }
                }
                if (backend_format.empty()) {
-#if USE_BOOST_FORMAT
-// FIXME: better english ...
-                       Alert::error(_("Couldn't export file"),
-                                    boost::io::str(boost::format(_("No information for exporting the format %1$s."))
-                                  % formats.prettyName(format)));
-#else
                        Alert::error(_("Couldn't export file"),
-                                    _("No information for exporting the format ")
-                                    + formats.prettyName(format) + ".");
-#endif
+                               bformat(_("No information for exporting the format %1$s."),
+                                  formats.prettyName(format)));
                        return false;
                }
        } else
@@ -90,14 +70,17 @@ bool Exporter::Export(Buffer * buffer, string const & format,
        else if (buffer->isDocBook())
                buffer->makeDocBookFile(filename, !put_in_tempdir);
        // LaTeX backend
-       else if (backend_format == format)
-               buffer->makeLaTeXFile(filename, string(), true);
-       else if (contains(buffer->filePath(), ' ')) {
+       else if (backend_format == format) {
+               runparams.nice = true;
+               buffer->makeLaTeXFile(filename, string(), runparams);
+       } else if (contains(buffer->filePath(), ' ')) {
                Alert::error(_("File name error"),
                           _("The directory path to the document cannot contain spaces."));
                return false;
-       } else
-               buffer->makeLaTeXFile(filename, buffer->filePath(), false);
+       } else {
+               runparams.nice = false;
+               buffer->makeLaTeXFile(filename, buffer->filePath(), runparams);
+       }
 
        string outfile_base = (put_in_tempdir)
                ? filename : buffer->getLatexName(false);