fix typo that put too many include paths for most people

[lyx.git] / src / exporter.C

diff --git a/src/exporter.C b/src/exporter.C
index 20dea0742e9c9e33ce2ff8ec90bae3e006721ad5..7d9c2b3f09de64253175d85e765b5bade4fd5122 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -1,10 +1,10 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -22,8 +22,9 @@
 #include "support/filetools.h"
 #include "lyxrc.h"
 #include "converter.h"
-#include "lyx_gui_misc.h" //WriteAlert
+#include "frontends/Alert.h"
 #include "gettext.h"
+#include "BufferView.h"
 
 using std::vector;
 using std::find;
@@ -31,23 +32,35 @@ using std::find;
 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()) {
+                       bv->redraw();
+                       bv->fitCursor();
+               }
+       }
+
        string backend_format;
        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) {
                        Converters::EdgePath p =
-                               converters.GetPath(*it, format);
+                               converters.getPath(*it, format);
                        if (!p.empty()) {
-                               lyxrc.pdf_mode = converters.UsePdflatex(p);
+                               lyxrc.pdf_mode = converters.usePdflatex(p);
                                backend_format = *it;
                                break;
                        }
                }
                if (backend_format.empty()) {
-                       WriteAlert(_("Can not export file"),
+                       Alert::alert(_("Cannot export file"),
                                   _("No information for exporting to ")
-                                  + formats.PrettyName(format));
+                                  + formats.prettyName(format));
                        return false;
                }
        } else
@@ -56,39 +69,39 @@ bool Exporter::Export(Buffer * buffer, string const & format,
        string filename = buffer->getLatexName(false);
        if (!buffer->tmppath.empty())
                filename = AddName(buffer->tmppath, filename);
-       filename = ChangeExtension(filename, 
-                                  formats.Extension(backend_format));
+       filename = ChangeExtension(filename,
+                                  formats.extension(backend_format));
 
        // Ascii backend
        if (backend_format == "text")
                buffer->writeFileAscii(filename, lyxrc.ascii_linelen);
        // Linuxdoc backend
        else if (buffer->isLinuxDoc())
-               buffer->makeLinuxDocFile(filename, true);
+               buffer->makeLinuxDocFile(filename, !put_in_tempdir);
        // Docbook backend
        else if (buffer->isDocBook())
-               buffer->makeDocBookFile(filename, true);
+               buffer->makeDocBookFile(filename, !put_in_tempdir);
        // LaTeX backend
        else if (backend_format == format)
                buffer->makeLaTeXFile(filename, string(), true);
-       else if (contains(buffer->filepath, ' ')) {
-               WriteAlert(_("Cannot run latex."),
+       else if (contains(buffer->filePath(), ' ')) {
+               Alert::alert(_("Cannot run latex."),
                           _("The path to the lyx file cannot contain spaces."));
                return false;
        } else
-               buffer->makeLaTeXFile(filename, buffer->filepath, false);
+               buffer->makeLaTeXFile(filename, buffer->filePath(), false);
 
        string outfile_base = (put_in_tempdir)
                ? filename : buffer->getLatexName(false);
 
-       if (!converters.Convert(buffer, filename, outfile_base,
+       if (!converters.convert(buffer, filename, outfile_base,
                                backend_format, format, result_file))
                return false;
 
        if (!put_in_tempdir)
                ShowMessage(buffer,
                            _("Document exported as ")
-                           + formats.PrettyName(format)
+                           + formats.prettyName(format)
                            + _(" to file `")
                            + MakeDisplayPath(result_file) +'\'');
        return true;
@@ -106,7 +119,7 @@ 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);
 }
 
 
@@ -115,7 +128,7 @@ bool Exporter::IsExportable(Buffer const * buffer, string const & format)
        vector<string> backends = Backends(buffer);
        for (vector<string>::const_iterator it = backends.begin();
             it != backends.end(); ++it)
-               if (converters.IsReachable(*it, format))
+               if (converters.isReachable(*it, format))
                        return true;
        return false;
 }
@@ -125,12 +138,12 @@ vector<Format const *> const
 Exporter::GetExportableFormats(Buffer const * buffer, bool only_viewable)
 {
        vector<string> backends = Backends(buffer);
-       vector<Format const *> result = 
-               converters.GetReachable(backends[0], only_viewable, true);
+       vector<Format const *> result =
+               converters.getReachable(backends[0], only_viewable, true);
        for (vector<string>::const_iterator it = backends.begin() + 1;
             it != backends.end(); ++it) {
                vector<Format const *>  r =
-                       converters.GetReachable(*it, only_viewable, false);
+                       converters.getReachable(*it, only_viewable, false);
                result.insert(result.end(), r.begin(), r.end());
        }
        return result;