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

diff --git a/src/converter.C b/src/converter.C
index 99580fe06f..370843056b 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -1,410 +1,634 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file converter.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Dekel Tsur
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <queue>
-#include <stack>
-#include <algorithm>
-#include <stdio.h>
-
 #include "converter.h"
-#include "lyxrc.h"
-#include "support/syscall.h"
-#include "support/path.h"
-#include "debug.h"
-#include "buffer.h"
 
-#include "bufferview_funcs.h"
+#include "buffer.h"
+#include "buffer_funcs.h"
+#include "bufferparams.h"
+#include "debug.h"
+#include "format.h"
+#include "gettext.h"
 #include "LaTeX.h"
-#include "LyXView.h"
-#include "minibuffer.h"
-#include "lyx_gui_misc.h"
-#include "lyx_cb.h"
 
-using std::map;
-using std::vector;
-using std::queue;
-using std::pair;
-using std::sort;
-using std::stack;
+#include "frontends/Alert.h"
+
+#include "support/filetools.h"
+#include "support/lyxlib.h"
+#include "support/path.h"
+#include "support/systemcall.h"
+
+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::endl;
+using std::find_if;
+using std::string;
+using std::vector;
 
-//////////////////////////////////////////////////////////////////////////////
 
-map<string, Format> Formats::formats;
-vector<Command> Converter::commands;
+namespace {
 
-//////////////////////////////////////////////////////////////////////////////
+string const token_from("$$i");
+string const token_base("$$b");
+string const token_to("$$o");
+string const token_path("$$p");
 
-Format::Format(string const & n)
-	: name(n), in_degree(0)
-{
-	struct Item {
-		char const * name;
-		char const * prettyname;
-	};
-	Item items[] = {
-		{ "tex", "LaTeX" },
-		{ "dvi", "DVI" },
-		{ "ps", "PostScript" },
-		{ "txt", "Ascii" },
-		{ "html", "HTML" },
-		{ "pdf", "PDF" },
-		{ 0, 0}
-	};
-
-	prettyname = n;
-	for (int i = 0; items[i].name != 0; ++i)
-		if (items[i].name == n) {
-			prettyname = items[i].prettyname;
-			break;
-		}
-}
 
 
-void Formats::Add(string const & name)
+string const add_options(string const & command, string const & options)
 {
-	if (formats.find(name) == formats.end())
-		formats[name] = Format(name);
+	string head;
+	string const tail = split(command, head, ' ');
+	return head + ' ' + options + ' ' + tail;
 }
 
 
-void Formats::SetViewer(string const & name, string const & command)
+string const dvipdfm_options(BufferParams const & bp)
 {
-	Add(name);
-	Format * f = GetFormat(name);
-	if (!f->viewer.empty())
-		lyxerr << "Error: a viewer for " << name
-		       << " is already defined!" << endl;
-	else
-		f->viewer = command;
+	string result;
+
+	if (bp.papersize2 != VM_PAPER_CUSTOM) {
+		string const paper_size = bp.paperSizeName();
+		if (paper_size != "b5" && paper_size != "foolscap")
+			result = "-p "+ paper_size;
+
+		if (bp.orientation == ORIENTATION_LANDSCAPE)
+			result += " -l";
+	}
+
+	return result;
 }
 
+} // namespace anon
+
 
