X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fexporter.C;h=7d9c2b3f09de64253175d85e765b5bade4fd5122;hb=06f9f0ea08ddcf13e99ea02cff21471aa2020c9e;hp=a5ebfbe540d647383d72bdbb48c81dccf36183eb;hpb=8aff605caefaba655e48bc629ed344bb74bcd61a;p=lyx.git

diff --git a/src/exporter.C b/src/exporter.C
index a5ebfbe540..7d9c2b3f09 100644
--- 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.
  *
  * ====================================================== */
 
@@ -14,58 +14,94 @@
 #pragma implementation
 #endif
 
+#include <algorithm>
+
 #include "exporter.h"
 #include "buffer.h"
 #include "lyx_cb.h" //ShowMessage()
 #include "support/filetools.h"
 #include "lyxrc.h"
 #include "converter.h"
+#include "frontends/Alert.h"
+#include "gettext.h"
+#include "BufferView.h"
 
 using std::vector;
+using std::find;
 
-bool Exporter::Export(Buffer * buffer, string const & format0,
+bool Exporter::Export(Buffer * buffer, string const & format,
 		      bool put_in_tempdir, string & result_file)
 {
-	string format;
-	string using_format = Converter::SplitFormat(format0, format);
-
-	string backend_format = (format == "text") 
-		? format : BufferFormat(buffer);
-	bool only_backend = backend_format == format;
+	// 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);
+			if (!p.empty()) {
+				lyxrc.pdf_mode = converters.usePdflatex(p);
+				backend_format = *it;
+				break;
+			}
+		}
+		if (backend_format.empty()) {
+			Alert::alert(_("Cannot export file"),
+				   _("No information for exporting to ")
+				   + formats.prettyName(format));
+			return false;
+		}
+	} else
+		backend_format = 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 (only_backend)
+	else if (backend_format == format)
 		buffer->makeLaTeXFile(filename, string(), true);
-	else
-		buffer->makeLaTeXFile(filename, buffer->filepath, false);
+	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);
 
 	string outfile_base = (put_in_tempdir)
 		? filename : buffer->getLatexName(false);
 
-	if (!Converter::Convert(buffer, filename, outfile_base,
-				backend_format, format, using_format,
-				result_file))
+	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;
@@ -78,44 +114,38 @@ bool Exporter::Export(Buffer * buffer, string const & format,
 	return Export(buffer, format, put_in_tempdir, result_file);
 }
 
-bool Exporter::Preview(Buffer * buffer, string const & format0)
+bool Exporter::Preview(Buffer * buffer, string const & format)
 {
 	string result_file;
-	if (!Export(buffer, format0, true, result_file))
+	if (!Export(buffer, format, true, result_file))
 		return false;
-	string format;
-	Converter::SplitFormat(format0, format);
-	return Formats::View(buffer, result_file, format);
+	return formats.view(buffer, result_file, format);
 }
 
 
 bool Exporter::IsExportable(Buffer const * buffer, string const & format)
 {
-	return format == "text" ||
-		Converter::IsReachable(BufferFormat(buffer), format);
+	vector<string> backends = Backends(buffer);
+	for (vector<string>::const_iterator it = backends.begin();
+	     it != backends.end(); ++it)
+		if (converters.isReachable(*it, format))
+			return true;
+	return false;
 }
 
 
-vector<FormatPair> const
-Exporter::GetExportableFormats(Buffer const * buffer)
+vector<Format const *> const
+Exporter::GetExportableFormats(Buffer const * buffer, bool only_viewable)
 {
-	vector<FormatPair> result = 
-		Converter::GetReachable(BufferFormat(buffer), "lyx", false);
-	Format * format = Formats::GetFormat("text");
-	if (format)
-		result.push_back(FormatPair(format , 0, ""));
-	return result;
-}
-
-
-vector<FormatPair> const
-Exporter::GetViewableFormats(Buffer const * buffer)
-{
-	vector<FormatPair> result = 
-		Converter::GetReachable(BufferFormat(buffer), "lyx", true);
-	Format * format = Formats::GetFormat("text");
-	if (format && !format->viewer.empty())
-		result.push_back(FormatPair(format , 0, ""));
+	vector<string> backends = Backends(buffer);
+	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);
+		result.insert(result.end(), r.begin(), r.end());
+	}
 	return result;
 }
 
@@ -131,3 +161,11 @@ string const Exporter::BufferFormat(Buffer const * buffer)
 	else
 		return "latex";
 }
+
+vector<string> const Exporter::Backends(Buffer const * buffer)
+{
+	vector<string> v;
+	v.push_back(BufferFormat(buffer));
+	v.push_back("text");
+	return v;
+}