X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=8d2390c1fe838d4668727fd95bd46551f96e604b;hb=3ef684e752bb5afdbfdea51d4c3df4afe1461916;hp=15f3532ea89c5fc20c909e50eca46c2e4909b6c7;hpb=d0a3af12d9ae8b208f7a70099db29632ad8a7dba;p=lyx.git diff --git a/src/converter.C b/src/converter.C index 15f3532ea8..8d2390c1fe 100644 --- a/src/converter.C +++ b/src/converter.C @@ -1,57 +1,76 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2001 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 -#ifdef __GNUG__ -#pragma implementation -#endif - -#include - #include "converter.h" -#include "lyxrc.h" + #include "buffer.h" -#include "bufferview_funcs.h" -#include "LaTeX.h" -#include "LyXView.h" -#include "lyx_gui_misc.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 "language.h" +#include "LaTeX.h" +#include "mover.h" #include "frontends/Alert.h" #include "support/filetools.h" -#include "support/lyxfunctional.h" +#include "support/lyxlib.h" +#include "support/os.h" #include "support/path.h" #include "support/systemcall.h" -using std::vector; -using std::queue; + +namespace lyx { + +using support::addName; +using support::bformat; +using support::changeExtension; +using support::compare_ascii_no_case; +using support::contains; +using support::dirList; +using support::getExtension; +using support::isFileReadable; +using support::libFileSearch; +using support::libScriptSearch; +using support::makeRelPath; +using support::onlyFilename; +using support::onlyPath; +using support::Path; +using support::prefixIs; +using support::quoteName; +using support::split; +using support::subst; +using support::Systemcall; + using std::endl; -using std::fill; using std::find_if; -using std::reverse; -using std::sort; +using std::string; +using std::vector; +using std::distance; + +namespace Alert = lyx::frontend::Alert; + namespace { string const token_from("$$i"); string const token_base("$$b"); string const token_to("$$o"); +string const token_path("$$p"); + -////////////////////////////////////////////////////////////////////////////// -inline string const add_options(string const & command, string const & options) { string head; @@ -59,177 +78,46 @@ 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 +string const dvipdfm_options(BufferParams const & bp) { - 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()); -} + string result; + if (bp.papersize != PAPER_CUSTOM) { + string const paper_size = bp.paperSizeName(); + if (paper_size != "b5" && paper_size != "foolscap") + result = "-p "+ paper_size; -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); + if (bp.orientation == ORIENTATION_LANDSCAPE) + result += " -l"; } -} - - -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) -{ - add(name); - FormatList::iterator it = - find_if(formatlist.begin(), formatlist.end(), - lyx::compare_memfun(&Format::name, name)); - if (it != formatlist.end()) - it->setViewer(command); + return result; } -bool Formats::view(Buffer const * buffer, string const & filename, - string const & format_name) const -{ - if (filename.empty()) - return false; - - 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; - } - - 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'; - } - - 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; +class ConverterEqual : public std::binary_function { +public: + ConverterEqual(string const & from, string const & to) + : from_(from), to_(to) {} + bool operator()(Converter const & c) const { + return c.from == from_ && c.to == to_; } - return true; -} - +private: + string const from_; + string const to_; +}; -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), xml(false), + original_dir(false), need_aux(false) +{} -////////////////////////////////////////////////////////////////////////////// void Converter::readFlags() { @@ -240,6 +128,8 @@ void Converter::readFlags() flag_value = split(flag_value, flag_name, '='); if (flag_name == "latex") latex = true; + else if (flag_name == "xml") + xml = true; else if (flag_name == "originaldir") original_dir = true; else if (flag_name == "needaux") @@ -261,36 +151,25 @@ void Converter::readFlags() bool operator<(Converter const & a, Converter const & b) { - int const i = compare_no_case(a.From->prettyname(), - b.From->prettyname()); + // 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_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: - 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) + string const & to) const { - ConverterList::const_iterator cit = + ConverterList::const_iterator const cit = find_if(converterlist_.begin(), converterlist_.end(), - compare_Converter(from, to)); + ConverterEqual(from, to)); if (cit != converterlist_.end()) return &(*cit); else @@ -298,13 +177,13 @@ Converter const * Converters::getConverter(string const & from, } -int Converters::getNumber(string const & from, string const & to) +int Converters::getNumber(string const & from, string const & to) const { - ConverterList::const_iterator cit = + ConverterList::const_iterator const cit = find_if(converterlist_.begin(), converterlist_.end(), - compare_Converter(from, to)); + ConverterEqual(from, to)); if (cit != converterlist_.end()) - return cit - converterlist_.begin(); + return distance(converterlist_.begin(), cit); else return -1; } @@ -317,7 +196,7 @@ void Converters::add(string const & from, string const & to, formats.add(to); ConverterList::iterator it = find_if(converterlist_.begin(), converterlist_.end(), - compare_Converter(from, to)); + ConverterEqual(from , to)); Converter converter(from, to, command, flags); if (it != converterlist_.end() && !flags.empty() && flags[0] == '*') { @@ -326,7 +205,7 @@ void Converters::add(string const & from, string const & to, 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. @@ -345,9 +224,10 @@ void Converters::add(string const & from, string const & to, void Converters::erase(string const & from, string const & to) { - ConverterList::iterator it = find_if(converterlist_.begin(), - converterlist_.end(), - compare_Converter(from, to)); + ConverterList::iterator const it = + find_if(converterlist_.begin(), + converterlist_.end(), + ConverterEqual(from, to)); if (it != converterlist_.end()) converterlist_.erase(it); } @@ -356,10 +236,10 @@ void Converters::erase(string const & from, string const & to) // 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 +// 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). +// a list (instead of a vector), but this will cause other problems). void Converters::update(Formats const & formats) { ConverterList::iterator it = converterlist_.begin(); @@ -389,210 +269,84 @@ void Converters::sort() } -int Converters::bfs_init(string const & start, bool clear_visited) -{ - int const s = formats.getNumber(start); - if (s < 0) - return s; - - Q_ = queue(); - if (clear_visited) - fill(visited_.begin(), visited_.end(), false); - if (visited_[s] == false) { - Q_.push(s); - visited_[s] = true; - } - return s; -} - - -vector const -Converters::getReachableTo(string const & target, bool clear_visited) +OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path) { - vector 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::iterator it = vertices_[i].in_vertices.begin(); - vector::iterator end = vertices_[i].in_vertices.end(); - for (; it != end; ++it) { - if (!visited_[*it]) { - visited_[*it] = true; - Q_.push(*it); - } - } - } - - return result; -} - - -vector const -Converters::getReachable(string const & from, bool only_viewable, - bool clear_visited) -{ - vector 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::const_iterator cit = - vertices_[i].out_vertices.begin(); - vector::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::const_iterator cit = - vertices_[i].out_vertices.begin(); - vector::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 prev_edge(formats.size()); - vector prev_vertex(formats.size()); - - bool found = false; - while (!Q_.empty()) { - int const i = Q_.front(); - Q_.pop(); - if (i == t) { - found = true; - break; - } - - vector::const_iterator beg = - vertices_[i].out_vertices.begin(); - vector::const_iterator cit = beg; - vector::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) - return contains(conv.to, "pdf"); + if (contains(conv.to, "pdf")) + return OutputParams::PDFLATEX; + if (conv.xml) + return OutputParams::XML; } - return false; + return OutputParams::LATEX; } 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) + string & to_file, ErrorList & errorList, bool try_default) { - to_file = ChangeExtension(to_file_base, - formats.extension(to_format)); + string const to_ext = formats.extension(to_format); + to_file = changeExtension(to_file_base, to_ext); if (from_format == to_format) - return move(from_file, to_file, false); + return move(from_format, from_file, to_file, false); - EdgePath edgepath = getPath(from_format, to_format); + Graph::EdgePath edgepath = getPath(from_format, to_format); if (edgepath.empty()) { - Alert::alert(_("Cannot convert file"), - _("No information for converting from ") - + formats.prettyName(from_format) + _(" to ") - + formats.prettyName(to_format)); + if (try_default) { + // if no special converter defined, then we take the + // default one from ImageMagic. + string const from_ext = from_format.empty() ? + getExtension(from_file) : + formats.extension(from_format); + string const command = + support::os::python() + ' ' + + quoteName(libFileSearch("scripts", "convertDefault.py")) + + ' ' + + quoteName(from_ext + ':' + from_file) + + ' ' + + quoteName(to_ext + ':' + to_file); + lyxerr[Debug::FILES] + << "No converter defined! " + "I use convertDefault.py:\n\t" + << command << endl; + Systemcall one; + one.startscript(Systemcall::Wait, command); + if (isFileReadable(to_file)) { + return true; + } + } + Alert::error(_("Cannot convert file"), + bformat(_("No information for converting %1$s " + "format files to %2$s.\n" + "Define a converter in the preferences."), + from_ascii(from_format), from_ascii(to_format))); return false; } - - string path = OnlyPath(from_file); + OutputParams runparams; + runparams.flavor = getFlavor(edgepath); + + // Some converters (e.g. lilypond) can only output files to the + // current directory, so we need to change the current directory. + // This has the added benefit that all other files that may be + // generated by the converter are deleted when LyX closes and do not + // clutter the real working directory. + string path = onlyPath(from_file); Path p(path); + // empty the error list before any new conversion takes place. + errorList.clear(); + bool run_latex = false; - string from_base = ChangeExtension(from_file, ""); - string to_base = ChangeExtension(to_file, ""); + string from_base = changeExtension(from_file, ""); + 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"; @@ -601,79 +355,107 @@ bool Converters::convert(Buffer const * buffer, << conv.from << " to " << conv.to << endl; infile = outfile; outfile = conv.result_dir.empty() - ? ChangeExtension(from_file, conv.To->extension()) - : AddName(subst(conv.result_dir, + ? changeExtension(from_file, conv.To->extension()) + : addName(subst(conv.result_dir, token_base, from_base), subst(conv.result_file, - token_base, OnlyFilename(from_base))); + 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, ""); + string const command = subst(conv.command, token_from, ""); lyxerr[Debug::FILES] << "Running " << command << endl; - if (!runLaTeX(buffer, command)) + if (!runLaTeX(*buffer, command, runparams, errorList)) return false; } else { if (conv.need_aux && !run_latex && !latex_command_.empty()) { - lyxerr[Debug::FILES] - << "Running " << latex_command_ + lyxerr[Debug::FILES] + << "Running " << latex_command_ << " to update aux file"<< endl; - runLaTeX(buffer, latex_command_); + runLaTeX(*buffer, latex_command_, runparams, errorList); } - string infile2 = (conv.original_dir) - ? infile : MakeRelPath(infile, path); - string outfile2 = (conv.original_dir) - ? outfile : MakeRelPath(outfile, path); + string const infile2 = (conv.original_dir) + ? infile : makeRelPath(infile, path); + string const 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_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"); + 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: ") + + from_utf8(command)); - Systemcall::Starttype type = (dummy) + Systemcall::Starttype const 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()) { + Mover const & mover = movers(conv.to); + if (!mover.rename(outfile, real_outfile)) + res = -1; + else + lyxerr[Debug::FILES] + << "renaming file " << outfile + << " to " << real_outfile + << endl; + // Finally, don't forget to tell any future + // converters to use the renamed file... + outfile = real_outfile; + } + if (!conv.parselog.empty()) { string const logfile = infile2 + ".log"; - string const command2 = conv.parselog + - " < " + QuoteName(infile2 + ".out") + - " > " + QuoteName(logfile); + 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)) + if (!scanLog(*buffer, command, logfile, errorList)) 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"), + from_ascii(command.substr(0, 50)))); + } return false; } } @@ -683,55 +465,61 @@ bool Converters::convert(Buffer const * buffer, if (conv.To->dummy()) return true; - if (!conv.result_dir.empty()) { - to_file = AddName(subst(conv.result_dir, token_base, to_base), + to_file = addName(subst(conv.result_dir, token_base, to_base), subst(conv.result_file, - token_base, OnlyFilename(to_base))); + token_base, onlyFilename(to_base))); if (from_base != to_base) { - string from = subst(conv.result_dir, + string const from = subst(conv.result_dir, token_base, from_base); - string to = subst(conv.result_dir, + string const 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); + Mover const & mover = movers(conv.from); + if (!mover.rename(from, to)) { + Alert::error(_("Cannot convert file"), + bformat(_("Could not move a temporary file from %1$s to %2$s."), + from_ascii(from), from_ascii(to))); return false; } } return true; - } else - return move(outfile, to_file, conv.latex); + } else + return move(conv.to, 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) + +bool Converters::move(string const & fmt, + string const & from, string const & to, bool copy) { 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); + string const path = onlyPath(from); + string const base = onlyFilename(changeExtension(from, "")); + string const to_base = changeExtension(to, ""); + string const to_extension = getExtension(to); - vector files = DirList(OnlyPath(from), GetExtension(from)); + vector files = dirList(onlyPath(from), getExtension(from)); for (vector::const_iterator it = files.begin(); it != files.end(); ++it) if (prefixIs(*it, base)) { - string from2 = path + *it; + string const from2 = path + *it; string to2 = to_base + it->substr(base.length()); - to2 = ChangeExtension(to2, to_extension); - lyxerr[Debug::FILES] << "moving " << from2 + to2 = changeExtension(to2, to_extension); + lyxerr[Debug::FILES] << "moving " << from2 << " to " << to2 << endl; - bool moved = (copy) - ? lyx::copy(from2, to2) - : lyx::rename(from2, to2); + + Mover const & mover = movers(fmt); + bool const moved = copy + ? mover.copy(from2, to2) + : mover.rename(from2, to2); if (!moved && no_errors) { - Alert::alert(_("Error while trying to move file:"), - from2, _("to ") + to2); + Alert::error(_("Cannot convert file"), + bformat(copy ? + _("Could not copy a temporary file from %1$s to %2$s.") : + _("Could not move a temporary file from %1$s to %2$s."), + from_ascii(from2), from_ascii(to2))); no_errors = false; } } @@ -740,28 +528,13 @@ 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, + ErrorList & errorList, bool try_default) { string to_file; return convert(buffer, from_file, to_file_base, from_format, to_format, - to_file); -} - - -void Converters::buildGraph() -{ - vertices_ = vector(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()); - } + to_file, errorList, try_default); } @@ -777,223 +550,154 @@ 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, ErrorList & errorList) { - if (!buffer) - return false; - - BufferView * bv = buffer->getUser(); - bool need_redraw = false; - if (bv) { - bv->owner()->prohibitInput(); - // Remove all error insets - need_redraw = bv->removeAutoInsets(); - } - - LaTeX latex("", filename, ""); + OutputParams runparams; + runparams.flavor = OutputParams::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); - need_redraw = true; - } - if (need_redraw) { - bv->redraw(); - bv->fitCursor(); - } - bv->owner()->allowInput(); - } + int const result = latex.scanLogFile(terr); + + if (result & LaTeX::ERRORS) + bufferErrors(buffer, terr, errorList); - 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; - } return true; } -bool Converters::runLaTeX(Buffer const * buffer, string const & command) -{ - if (!buffer) - return false; - - BufferView * bv = buffer->getUser(); - string name = buffer->getLatexName(); - bool need_redraw = false; +namespace { - if (bv) { - bv->owner()->prohibitInput(); - bv->owner()->message(_("Running LaTeX...")); - // Remove all error insets - need_redraw = bv->removeAutoInsets(); +class showMessage : public std::unary_function, public boost::signals::trackable { +public: + showMessage(Buffer const & b) : buffer_(b) {}; + void operator()(docstring const & m) const + { + buffer_.message(m); } +private: + Buffer const & buffer_; +}; +} - // do the LaTex run(s) + +bool Converters::runLaTeX(Buffer const & buffer, string const & command, + OutputParams const & runparams, ErrorList & errorList) +{ + buffer.busy(true); + buffer.message(_("Running LaTeX...")); + + runparams.document_language = buffer.params().language->babel(); + + // do the LaTeX run(s) + string const name = buffer.getLatexName(); + LaTeX latex(command, runparams, name, buffer.filePath()); TeXErrors terr; - LaTeX latex(command, name, buffer->filePath()); - 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); - need_redraw = true; - } + showMessage show(buffer); + latex.message.connect(show); + int const result = latex.run(terr); - // if we removed error insets before we ran LaTeX or if we inserted - // error insets after we ran LaTeX this must be run: - if (need_redraw) { - bv->redraw(); - bv->fitCursor(); - } - } + if (result & LaTeX::ERRORS) + bufferErrors(buffer, terr, errorList); // 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); + docstring const str = + bformat(_("LaTeX did not run successfully. " + "Additionally, LyX could not locate " + "the LaTeX log %1$s."), from_utf8(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(); - - int const ERROR_MASK = + + buffer.busy(false); + + int const ERROR_MASK = LaTeX::NO_LOGFILE | LaTeX::ERRORS | LaTeX::NO_OUTPUT; - + return (result & ERROR_MASK) == 0; } -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 const 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 const +Converters::intToFormat(std::vector 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 result(input.size()); + + vector::const_iterator it = input.begin(); + vector::const_iterator const end = input.end(); + vector::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; } -string const Converters::dvipdfm_options(Buffer const * buffer) +vector const +Converters::getReachableTo(string const & target, bool const clear_visited) { - string result; - if (!buffer) - return result; + vector const & reachablesto = + G_.getReachableTo(formats.getNumber(target), 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(reachablesto); +} - if (buffer->params.orientation == BufferParams::ORIENTATION_LANDSCAPE) - result += " -l"; - } - return result; +vector const +Converters::getReachable(string const & from, bool const only_viewable, + bool const clear_visited) +{ + vector 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)); } -vector 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; + + +} // namespace lyx