"Inter-word Space"

[lyx.git] / src / exporter.C

diff --git a/src/exporter.C b/src/exporter.C
index bd11cd235434d5955c5ecd70abc7c82549d78ba5..c84c7cd49d77d89c7fe0d0d5743f593a5478bacc 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -26,25 +26,12 @@
 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();
@@ -52,7 +39,8 @@ 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;
                        }
@@ -82,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);