The Gtk patch.

[lyx.git] / src / exporter.C

diff --git a/src/exporter.C b/src/exporter.C
index 1882a89fe2d07d4c2dcb80c45496a10cb7d056f1..2f3ee4068372b1b86b5b266b16af9f29aca4c279 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -4,71 +4,73 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
+ * \author Alfredo Braunstein
+ * \author Lars Gullik Bjønnes
+ * \author Jean Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include <algorithm>
-
 #include "exporter.h"
 #include "buffer.h"
-#include "lyx_cb.h" //ShowMessage()
+#include "buffer_funcs.h"
 #include "support/filetools.h"
-#include "support/BoostFormat.h"
 #include "lyxrc.h"
 #include "converter.h"
 #include "format.h"
 #include "frontends/Alert.h"
 #include "gettext.h"
-#include "BufferView.h"
+
+#include <algorithm>
+
+using namespace lyx::support;
 
 using std::vector;
 using std::find;
 
-bool pdf_mode = false;
+
+namespace {
+
+vector<string> const Backends(Buffer const & buffer)
+{
+       vector<string> v;
+       if (buffer.params.getLyXTextClass().isTeXClassAvailable())
+               v.push_back(BufferFormat(buffer));
+       v.push_back("text");
+       return v;
+}
+
+} //namespace anon
+
 
 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;
-       vector<string> backends = Backends(buffer);
+       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();
                     it != backends.end(); ++it) {
                        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 +92,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);
@@ -107,11 +112,10 @@ bool Exporter::Export(Buffer * buffer, string const & format,
                return false;
 
        if (!put_in_tempdir)
-               ShowMessage(buffer,
-                           _("Document exported as ")
-                           + formats.prettyName(format)
-                           + _(" to file `")
-                           + MakeDisplayPath(result_file) +'\'');
+               buffer->message(_("Document exported as ")
+                                     + formats.prettyName(format)
+                                     + _(" to file `")
+                                     + MakeDisplayPath(result_file) +'\'');
        return true;
 }
 
@@ -129,11 +133,11 @@ bool Exporter::Preview(Buffer * buffer, string const & format)
        string result_file;
        if (!Export(buffer, format, true, result_file))
                return false;
-       return formats.view(buffer, result_file, format);
+       return formats.view(*buffer, result_file, format);
 }
 
 
-bool Exporter::IsExportable(Buffer const * buffer, string const & format)
+bool Exporter::IsExportable(Buffer const & buffer, string const & format)
 {
        vector<string> backends = Backends(buffer);
        for (vector<string>::const_iterator it = backends.begin();
@@ -145,7 +149,7 @@ bool Exporter::IsExportable(Buffer const * buffer, string const & format)
 
 
 vector<Format const *> const
-Exporter::GetExportableFormats(Buffer const * buffer, bool only_viewable)
+Exporter::GetExportableFormats(Buffer const & buffer, bool only_viewable)
 {
        vector<string> backends = Backends(buffer);
        vector<Format const *> result =
@@ -158,26 +162,3 @@ Exporter::GetExportableFormats(Buffer const * buffer, bool only_viewable)
        }
        return result;
 }
-
-
-string const Exporter::BufferFormat(Buffer const * buffer)
-{
-       if (buffer->isLinuxDoc())
-               return "linuxdoc";
-       else if (buffer->isDocBook())
-               return "docbook";
-       else if (buffer->isLiterate())
-               return "literate";
-       else
-               return "latex";
-}
-
-
-vector<string> const Exporter::Backends(Buffer const * buffer)
-{
-       vector<string> v;
-       if (buffer->params.getLyXTextClass().isTeXClassAvailable())
-               v.push_back(BufferFormat(buffer));
-       v.push_back("text");
-       return v;
-}