X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=370843056bf2a18ce44abe252813bc62dd0746c0;hb=78046794ccfce3a20751e00b35295c290853afd6;hp=0e72ca8958e9022b0292f1892a4c76d9b4bb39f0;hpb=6280787bdb6da8181afb704a9dad8921cd41ef5c;p=lyx.git

diff --git a/src/converter.C b/src/converter.C
index 0e72ca8958..370843056b 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -1,63 +1,66 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file converter.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Dekel Tsur
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <cctype>
-
 #include "converter.h"
-#include "lyxrc.h"
+
 #include "buffer.h"
-#include "bufferview_funcs.h"
-#include "LaTeX.h"
-#include "frontends/LyXView.h"
-#include "lyx_cb.h" // ShowMessage()
-#include "gettext.h"
-#include "BufferView.h"
+#include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "debug.h"
+#include "format.h"
+#include "gettext.h"
+#include "LaTeX.h"
 
 #include "frontends/Alert.h"
 
 #include "support/filetools.h"
-#include "support/lyxfunctional.h"
+#include "support/lyxlib.h"
 #include "support/path.h"
 #include "support/systemcall.h"
 
-#ifndef CXX_GLOBAL_CSTD
-using std::isdigit;
-#endif
+using lyx::support::AddName;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::DirList;
+using lyx::support::GetExtension;
+using lyx::support::LibScriptSearch;
+using lyx::support::MakeRelPath;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::prefixIs;
+using lyx::support::QuoteName;
+using lyx::support::rename;
+using lyx::support::split;
+using lyx::support::subst;
+using lyx::support::Systemcall;
 
-using std::vector;
-using std::queue;
 using std::endl;
-using std::fill;
 using std::find_if;
-using std::reverse;
-using std::sort;
+using std::string;
+using std::vector;
 
