X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fexporter.C;h=098f24979709833f0b653843ff515ba0e9450ec2;hb=b99a5acc7f18c3f885856fa962c0f0a63a0ca5ad;hp=46ec172d73b3f780e90b29d2ac9fa2a36b663cc0;hpb=83acbbd5237373926c629855379e1df9a04209b2;p=lyx.git

diff --git a/src/exporter.C b/src/exporter.C
index 46ec172d73..098f249797 100644
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -10,10 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <algorithm>
 
 #include "exporter.h"
@@ -22,8 +18,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 +28,36 @@ 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()) {
+#warning repaint() or update() or nothing ?
+			bv->repaint();
+			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,44 +66,45 @@ 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;
 }
 
+
 bool Exporter::Export(Buffer * buffer, string const & format,
 		      bool put_in_tempdir)
 {
@@ -101,12 +112,13 @@ bool Exporter::Export(Buffer * buffer, string const & format,
 	return Export(buffer, format, put_in_tempdir, result_file);
 }
 
+
 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 +127,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 +137,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;
@@ -149,6 +161,7 @@ string const Exporter::BufferFormat(Buffer const * buffer)
 		return "latex";
 }
 
+
 vector<string> const Exporter::Backends(Buffer const * buffer)
 {
 	vector<string> v;