X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=1d5b67c19700e6184a836709c0ff96499763cabf;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=32f03719d75cf4e5a1a732e1378267d7ea60c674;hpb=3420904448b247cc270597c31b52d777e38ac647;p=lyx.git diff --git a/src/converter.C b/src/converter.C index 32f03719d7..1d5b67c197 100644 --- a/src/converter.C +++ b/src/converter.C @@ -18,7 +18,9 @@ #include "debug.h" #include "format.h" #include "gettext.h" +#include "language.h" #include "LaTeX.h" +#include "mover.h" #include "frontends/Alert.h" @@ -34,6 +36,8 @@ using lyx::support::compare_ascii_no_case; using lyx::support::contains; using lyx::support::DirList; using lyx::support::GetExtension; +using lyx::support::IsFileReadable; +using lyx::support::LibFileSearch; using lyx::support::LibScriptSearch; using lyx::support::MakeRelPath; using lyx::support::OnlyFilename; @@ -41,7 +45,6 @@ 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; @@ -50,6 +53,7 @@ using std::endl; using std::find_if; using std::string; using std::vector; +using std::distance; namespace { @@ -73,7 +77,7 @@ string const dvipdfm_options(BufferParams const & bp) { string result; - if (bp.papersize2 != VM_PAPER_CUSTOM) { + if (bp.papersize != PAPER_CUSTOM) { string const paper_size = bp.paperSizeName(); if (paper_size != "b5" && paper_size != "foolscap") result = "-p "+ paper_size; @@ -101,10 +105,11 @@ private: } // namespace anon -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) +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) {} @@ -117,6 +122,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") @@ -154,7 +161,7 @@ bool operator<(Converter const & a, Converter const & b) Converter const * Converters::getConverter(string const & from, string const & to) const { - ConverterList::const_iterator cit = + ConverterList::const_iterator const cit = find_if(converterlist_.begin(), converterlist_.end(), ConverterEqual(from, to)); if (cit != converterlist_.end()) @@ -166,7 +173,7 @@ Converter const * Converters::getConverter(string const & from, 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(), ConverterEqual(from, to)); if (cit != converterlist_.end()) @@ -211,9 +218,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(), - ConverterEqual(from, to)); + ConverterList::iterator const it = + find_if(converterlist_.begin(), + converterlist_.end(), + ConverterEqual(from, to)); if (it != converterlist_.end()) converterlist_.erase(it); } @@ -263,6 +271,8 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path) if (conv.latex) if (contains(conv.to, "pdf")) return OutputParams::PDFLATEX; + if (conv.xml) + return OutputParams::XML; } return OutputParams::LATEX; } @@ -271,21 +281,48 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path) 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, 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); Graph::EdgePath edgepath = getPath(from_format, to_format); if (edgepath.empty()) { + 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 = + "sh " + + QuoteName(LibFileSearch("scripts", "convertDefault.sh")) + + ' ' + + QuoteName(from_ext + ':' + from_file) + + ' ' + + QuoteName(to_ext + ':' + to_file); + lyxerr[Debug::FILES] + << "No converter defined! " + "I use convertDefault.sh:\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" + "Try defining a convertor in the preferences."), + from_format, to_format)); return false; } OutputParams runparams; runparams.flavor = getFlavor(edgepath); - string path = OnlyPath(from_file); Path p(path); @@ -319,7 +356,7 @@ bool Converters::convert(Buffer const * buffer, 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, runparams)) return false; @@ -332,9 +369,9 @@ bool Converters::convert(Buffer const * buffer, runLaTeX(*buffer, latex_command_, runparams); } - string infile2 = (conv.original_dir) + string const infile2 = (conv.original_dir) ? infile : MakeRelPath(infile, path); - string outfile2 = (conv.original_dir) + string const outfile2 = (conv.original_dir) ? outfile : MakeRelPath(outfile, path); string command = conv.command; @@ -358,7 +395,7 @@ bool Converters::convert(Buffer const * buffer, buffer->message(_("Executing command: ") + command); - Systemcall::Starttype type = (dummy) + Systemcall::Starttype const type = (dummy) ? Systemcall::DontWait : Systemcall::Wait; Systemcall one; int res; @@ -369,13 +406,17 @@ bool Converters::convert(Buffer const * buffer, res = one.startscript(type, command); if (!real_outfile.empty()) { - if (!rename(outfile, real_outfile)) + 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()) { @@ -409,17 +450,17 @@ 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), subst(conv.result_file, 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 (!rename(from, 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, to)); @@ -428,13 +469,12 @@ bool Converters::convert(Buffer const * buffer, } return true; } else - return move(outfile, to_file, conv.latex); + 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; @@ -454,12 +494,16 @@ bool Converters::move(string const & from, string const & to, bool copy) 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); + + Mover const & mover = movers(fmt); + bool const moved = copy + ? mover.copy(from2, to2) + : mover.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."), + 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."), from2, to2)); no_errors = false; } @@ -470,11 +514,12 @@ 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_format, string const & to_format, + bool try_default) { string to_file; return convert(buffer, from_file, to_file_base, from_format, to_format, - to_file); + to_file, try_default); } @@ -497,7 +542,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, runparams.flavor = OutputParams::LATEX; LaTeX latex("", runparams, filename, ""); TeXErrors terr; - int result = latex.scanLogFile(terr); + int const result = latex.scanLogFile(terr); if (result & LaTeX::ERRORS) bufferErrors(buffer, terr); @@ -505,12 +550,13 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, return true; } + namespace { -class showMessage : public boost::signals::trackable { +class showMessage : public std::unary_function, public boost::signals::trackable { public: showMessage(Buffer const & b) : buffer_(b) {}; - void operator()(string const & m) + void operator()(string const & m) const { buffer_.message(m); } @@ -527,22 +573,25 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, buffer.busy(true); buffer.message(_("Running LaTeX...")); + runparams.document_language = buffer.params().language->babel(); + // do the LaTeX run(s) - string name = buffer.getLatexName(); + string const name = buffer.getLatexName(); LaTeX latex(command, runparams, name, buffer.filePath()); TeXErrors terr; showMessage show(buffer); latex.message.connect(show); - int result = latex.run(terr); + int const result = latex.run(terr); if (result & LaTeX::ERRORS) bufferErrors(buffer, terr); // check return value from latex.run(). if ((result & LaTeX::NO_LOGFILE)) { - string str = bformat(_("LaTeX did not run successfully. " - "Additionally, LyX could not locate " - "the LaTeX log %1$s."), name); + string const 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"), @@ -567,7 +616,7 @@ void Converters::buildGraph() { G_.init(formats.size()); ConverterList::iterator beg = converterlist_.begin(); - ConverterList::iterator end = converterlist_.end(); + 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); @@ -582,7 +631,7 @@ Converters::intToFormat(std::vector const & input) vector result(input.size()); vector::const_iterator it = input.begin(); - vector::const_iterator end = input.end(); + vector::const_iterator const end = input.end(); vector::iterator rit = result.begin(); for ( ; it != end; ++it, ++rit) { *rit = &formats.get(*it); @@ -590,8 +639,9 @@ Converters::intToFormat(std::vector const & input) return result; } + vector const -Converters::getReachableTo(string const & target, bool clear_visited) +Converters::getReachableTo(string const & target, bool const clear_visited) { vector const & reachablesto = G_.getReachableTo(formats.getNumber(target), clear_visited); @@ -601,8 +651,8 @@ Converters::getReachableTo(string const & target, bool clear_visited) vector const -Converters::getReachable(string const & from, bool only_viewable, - bool clear_visited) +Converters::getReachable(string const & from, bool const only_viewable, + bool const clear_visited) { vector const & reachables = G_.getReachable(formats.getNumber(from),