X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=1d5b67c19700e6184a836709c0ff96499763cabf;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=482059b7c1edb746cb99ef9858dc5b6403867dee;hpb=8d2394b02c30aa6c4b99e04de3e9b46bf57d529a;p=lyx.git diff --git a/src/converter.C b/src/converter.C index 482059b7c1..1d5b67c197 100644 --- a/src/converter.C +++ b/src/converter.C @@ -5,47 +5,56 @@ * * \author Dekel Tsur * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ #include #include "converter.h" -#include "graph.h" -#include "format.h" -#include "lyxrc.h" + #include "buffer.h" -#include "bufferparams.h" #include "buffer_funcs.h" -#include "bufferview_funcs.h" -#include "errorlist.h" -#include "LaTeX.h" -#include "gettext.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 "frontends/LyXView.h" #include "support/filetools.h" -#include "support/lyxfunctional.h" +#include "support/lyxlib.h" #include "support/path.h" -#include "support/tostr.h" #include "support/systemcall.h" -#include -#include - -#include - -using namespace lyx::support; - -#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::IsFileReadable; +using lyx::support::LibFileSearch; +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::split; +using lyx::support::subst; +using lyx::support::Systemcall; -using std::vector; using std::endl; using std::find_if; +using std::string; +using std::vector; +using std::distance; + namespace { @@ -68,25 +77,39 @@ string const dvipdfm_options(BufferParams const & bp) { string result; - if (bp.papersize2 != BufferParams::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; - if (bp.orientation == BufferParams::ORIENTATION_LANDSCAPE) + if (bp.orientation == ORIENTATION_LANDSCAPE) result += " -l"; } return result; } + +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_; + } +private: + string const from_; + string const to_; +}; + } // 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) {} @@ -99,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") @@ -126,33 +151,19 @@ 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(), + 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 @@ -160,13 +171,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; } @@ -179,7 +190,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] == '*') { @@ -207,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(), - compare_Converter(from, to)); + ConverterList::iterator const it = + find_if(converterlist_.begin(), + converterlist_.end(), + ConverterEqual(from, to)); if (it != converterlist_.end()) converterlist_.erase(it); } @@ -251,37 +263,66 @@ void Converters::sort() } -bool Converters::usePdflatex(Graph::EdgePath const & path) +OutputParams::FLAVOR Converters::getFlavor(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"); + 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, 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; } - LatexRunParams runparams; - runparams.flavor = usePdflatex(edgepath) ? - LatexRunParams::PDFLATEX : LatexRunParams::LATEX; - + OutputParams runparams; + runparams.flavor = getFlavor(edgepath); string path = OnlyPath(from_file); Path p(path); @@ -310,14 +351,14 @@ bool Converters::convert(Buffer const * buffer, string real_outfile; if (outfile == infile) { real_outfile = infile; - outfile = AddName(buffer->tmppath, "tmpfile.out"); + 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, runparams)) + if (!runLaTeX(*buffer, command, runparams)) return false; } else { if (conv.need_aux && !run_latex @@ -325,12 +366,12 @@ bool Converters::convert(Buffer const * buffer, lyxerr[Debug::FILES] << "Running " << latex_command_ << " to update aux file"<< endl; - runLaTeX(buffer, latex_command_, runparams); + 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; @@ -344,32 +385,38 @@ bool Converters::convert(Buffer const * buffer, if (conv.from == "dvi" && conv.to == "ps") command = add_options(command, - buffer->params.dvips_options()); + buffer->params().dvips_options()); else if (conv.from == "dvi" && prefixIs(conv.to, "pdf")) command = add_options(command, - dvipdfm_options(buffer->params)); + dvipdfm_options(buffer->params())); lyxerr[Debug::FILES] << "Calling " << command << endl; if (buffer) - buffer->message(_("Executing command: ") + command); - Systemcall::Starttype type = (dummy) + buffer->message(_("Executing command: ") + + command); + + 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()) { - 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()) { @@ -379,7 +426,7 @@ 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; } @@ -403,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)); @@ -422,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; @@ -448,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; } @@ -464,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); } @@ -484,73 +535,71 @@ bool Converters::formatIsUsed(string const & format) } -bool Converters::scanLog(Buffer const * buffer, string const & /*command*/, +bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, string const & filename) { - if (!buffer) - return false; - - LatexRunParams runparams; - runparams.flavor = LatexRunParams::LATEX; + OutputParams runparams; + 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); + bufferErrors(buffer, terr); 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 m) + showMessage(Buffer const & b) : buffer_(b) {}; + void operator()(string const & m) const { - buffer_->message(m); + buffer_.message(m); } private: - Buffer const * buffer_; + Buffer const & buffer_; }; } -bool Converters::runLaTeX(Buffer const * buffer, string const & command, - LatexRunParams const & runparams) + +bool Converters::runLaTeX(Buffer const & buffer, string const & command, + OutputParams const & runparams) { - // when is this needed? - if (!buffer) - return false; + buffer.busy(true); + buffer.message(_("Running LaTeX...")); - buffer->busy(true); - buffer->message(_("Running LaTeX...")); + runparams.document_language = buffer.params().language->babel(); // do the LaTeX run(s) - string name = buffer->getLatexName(); - LaTeX latex(command, runparams, name, buffer->filePath()); + 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); + 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"), _("An empty output file was generated.")); } - - buffer->busy(false); + + buffer.busy(false); int const ERROR_MASK = LaTeX::NO_LOGFILE | @@ -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),