-extern string system_lyxdir;
 
 namespace {
 
 string const token_from("$$i");
 string const token_base("$$b");
 string const token_to("$$o");
-string const token_lib("$$s");
+string const token_path("$$p");
+
 
-//////////////////////////////////////////////////////////////////////////////
 
-inline
 string const add_options(string const & command, string const & options)
 {
 	string head;
@@ -65,177 +68,32 @@ string const add_options(string const & command, string const & options)
 	return head + ' ' + options + ' ' + tail;
 }
 
-} // namespace anon
-
-//////////////////////////////////////////////////////////////////////////////
-
-bool Format::dummy() const
-{
-	return extension().empty();
-}
-
-
-bool Format::isChildFormat() const
-{
-	if (name_.empty())
-		return false;
-	return isdigit(name_[name_.length() - 1]);
-}
-
-
-string const Format::parentFormat() const
-{
-	return name_.substr(0, name_.length() - 1);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-// This method should return a reference, and throw an exception
-// if the format named name cannot be found (Lgb)
-Format const * Formats::getFormat(string const & name) const
-{
-	FormatList::const_iterator cit =
-		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
-	if (cit != formatlist.end())
-		return &(*cit);
-	else
-		return 0;
-}
-
-
-int Formats::getNumber(string const & name) const
-{
-	FormatList::const_iterator cit =
-		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
-	if (cit != formatlist.end())
-		return cit - formatlist.begin();
-	else
-		return -1;
-}
-
-
-void Formats::add(string const & name)
-{
-	if (!getFormat(name))
-		add(name, name, name, string());
-}
-
-
-void Formats::add(string const & name, string const & extension,
-		  string const & prettyname, string const & shortcut)
-{
-	FormatList::iterator it =
-		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
-	if (it == formatlist.end())
-		formatlist.push_back(Format(name, extension, prettyname,
-					    shortcut, ""));
-	else {
-		string viewer = it->viewer();
-		*it = Format(name, extension, prettyname, shortcut, viewer);
-	}
-}
-
-
-void Formats::erase(string const & name)
-{
-	FormatList::iterator it =
-		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
-	if (it != formatlist.end())
-		formatlist.erase(it);
-}
-
-
-void Formats::sort()
-{
-	std::sort(formatlist.begin(), formatlist.end());
-}
-
 
-void Formats::setViewer(string const & name, string const & command)
+string const dvipdfm_options(BufferParams const & bp)
 {
-	add(name);
-	FormatList::iterator it =
-		find_if(formatlist.begin(), formatlist.end(),
-			lyx::compare_memfun(&Format::name, name));
-	if (it != formatlist.end())
-		it->setViewer(command);
-}
-
-
-bool Formats::view(Buffer const * buffer, string const & filename,
-		   string const & format_name) const
-{
-	if (filename.empty())
-		return false;
+	string result;
 
-	Format const * format = getFormat(format_name);
-	if (format && format->viewer().empty() &&
-	    format->isChildFormat())
-		format = getFormat(format->parentFormat());
-	if (!format || format->viewer().empty()) {
-		Alert::alert(_("Cannot view file"),
-			   _("No information for viewing ")
-			   + prettyName(format_name));
-			   return false;
-	}
+	if (bp.papersize2 != VM_PAPER_CUSTOM) {
+		string const paper_size = bp.paperSizeName();
+		if (paper_size != "b5" && paper_size != "foolscap")
+			result = "-p "+ paper_size;
 
-	string command = format->viewer();
-
-	if (format_name == "dvi" &&
-	    !lyxrc.view_dvi_paper_option.empty()) {
-		command += " " + lyxrc.view_dvi_paper_option;
-		string paper_size = converters.papersize(buffer);
-		if (paper_size == "letter")
-			paper_size = "us";
-		command += " " + paper_size;
-		if (buffer->params.orientation
-		    == BufferParams::ORIENTATION_LANDSCAPE)
-			command += 'r';
+		if (bp.orientation == ORIENTATION_LANDSCAPE)
+			result += " -l";
 	}
 
-	command += " " + QuoteName(OnlyFilename((filename)));
-
-	lyxerr[Debug::FILES] << "Executing command: " << command << endl;
-	ShowMessage(buffer, _("Executing command:"), command);
-
-	Path p(OnlyPath(filename));
-	Systemcall one;
-	int const res = one.startscript(Systemcall::DontWait, command);
-
-	if (res) {
-		Alert::alert(_("Cannot view file"),
-			   _("Error while executing"),
-			   command.substr(0, 50));
-		return false;
-	}
-	return true;
+	return result;
 }
 
-
-string const Formats::prettyName(string const & name) const
-{
-	Format const * format = getFormat(name);
-	if (format)
-		return format->prettyname();
-	else
-		return name;
-}
+} // namespace anon
 
 
-string const Formats::extension(string const & name) const
-{
-	Format const * format = getFormat(name);
-	if (format)
-		return format->extension();
-	else
-		return name;
-}
+Converter::Converter(string const & f, string const & t, string const & c,
+	  string const & l): from(f), to(t), command(c), flags(l),
+			     From(0), To(0), latex(false),
+			     original_dir(false), need_aux(false)
+{}
 
-//////////////////////////////////////////////////////////////////////////////
 
 void Converter::readFlags()
 {
@@ -273,13 +131,12 @@ bool operator<(Converter const & a, Converter const & b)
 	int const i = compare_ascii_no_case(a.From->prettyname(),
 					    b.From->prettyname());
 	if (i == 0)
-		return compare_ascii_no_case(a.To->prettyname(), b.To->prettyname())
-			< 0;
+		return compare_ascii_no_case(a.To->prettyname(),
+					     b.To->prettyname()) < 0;
 	else
 		return i < 0;
 }
 
-//////////////////////////////////////////////////////////////////////////////
 
 class compare_Converter {
 public:
@@ -294,6 +151,7 @@ private:
 };
 
 
+
 Converter const * Converters::getConverter(string const & from,
 					    string const & to)
 {
@@ -398,172 +256,9 @@ void Converters::sort()
 }
 
 
-int Converters::bfs_init(string const & start, bool clear_visited)
+bool Converters::usePdflatex(Graph::EdgePath const & path)
 {
-	int const s = formats.getNumber(start);
-	if (s < 0)
-		return s;
-
-	Q_ = queue<int>();
-	if (clear_visited)
-		fill(visited_.begin(), visited_.end(), false);
-	if (visited_[s] == false) {
-		Q_.push(s);
-		visited_[s] = true;
-	}
-	return s;
-}
-
-
-vector<Format const *> const
-Converters::getReachableTo(string const & target, bool clear_visited)
-{
-	vector<Format const *> result;
-	int const s = bfs_init(target, clear_visited);
-	if (s < 0)
-		return result;
-
-	while (!Q_.empty()) {
-		int const i = Q_.front();
-		Q_.pop();
-		if (i != s || target != "lyx") {
-			result.push_back(&formats.get(i));
-		}
-
-		vector<int>::iterator it = vertices_[i].in_vertices.begin();
-		vector<int>::iterator end = vertices_[i].in_vertices.end();
-		for (; it != end; ++it) {
-			if (!visited_[*it]) {
-				visited_[*it] = true;
-				Q_.push(*it);
-			}
-		}
-	}
-
-	return result;
-}
-
-
-vector<Format const *> const
-Converters::getReachable(string const & from, bool only_viewable,
-			 bool clear_visited)
-{
-	vector<Format const *> result;
-
-	if (bfs_init(from, clear_visited) < 0)
-		return result;
-
-	while (!Q_.empty()) {
-		int const i = Q_.front();
-		Q_.pop();
-		Format const & format = formats.get(i);
-		if (format.name() == "lyx")
-			continue;
-		if (!only_viewable || !format.viewer().empty() ||
-		    format.isChildFormat())
-			result.push_back(&format);
-
-		vector<int>::const_iterator cit =
-			vertices_[i].out_vertices.begin();
-		vector<int>::const_iterator end =
-			vertices_[i].out_vertices.end();
-		for (; cit != end; ++cit)
-			if (!visited_[*cit]) {
-				visited_[*cit] = true;
-				Q_.push(*cit);
-			}
-	}
-
-	return result;
-}
-
-
-bool Converters::isReachable(string const & from, string const & to)
-{
-	if (from == to)
-		return true;
-
-	int const s = bfs_init(from);
-	int const t = formats.getNumber(to);
-	if (s < 0 || t < 0)
-		return false;
-
-	while (!Q_.empty()) {
-		int const i = Q_.front();
-		Q_.pop();
-		if (i == t)
-			return true;
-
-		vector<int>::const_iterator cit =
-			vertices_[i].out_vertices.begin();
-		vector<int>::const_iterator end =
-			vertices_[i].out_vertices.end();
-		for (; cit != end; ++cit) {
-			if (!visited_[*cit]) {
-				visited_[*cit] = true;
-				Q_.push(*cit);
-			}
-		}
-	}
-
-	return false;
-}
-
-
-Converters::EdgePath const
-Converters::getPath(string const & from, string const & to)
-{
-	EdgePath path;
-	if (from == to)
-		return path;
-
-	int const s = bfs_init(from);
-	int t = formats.getNumber(to);
-	if (s < 0 || t < 0)
-		return path;
-
-	vector<int> prev_edge(formats.size());
-	vector<int> prev_vertex(formats.size());
-
-	bool found = false;
-	while (!Q_.empty()) {
-		int const i = Q_.front();
-		Q_.pop();
-		if (i == t) {
-			found = true;
-			break;
-		}
-
-		vector<int>::const_iterator beg =
-			vertices_[i].out_vertices.begin();
-		vector<int>::const_iterator cit = beg;
-		vector<int>::const_iterator end =
-			vertices_[i].out_vertices.end();
-		for (; cit != end; ++cit)
-			if (!visited_[*cit]) {
-				int const j = *cit;
-				visited_[j] = true;
-				Q_.push(j);
-				int const k = cit - beg;
-				prev_edge[j] = vertices_[i].out_edges[k];
-				prev_vertex[j] = i;
-			}
-	}
-	if (!found)
-		return path;
-
-	while (t != s) {
-		path.push_back(prev_edge[t]);
-		t = prev_vertex[t];
-	}
-	reverse(path.begin(), path.end());
-	return path;
-}
-
-
-bool Converters::usePdflatex(EdgePath const & path)
-{
-	for (EdgePath::const_iterator cit = path.begin();
+	for (Graph::EdgePath::const_iterator cit = path.begin();
 	     cit != path.end(); ++cit) {
 		Converter const & conv = converterlist_[*cit];
 		if (conv.latex)
@@ -584,10 +279,13 @@ bool Converters::convert(Buffer const * buffer,
 	if (from_format == to_format)
 		return move(from_file, to_file, false);
 
-	EdgePath edgepath = getPath(from_format, to_format);
+	Graph::EdgePath edgepath = getPath(from_format, to_format);
 	if (edgepath.empty()) {
 		return false;
 	}
+	LatexRunParams runparams;
+	runparams.flavor = usePdflatex(edgepath) ?
+		LatexRunParams::PDFLATEX : LatexRunParams::LATEX;
 
 	string path = OnlyPath(from_file);
 	Path p(path);
@@ -597,7 +295,7 @@ bool Converters::convert(Buffer const * buffer,
 	string to_base = ChangeExtension(to_file, "");
 	string infile;
 	string outfile = from_file;
-	for (EdgePath::const_iterator cit = edgepath.begin();
+	for (Graph::EdgePath::const_iterator cit = edgepath.begin();
 	     cit != edgepath.end(); ++cit) {
 		Converter const & conv = converterlist_[*cit];
 		bool dummy = conv.To->dummy() && conv.to != "program";
@@ -612,11 +310,19 @@ bool Converters::convert(Buffer const * buffer,
 				  subst(conv.result_file,
 					token_base, OnlyFilename(from_base)));
 
+		// if input and output files are equal, we use a
+		// temporary file as intermediary (JMarc)
+		string real_outfile;
+		if (outfile == infile) {
+			real_outfile = infile;
+			outfile = AddName(buffer->temppath(), "tmpfile.out");
+		}
+
 		if (conv.latex) {
 			run_latex = true;
 			string command = subst(conv.command, token_from, "");
 			lyxerr[Debug::FILES] << "Running " << command << endl;
-			if (!runLaTeX(buffer, command))
+			if (!runLaTeX(*buffer, command, runparams))
 				return false;
 		} else {
 			if (conv.need_aux && !run_latex
@@ -624,43 +330,53 @@ bool Converters::convert(Buffer const * buffer,
 				lyxerr[Debug::FILES]
 					<< "Running " << latex_command_
 					<< " to update aux file"<<  endl;
-				runLaTeX(buffer, latex_command_);
+				runLaTeX(*buffer, latex_command_, runparams);
 			}
 
-			string const infile2 = (conv.original_dir)
+			string infile2 = (conv.original_dir)
 				? infile : MakeRelPath(infile, path);
-			string const outfile2 = (conv.original_dir)
+			string outfile2 = (conv.original_dir)
 				? outfile : MakeRelPath(outfile, path);
+
 			string command = conv.command;
 			command = subst(command, token_from, QuoteName(infile2));
 			command = subst(command, token_base, QuoteName(from_base));
 			command = subst(command, token_to, QuoteName(outfile2));
-			command = subst(command, token_lib, system_lyxdir + "scripts");
+			command = LibScriptSearch(command);
 
 			if (!conv.parselog.empty())
 				command += " 2> " + QuoteName(infile2 + ".out");
 
 			if (conv.from == "dvi" && conv.to == "ps")
 				command = add_options(command,
-						      dvips_options(buffer));
+						      buffer->params().dvips_options());
 			else if (conv.from == "dvi" && prefixIs(conv.to, "pdf"))
 				command = add_options(command,
-						      dvipdfm_options(buffer));
+						      dvipdfm_options(buffer->params()));
 
 			lyxerr[Debug::FILES] << "Calling " << command << endl;
-			if (buffer)
-				ShowMessage(buffer, _("Executing command:"), command);
+			buffer->message(_("Executing command: ") + command);
 
 			Systemcall::Starttype type = (dummy)
 				? Systemcall::DontWait : Systemcall::Wait;
 			Systemcall one;
 			int res;
-			if (conv.original_dir && buffer) {
+			if (conv.original_dir) {
 				Path p(buffer->filePath());
 				res = one.startscript(type, command);
 			} else
 				res = one.startscript(type, command);
 
+			if (!real_outfile.empty()) {
+				if (!rename(outfile, real_outfile))
+					res = -1;
+				else
+					lyxerr[Debug::FILES]
+						<< "renaming file " << outfile
+						<< " to " << real_outfile
+						<< endl;
+			}
+
 			if (!conv.parselog.empty()) {
 				string const logfile =  infile2 + ".log";
 				string const script = LibScriptSearch(conv.parselog);
@@ -668,18 +384,21 @@ bool Converters::convert(Buffer const * buffer,
 					" < " + QuoteName(infile2 + ".out") +
 					" > " + QuoteName(logfile);
 				one.startscript(Systemcall::Wait, command2);
-				if (!scanLog(buffer, command, logfile))
+				if (!scanLog(*buffer, command, logfile))
 					return false;
 			}
 
 			if (res) {
-				if (conv.to == "program")
-					Alert::alert(_("There were errors during the Build process."),
-						   _("You should try to fix them."));
-				else
-					Alert::alert(_("Cannot convert file"),
-						   "Error while executing",
-						   command.substr(0, 50));
+				if (conv.to == "program") {
+					Alert::error(_("Build errors"),
+						_("There were errors during the build process."));
+				} else {
+// FIXME: this should go out of here. For example, here we cannot say if
+// it is a document (.lyx) or something else. Same goes for elsewhere.
+				Alert::error(_("Cannot convert file"),
+					bformat(_("An error occurred whilst running %1$s"),
+						command.substr(0, 50)));
+				}
 				return false;
 			}
 		}
@@ -699,9 +418,10 @@ bool Converters::convert(Buffer const * buffer,
 					    token_base, from_base);
 			string to = subst(conv.result_dir,
 					  token_base, to_base);
-			if (!lyx::rename(from, to)) {
-				Alert::alert(_("Error while trying to move directory:"),
-					   from, ("to ") + to);
+			if (!rename(from, to)) {
+				Alert::error(_("Cannot convert file"),
+					bformat(_("Could not move a temporary file from %1$s to %2$s."),
+						from, to));
 				return false;
 			}
 		}
@@ -710,6 +430,7 @@ bool Converters::convert(Buffer const * buffer,
 		return move(outfile, to_file, conv.latex);
 }
 
+
 // If from = /path/file.ext and to = /path2/file2.ext2 then this method
 // moves each /path/file*.ext file to /path2/file2*.ext2'
 bool Converters::move(string const & from, string const & to, bool copy)
@@ -733,11 +454,12 @@ bool Converters::move(string const & from, string const & to, bool copy)
 			lyxerr[Debug::FILES] << "moving " << from2
 					     << " to " << to2 << endl;
 			bool const moved = (copy)
-				? lyx::copy(from2, to2)
-				: lyx::rename(from2, to2);
+				? lyx::support::copy(from2, to2)
+				: rename(from2, to2);
 			if (!moved && no_errors) {
-				Alert::alert(_("Error while trying to move file:"),
-					   from2, _("to ") + to2);
+				Alert::error(_("Cannot convert file"),
+					bformat(_("Could not move a temporary file from %1$s to %2$s."),
+						from2, to2));
 				no_errors = false;
 			}
 		}
@@ -746,8 +468,8 @@ bool Converters::move(string const & from, string const & to, bool copy)
 
 
 bool Converters::convert(Buffer const * buffer,
-			string const & from_file, string const & to_file_base,
-			string const & from_format, string const & to_format)
+			 string const & from_file, string const & to_file_base,
+			 string const & from_format, string const & to_format)
 {
 	string to_file;
 	return convert(buffer, from_file, to_file_base, from_format, to_format,
@@ -755,22 +477,6 @@ bool Converters::convert(Buffer const * buffer,
 }
 
 
-void Converters::buildGraph()
-{
-	vertices_ = vector<Vertex>(formats.size());
-	visited_.resize(formats.size());
-
-	for (ConverterList::iterator it = converterlist_.begin();
-	     it != converterlist_.end(); ++it) {
-		int const s = formats.getNumber(it->from);
-		int const t = formats.getNumber(it->to);
-		vertices_[t].in_vertices.push_back(s);
-		vertices_[s].out_vertices.push_back(t);
-		vertices_[s].out_edges.push_back(it - converterlist_.begin());
-	}
-}
-
-
 bool Converters::formatIsUsed(string const & format)
 {
 	ConverterList::const_iterator cit = converterlist_.begin();
@@ -783,115 +489,67 @@ bool Converters::formatIsUsed(string const & format)
 }
 
 
-bool Converters::scanLog(Buffer const * buffer, string const & command,
-			string const & filename)
+bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
+			 string const & filename)
 {
-	if (!buffer)
-		return false;
-
-	BufferView * bv = buffer->getUser();
-	if (bv) {
-		bv->owner()->prohibitInput();
-		// all error insets should have been removed by now
-	}
-
-	LaTeX latex("", filename, "");
+	LatexRunParams runparams;
+	runparams.flavor = LatexRunParams::LATEX;
+	LaTeX latex("", runparams, filename, "");
 	TeXErrors terr;
 	int result = latex.scanLogFile(terr);
-	if (bv) {
-		if ((result & LaTeX::ERRORS)) {
-			// Insert all errors as errors boxes
-			bv->insertErrors(terr);
-#warning repaint() or update() or nothing ?
-			bv->repaint();
-			bv->fitCursor();
-		}
-		bv->owner()->allowInput();
-	}
 
-	if ((result & LaTeX::ERRORS)) {
-		int num_errors = latex.getNumErrors();
-		string s;
-		string t;
-		if (num_errors == 1) {
-			s = _("One error detected");
-			t = _("You should try to fix it.");
-		} else {
-			s = tostr(num_errors);
-			s += _(" errors detected.");
-			t = _("You should try to fix them.");
-		}
-		string head;
-		split(command, head, ' ');
-		Alert::alert(_("There were errors during running of ") + head,
-			   s, t);
-		return false;
-	} else if (result & LaTeX::NO_OUTPUT) {
-		string const s = _("The operation resulted in");
-		string const t = _("an empty file.");
-		Alert::alert(_("Resulting file is empty"), s, t);
-		return false;
-	}
+	if (result & LaTeX::ERRORS)
+		bufferErrors(buffer, terr);
+
 	return true;
 }
 
+namespace {
 
-bool Converters::runLaTeX(Buffer const * buffer, string const & command)
-{
-	if (!buffer)
-		return false;
+class showMessage : public boost::signals::trackable {
+public:
+	showMessage(Buffer const & b) : buffer_(b) {};
+	void operator()(string const & m)
+	{
+		buffer_.message(m);
+	}
+private:
+	Buffer const & buffer_;
+};
 
-	BufferView * bv = buffer->getUser();
+}
 
-	if (bv) {
-		bv->owner()->prohibitInput();
-		bv->owner()->message(_("Running LaTeX..."));
-		// all the autoinsets have already been removed
-	}
+
+bool Converters::runLaTeX(Buffer const & buffer, string const & command,
+			  LatexRunParams const & runparams)
+{
+	buffer.busy(true);
+	buffer.message(_("Running LaTeX..."));
 
 	// do the LaTeX run(s)
-	string name = buffer->getLatexName();
-	LaTeX latex(command, name, buffer->filePath());
+	string name = buffer.getLatexName();
+	LaTeX latex(command, runparams, name, buffer.filePath());
 	TeXErrors terr;
-	int result = latex.run(terr,
-			       bv ? bv->owner()->getLyXFunc() : 0);
-
-	if (bv) {
-		if ((result & LaTeX::ERRORS)) {
-			// Insert all errors as errors boxes
-			bv->insertErrors(terr);
-#warning repaint() or update() or nothing ?
-			bv->repaint();
-			bv->fitCursor();
-		}
-	}
+	showMessage show(buffer);
+	latex.message.connect(show);
+	int result = latex.run(terr);
+
+	if (result & LaTeX::ERRORS)
+		bufferErrors(buffer, terr);
 
 	// check return value from latex.run().
 	if ((result & LaTeX::NO_LOGFILE)) {
-		Alert::alert(_("LaTeX did not work!"),
-			   _("Missing log file:"), name);
-	} else if ((result & LaTeX::ERRORS)) {
-		int num_errors = latex.getNumErrors();
-		string s;
-		string t;
-		if (num_errors == 1) {
-			s = _("One error detected");
-			t = _("You should try to fix it.");
-		} else {
-			s = tostr(num_errors);
-			s += _(" errors detected.");
-			t = _("You should try to fix them.");
-		}
-		Alert::alert(_("There were errors during the LaTeX run."),
-			   s, t);
-	}  else if (result & LaTeX::NO_OUTPUT) {
-		string const s = _("The operation resulted in");
-		string const t = _("an empty file.");
-		Alert::alert(_("Resulting file is empty"), s, t);
+		string str = bformat(_("LaTeX did not run successfully. "
+				       "Additionally, LyX could not locate "
+				       "the LaTeX log %1$s."), name);
+		Alert::error(_("LaTeX failed"), str);
+	} else if (result & LaTeX::NO_OUTPUT) {
+		Alert::warning(_("Output is empty"),
+			       _("An empty output file was generated."));
 	}
 
-	if (bv)
-		bv->owner()->allowInput();
+
+	buffer.busy(false);
 
 	int const ERROR_MASK =
 			LaTeX::NO_LOGFILE |
@@ -903,90 +561,74 @@ bool Converters::runLaTeX(Buffer const * buffer, string const & command)
 }
 
 
-string const Converters::papersize(Buffer const * buffer)
+
+void Converters::buildGraph()
 {
-	char real_papersize = buffer->params.papersize;
-	if (real_papersize == BufferParams::PAPER_DEFAULT)
-		real_papersize = lyxrc.default_papersize;
-
-	switch (real_papersize) {
-	case BufferParams::PAPER_A3PAPER:
-		return "a3";
-	case BufferParams::PAPER_A4PAPER:
-		return "a4";
-	case BufferParams::PAPER_A5PAPER:
-		return "a5";
-	case BufferParams::PAPER_B5PAPER:
-		return "b5";
-	case BufferParams::PAPER_EXECUTIVEPAPER:
-		return "foolscap";
-	case BufferParams::PAPER_LEGALPAPER:
-		return "legal";
-	case BufferParams::PAPER_USLETTER:
-	default:
-		return "letter";
+	G_.init(formats.size());
+	ConverterList::iterator beg = converterlist_.begin();
+	ConverterList::iterator end = converterlist_.end();
+	for (ConverterList::iterator it = beg; it != end ; ++it) {
+		int const s = formats.getNumber(it->from);
+		int const t = formats.getNumber(it->to);
+		G_.addEdge(s,t);
 	}
 }
 
 
-string const Converters::dvips_options(Buffer const * buffer)
+std::vector<Format const *> const
+Converters::intToFormat(std::vector<int> const & input)
 {
-	string result;
-	if (!buffer)
-		return result;
-
-	if (buffer->params.use_geometry
-	    && buffer->params.papersize2 == BufferParams::VM_PAPER_CUSTOM
-	    && !lyxrc.print_paper_dimension_flag.empty()
-	    && !buffer->params.paperwidth.empty()
-	    && !buffer->params.paperheight.empty()) {
-		// using a custom papersize
-		result = lyxrc.print_paper_dimension_flag;
-		result += ' ' + buffer->params.paperwidth;
-		result += ',' + buffer->params.paperheight;
-	} else {
-		string const paper_option = papersize(buffer);
-		if (paper_option != "letter" ||
-		    buffer->params.orientation != BufferParams::ORIENTATION_LANDSCAPE) {
-			// dvips won't accept -t letter -t landscape.  In all other
-			// cases, include the paper size explicitly.
-			result = lyxrc.print_paper_flag;
-			result += ' ' + paper_option;
-		}
+	vector<Format const *> result(input.size());
+
+	vector<int>::const_iterator it = input.begin();
+	vector<int>::const_iterator end = input.end();
+	vector<Format const *>::iterator rit = result.begin();
+	for ( ; it != end; ++it, ++rit) {
+		*rit = &formats.get(*it);
 	}
-	if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE &&
-	    buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM)
-		result += ' ' + lyxrc.print_landscape_flag;
 	return result;
 }
 
+vector<Format const *> const
+Converters::getReachableTo(string const & target, bool clear_visited)
+{
+	vector<int> const & reachablesto =
+		G_.getReachableTo(formats.getNumber(target), clear_visited);
+
+	return intToFormat(reachablesto);
+}
+
 
-string const Converters::dvipdfm_options(Buffer const * buffer)
+vector<Format const *> const
+Converters::getReachable(string const & from, bool only_viewable,
+			 bool clear_visited)
 {
-	string result;
-	if (!buffer)
-		return result;
+	vector<int> const & reachables =
+		G_.getReachable(formats.getNumber(from),
+				only_viewable,
+				clear_visited);
 
-	if (buffer->params.papersize2 != BufferParams::VM_PAPER_CUSTOM) {
-		string const paper_size = papersize(buffer);
-		if (paper_size != "b5" && paper_size != "foolscap")
-			result = "-p "+ paper_size;
+	return intToFormat(reachables);
+}
 
-		if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE)
-			result += " -l";
-	}
 
-	return result;
+bool Converters::isReachable(string const & from, string const & to)
+{
+	return G_.isReachable(formats.getNumber(from),
+			      formats.getNumber(to));
 }
 
 
-vector<Converters::Vertex> Converters::vertices_;
+Graph::EdgePath const
+Converters::getPath(string const & from, string const & to)
+{
+	return G_.getPath(formats.getNumber(from),
+			  formats.getNumber(to));
+}
 
 
 /// The global instance
-Formats formats;
 Converters converters;
 
 // The global copy after reading lyxrc.defaults
-Formats system_formats;
 Converters system_converters;