-bool Formats::View(string const & filename)
+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()
 {
-	string extension = GetExtension(filename);
-	Format * format = GetFormat(extension);
-	if (!format || format->viewer.empty()) {
-		WriteAlert(_("Can not view file"),
-			   _("No information for viewing ")
-			   + Formats::PrettyName(extension));
-			   return false;
+	string flag_list(flags);
+	while (!flag_list.empty()) {
+		string flag_name, flag_value;
+		flag_list = split(flag_list, flag_value, ',');
+		flag_value = split(flag_value, flag_name, '=');
+		if (flag_name == "latex")
+			latex = true;
+		else if (flag_name == "originaldir")
+			original_dir = true;
+		else if (flag_name == "needaux")
+			need_aux = true;
+		else if (flag_name == "resultdir")
+			result_dir = (flag_value.empty())
+				? token_base : flag_value;
+		else if (flag_name == "resultfile")
+			result_file = flag_value;
+		else if (flag_name == "parselog")
+			parselog = flag_value;
 	}
+	if (!result_dir.empty() && result_file.empty())
+		result_file = "index." + formats.extension(to);
+	//if (!contains(command, token_from))
+	//	latex = true;
+}
 
-	string command = format->viewer;
-	command = subst(command, "$$FName", filename);
-#ifndef __EMX__
-	command += " &";
-#else
-	// OS/2 cmd.exe has another use for '&'
-	// This is not NLS safe, but it's OK, I think.
-	string sh = OnlyFilename(GetEnvPath("EMXSHELL"));
-	if (sh.empty()) {
-		// COMSPEC is set, unless user unsets 
-		sh = OnlyFilename(GetEnvPath("COMSPEC"));
-		if (sh.empty())
-			sh = "cmd.exe";
-	}
-	sh = lowercase(sh);
-	if (contains(sh, "cmd.exe")
-	    || contains(sh, "4os2.exe"))
-		command = "start /min/n " + command;
+
+bool operator<(Converter const & a, Converter const & b)
+{
+	// use the compare_ascii_no_case instead of compare_no_case,
+	// because in turkish, 'i' is not the lowercase version of 'I',
+	// and thus turkish locale breaks parsing of tags.
+	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;
 	else
-		command += " &";
-#endif
-	lyxerr << "Executing command: " << command << endl;
-	//ShowMessage(buffer, _("Executing command:"), command);
-	Systemcalls one;
-	int res = one.startscript(Systemcalls::System, command);
-
-	if (res) {
-		WriteAlert(_("Can not view file"),
-			   _("Error while executing"),
-			   command.substr(0, 50));
-		return false;
-	}
-	return true;
+		return i < 0;
 }
 
 
-Format * Formats::GetFormat(string const & name)
+class compare_Converter {
+public:
+	compare_Converter(string const & f, string const & t)
+		: from(f), to(t) {}
+	bool operator()(Converter const & c) {
+		return c.from == from && c.to == to;
+	}
+private:
+	string const & from;
+	string const & to;
+};
+
+
+
+Converter const * Converters::getConverter(string const & from,
+					    string const & to)
 {
-	map<string, Format>::iterator it = formats.find(name);
-	if (it != formats.end())
-		return &(*it).second;
+	ConverterList::const_iterator cit =
+		find_if(converterlist_.begin(), converterlist_.end(),
+			compare_Converter(from, to));
+	if (cit != converterlist_.end())
+		return &(*cit);
 	else
 		return 0;
 }
 
-string const Formats::PrettyName(string const & name)
+
+int Converters::getNumber(string const & from, string const & to)
 {
-	string format;
-	Converter::SplitFormat(name, format);
-	Format * f = GetFormat(format);
-	if (f)
-		return f->prettyname;
+	ConverterList::const_iterator cit =
+		find_if(converterlist_.begin(), converterlist_.end(),
+			compare_Converter(from, to));
+	if (cit != converterlist_.end())
+		return cit - converterlist_.begin();
 	else
-		return format;
+		return -1;
 }
 
 
-//////////////////////////////////////////////////////////////////////////////
-void Converter::Add(string const & from, string const & to,
-		    string const & command, string const & flags)
+void Converters::add(string const & from, string const & to,
+		     string const & command, string const & flags)
 {
-	for (vector<Command>::const_iterator cit = commands.begin();
-	     cit != commands.end(); ++cit)
-		if ((*cit).from == from && (*cit).to == to) {
-			lyxerr << "Error: Convertor from " << from
-			       << " to " << to
-			       << " already exists!" << endl;
-			return;
-		}
-	bool original_dir = flags == "origdir";
-	commands.push_back(Command(from, to, command, original_dir));
+	formats.add(from);
+	formats.add(to);
+	ConverterList::iterator it = find_if(converterlist_.begin(),
+					     converterlist_.end(),
+					     compare_Converter(from, to));
+
+	Converter converter(from, to, command, flags);
+	if (it != converterlist_.end() && !flags.empty() && flags[0] == '*') {
+		converter = *it;
+		converter.command = command;
+		converter.flags = flags;
+	}
+	converter.readFlags();
+
+	if (converter.latex && (latex_command_.empty() || to == "dvi"))
+		latex_command_ = subst(command, token_from, "");
+	// If we have both latex & pdflatex, we set latex_command to latex.
+	// The latex_command is used to update the .aux file when running
+	// a converter that uses it.
+
+	if (it == converterlist_.end()) {
+		converterlist_.push_back(converter);
+	} else {
+		converter.From = it->From;
+		converter.To = it->To;
+		*it = converter;
+	}
+}
+
 
-	Formats::Add(from);
-	Formats::Add(to);
-	++Formats::GetFormat(to)->in_degree;
+void Converters::erase(string const & from, string const & to)
+{
+	ConverterList::iterator it = find_if(converterlist_.begin(),
+					     converterlist_.end(),
+					     compare_Converter(from, to));
+	if (it != converterlist_.end())
+		converterlist_.erase(it);
 }
 
 
-vector< pair<string,string> > const
-Converter::GetReachable(string const & from, bool only_viewable)
+// This method updates the pointers From and To in all the converters.
+// The code is not very efficient, but it doesn't matter as the number
+// of formats and converters is small.
+// Furthermore, this method is called only on startup, or after
+// adding/deleting a format in FormPreferences (the latter calls can be
+// eliminated if the formats in the Formats class are stored using a map or
+// a list (instead of a vector), but this will cause other problems).
+void Converters::update(Formats const & formats)
 {
-	vector< pair<string,string> > result;
-	Format * format = Formats::GetFormat(from);
-	if (!format)
-		return result;
-
-	int sort_start = 0;
-	if (!only_viewable || !format->viewer.empty()) {
-		result.push_back(pair<string,string>(from, format->prettyname));
-		sort_start = 1;
+	ConverterList::iterator it = converterlist_.begin();
+	ConverterList::iterator end = converterlist_.end();
+	for (; it != end; ++it) {
+		it->From = formats.getFormat(it->from);
+		it->To = formats.getFormat(it->to);
 	}
+}
 
-	queue< vector<Command>::iterator > Q;
-	for (vector<Command>::iterator it = commands.begin();
-	     it != commands.end(); ++it)
-		if ((*it).from == from) {
-			Q.push(it);
-			(*it).visited = true;
-		} else
-			(*it).visited = false;
-
-	while (!Q.empty()) {
-		vector<Command>::iterator it = Q.front();
-		format = Formats::GetFormat((*it).to);
-		string name = format->name;
-		string prettyname = format->prettyname;
-		if (format->in_degree > 1) {
-			name += ":" + (*it).from;
-			string tmp;
-			split((*it).command, tmp, ' ');
-			prettyname  += _("(using ") + tmp + ")";	
-		}
-		if (!only_viewable || !format->viewer.empty())
-			result.push_back(pair<string,string>(name, prettyname));
-		Q.pop();
-		for (vector<Command>::iterator it2 = commands.begin();
-		     it2 != commands.end(); ++it2)
-			if (!(*it2).visited && (*it).to == (*it2).from) {
-				Q.push(it2);
-				(*it2).visited = true;
-			}
-	}
 
-	sort(result.begin() + sort_start, result.end());
-	return result;
+// This method updates the pointers From and To in the last converter.
+// It is called when adding a new converter in FormPreferences
+void Converters::updateLast(Formats const & formats)
+{
+	if (converterlist_.begin() != converterlist_.end()) {
+		ConverterList::iterator it = converterlist_.end() - 1;
+		it->From = formats.getFormat(it->from);
+		it->To = formats.getFormat(it->to);
+	}
 }
 
 
-bool Converter::convert(Buffer * buffer, string const & from_file,
-			string const & to_format)
-
+void Converters::sort()
 {
-	string format;
-	string using_format = SplitFormat(to_format, format);
-	string from_format = GetExtension(from_file);
-	if (from_format == format)
-		return true;
+	std::sort(converterlist_.begin(), converterlist_.end());
+}
 
-	queue< vector<Command>::iterator > Q;
-	for (vector<Command>::iterator it = commands.begin();
-	     it != commands.end(); ++it)
-		if ((*it).from == from_format) {
-			Q.push(it);
-			(*it).visited = true;
-			(*it).previous = commands.end();
-		} else
-			(*it).visited = false;
-
-	if (Q.empty()) {
-		WriteAlert(_("Can not convert file"),
-			   ("Unknown format ") + from_format);
-		return false;
-	}
 
-	bool found = false;
-	vector<Command>::iterator it;
-	while (!Q.empty()) {
-		it = Q.front();
-		if ((*it).to == format &&
-		    (using_format.empty() || using_format == (*it).from)) {
-			found = true;
-			break;
-		}
-		Q.pop();
-		for (vector<Command>::iterator it2 = commands.begin();
-		     it2 != commands.end(); ++it2)
-			if (!(*it2).visited && (*it).to == (*it2).from) {
-				Q.push(it2);
-				(*it2).visited = true;
-				(*it2).previous = it;
-			}
+bool Converters::usePdflatex(Graph::EdgePath const & path)
+{
+	for (Graph::EdgePath::const_iterator cit = path.begin();
+	     cit != path.end(); ++cit) {
+		Converter const & conv = converterlist_[*cit];
+		if (conv.latex)
+			return contains(conv.to, "pdf");
 	}
+	return false;
+}
 
-	if (!found) {
-		WriteAlert(_("Can not convert file"),
-			   _("No information for converting from ")
-			   + Formats::PrettyName(from_format) + _(" to ")
-			   + Formats::PrettyName(to_format));
-		return false;
-	}
 
-	stack< vector<Command>::iterator > S;
-	while (it != commands.end()) {
-		S.push(it);
-		it = (*it).previous;
-	}
+bool Converters::convert(Buffer const * buffer,
+			 string const & from_file, string const & to_file_base,
+			 string const & from_format, string const & to_format,
+			 string & to_file)
+{
+	to_file = ChangeExtension(to_file_base,
+				  formats.extension(to_format));
 
-	//Path p(OnlyPath(buffer->fileName()));
-	Path p(OnlyPath(from_file));
+	if (from_format == to_format)
+		return move(from_file, to_file, false);
 
-	string basename = ChangeExtension(from_file, "");
-	while (!S.empty()) {
-		it = S.top();
-		S.pop();
-		lyxerr << "Converting from  "
-		       << (*it).from << " to " << (*it).to << endl;
+	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);
+
+	bool run_latex = false;
+	string from_base = ChangeExtension(from_file, "");
+	string to_base = ChangeExtension(to_file, "");
+	string infile;
+	string outfile = from_file;
+	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";
+		if (!dummy)
+			lyxerr[Debug::FILES] << "Converting from  "
+			       << conv.from << " to " << conv.to << endl;
+		infile = outfile;
+		outfile = conv.result_dir.empty()
+			? ChangeExtension(from_file, conv.To->extension())
+			: AddName(subst(conv.result_dir,
+					token_base, from_base),
+				  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 ((*it).from == "tex" &&
-		    ( (*it).to == "dvi" || (*it).to == "pdf") ) {
-			lyxrc.pdf_mode = (*it).to == "pdf";
-			if (!runLaTeX(buffer, (*it).command))
+		if (conv.latex) {
+			run_latex = true;
+			string command = subst(conv.command, token_from, "");
+			lyxerr[Debug::FILES] << "Running " << command << endl;
+			if (!runLaTeX(*buffer, command, runparams))
 				return false;
 		} else {
-			string infile = ChangeExtension(from_file, (*it).from);
-			if (!(*it).original_dir)
-				infile = OnlyFilename(infile);
-			string outfile = ChangeExtension(infile, (*it).to);
-
-			string command = (*it).command;
-			command = subst(command, "$$FName", infile);
-			command = subst(command, "$$BaseName", basename);
-			command = subst(command, "$$OutName", outfile);
-			lyxerr << "Calling " << command << endl;
-			ShowMessage(buffer, _("Executing command:"), command);
-			
-			Systemcalls one;
+			if (conv.need_aux && !run_latex
+			    && !latex_command_.empty()) {
+				lyxerr[Debug::FILES]
+					<< "Running " << latex_command_
+					<< " to update aux file"<<  endl;
+				runLaTeX(*buffer, latex_command_, runparams);
+			}
+
+			string infile2 = (conv.original_dir)
+				? infile : MakeRelPath(infile, path);
+			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 = LibScriptSearch(command);
+
+			if (!conv.parselog.empty())
+				command += " 2> " + QuoteName(infile2 + ".out");
+
+			if (conv.from == "dvi" && conv.to == "ps")
+				command = add_options(command,
+						      buffer->params().dvips_options());
+			else if (conv.from == "dvi" && prefixIs(conv.to, "pdf"))
+				command = add_options(command,
+						      dvipdfm_options(buffer->params()));
+
+			lyxerr[Debug::FILES] << "Calling " << command << endl;
+			buffer->message(_("Executing command: ") + command);
+
+			Systemcall::Starttype type = (dummy)
+				? Systemcall::DontWait : Systemcall::Wait;
+			Systemcall one;
 			int res;
-			if ((*it).original_dir) {
-				Path p(buffer->filepath);
-				res = one.startscript(Systemcalls::System, command);
+			if (conv.original_dir) {
+				Path p(buffer->filePath());
+				res = one.startscript(type, command);
 			} else
-				res = one.startscript(Systemcalls::System, command);
+				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);
+				string const command2 = script +
+					" < " + QuoteName(infile2 + ".out") +
+					" > " + QuoteName(logfile);
+				one.startscript(Systemcall::Wait, command2);
+				if (!scanLog(*buffer, command, logfile))
+					return false;
+			}
+
 			if (res) {
-				WriteAlert(_("Can not 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;
 			}
 		}
 	}
 
-        return true;
+	Converter const & conv = converterlist_[edgepath.back()];
+	if (conv.To->dummy())
+		return true;
+
+
+	if (!conv.result_dir.empty()) {
+		to_file = AddName(subst(conv.result_dir, token_base, to_base),
+				  subst(conv.result_file,
+					token_base, OnlyFilename(to_base)));
+		if (from_base != to_base) {
+			string from = subst(conv.result_dir,
+					    token_base, from_base);
+			string to = subst(conv.result_dir,
+					  token_base, to_base);
+			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;
+			}
+		}
+		return true;
+	} else
+		return move(outfile, to_file, conv.latex);
 }
 
 
-string const Converter::SplitFormat(string const & str, string & format)
+// 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)
 {
-	string using_format = split(str, format, ':');
-	if (format.empty())
-		format = "dvi";
-	return using_format;
+	if (from == to)
+		return true;
+
+	bool no_errors = true;
+	string const path = OnlyPath(from);
+	string const base = OnlyFilename(ChangeExtension(from, ""));
+	string const to_base = ChangeExtension(to, "");
+	string const to_extension = GetExtension(to);
+
+	vector<string> files = DirList(OnlyPath(from), GetExtension(from));
+	for (vector<string>::const_iterator it = files.begin();
+	     it != files.end(); ++it)
+		if (prefixIs(*it, base)) {
+			string const from2 = path + *it;
+			string to2 = to_base + it->substr(base.length());
+			to2 = ChangeExtension(to2, to_extension);
+			lyxerr[Debug::FILES] << "moving " << from2
+					     << " to " << to2 << endl;
+			bool const moved = (copy)
+				? lyx::support::copy(from2, to2)
+				: rename(from2, to2);
+			if (!moved && no_errors) {
+				Alert::error(_("Cannot convert file"),
+					bformat(_("Could not move a temporary file from %1$s to %2$s."),
+						from2, to2));
+				no_errors = false;
+			}
+		}
+	return no_errors;
 }
 
 
-bool Converter::runLaTeX(Buffer * buffer, string const & command)
+bool Converters::convert(Buffer const * buffer,
+			 string const & from_file, string const & to_file_base,
+			 string const & from_format, string const & to_format)
 {
-	
-	BufferView * bv = buffer->getUser();
+	string to_file;
+	return convert(buffer, from_file, to_file_base, from_format, to_format,
+		       to_file);
+}
 
-	if (!bv->text) return 0;
 
-	ProhibitInput(bv);
+bool Converters::formatIsUsed(string const & format)
+{
+	ConverterList::const_iterator cit = converterlist_.begin();
+	ConverterList::const_iterator end = converterlist_.end();
+	for (; cit != end; ++cit) {
+		if (cit->from == format || cit->to == format)
+			return true;
+	}
+	return false;
+}
 
-	string name = buffer->getLatexName();
 
-	bv->owner()->getMiniBuffer()->Set(_("Running LaTeX..."));   
+bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
+			 string const & filename)
+{
+	LatexRunParams runparams;
+	runparams.flavor = LatexRunParams::LATEX;
+	LaTeX latex("", runparams, filename, "");
+	TeXErrors terr;
+	int result = latex.scanLogFile(terr);
 
-	// Remove all error insets
-	bool a = bv->removeAutoInsets();
+	if (result & LaTeX::ERRORS)
+		bufferErrors(buffer, terr);
 
-	// do the LaTex run(s)
-	TeXErrors terr;
-	LaTeX latex(command, name, buffer->filepath);
-	int result = latex.run(terr,
-			    bv->owner()->getMiniBuffer()); // running latex
+	return true;
+}
 
-	if ((result & LaTeX::ERRORS)) {
-		// Insert all errors as errors boxes
-		bv->insertErrors(terr);
+namespace {
+
+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_;
+};
+
+}
 
-	// if we removed error insets before we ran LaTeX or if we inserted
-	// error insets after we ran LaTeX this must be run:
-        if (a || (result & LaTeX::ERRORS)){
-                bv->redraw();
-                bv->fitCursor();
-                //bv->updateScrollbar();
-        }
+
+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, runparams, name, buffer.filePath());
+	TeXErrors terr;
+	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)) {
-		WriteAlert(_("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.");
-		}
-		WriteAlert(_("There were errors during the LaTeX run."),
-			   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."));
 	}
-        AllowInput(bv);
- 
-        return (result & (LaTeX::NO_LOGFILE | LaTeX::ERRORS)) == 0;
 
+
+	buffer.busy(false);
+
+	int const ERROR_MASK =
+			LaTeX::NO_LOGFILE |
+			LaTeX::ERRORS |
+			LaTeX::NO_OUTPUT;
+
+	return (result & ERROR_MASK) == 0;
+
+}
+
+
+
+void Converters::buildGraph()
+{
+	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);
+	}
+}
+
+
+std::vector<Format const *> const
+Converters::intToFormat(std::vector<int> const & input)
+{
+	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);
+	}
+	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);
 }
 
+
+vector<Format const *> const
+Converters::getReachable(string const & from, bool only_viewable,
+			 bool clear_visited)
+{
+	vector<int> const & reachables =
+		G_.getReachable(formats.getNumber(from),
+				only_viewable,
+				clear_visited);
+
+	return intToFormat(reachables);
+}
+
+
+bool Converters::isReachable(string const & from, string const & to)
+{
+	return G_.isReachable(formats.getNumber(from),
+			      formats.getNumber(to));
+}
+
+
+Graph::EdgePath const
+Converters::getPath(string const & from, string const & to)
+{
+	return G_.getPath(formats.getNumber(from),
+			  formats.getNumber(to));
+}
+
+
+/// The global instance
+Converters converters;
+
+// The global copy after reading lyxrc.defaults
+Converters system_converters;