X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=e96ed7b0968bd3c8948aefa66551421e40d5b966;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=1563242f147095c13216f64f1aafa206192b54a1;hpb=2be72ce05808bc4f5455b97b3252293c25cdc9e9;p=lyx.git diff --git a/src/Converter.cpp b/src/Converter.cpp index 1563242f14..e96ed7b096 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -50,7 +50,9 @@ string const token_base("$$b"); string const token_to("$$o"); string const token_path("$$p"); string const token_orig_path("$$r"); +string const token_orig_from("$$f"); string const token_encoding("$$e"); +string const token_latex_encoding("$$E"); string const add_options(string const & command, string const & options) @@ -97,7 +99,7 @@ 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), - need_aux(false) + need_aux(false), nice(false) {} @@ -123,6 +125,8 @@ void Converter::readFlags() result_file = flag_value; else if (flag_name == "parselog") parselog = flag_value; + else if (flag_name == "nice") + nice = true; } if (!result_dir.empty() && result_file.empty()) result_file = "index." + formats.extension(to); @@ -131,21 +135,6 @@ void Converter::readFlags() } -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 - return i < 0; -} - - Converter const * Converters::getConverter(string const & from, string const & to) const { @@ -188,12 +177,25 @@ void Converters::add(string const & from, string const & to, } converter.readFlags(); - // 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 (converter.latex - && (latex_command_.empty() || converter.latex_flavor == "latex")) - latex_command_ = subst(command, token_from, ""); + if (converter.latex) { + if (latex_command_.empty() || + converter.latex_flavor == "latex") + latex_command_ = subst(command, token_from, ""); + if (dvilualatex_command_.empty() || + converter.latex_flavor == "dvilualatex") + dvilualatex_command_ = subst(command, token_from, ""); + if (lualatex_command_.empty() || + converter.latex_flavor == "lualatex") + lualatex_command_ = subst(command, token_from, ""); + if (pdflatex_command_.empty() || + converter.latex_flavor == "pdflatex") + pdflatex_command_ = subst(command, token_from, ""); + if (xelatex_command_.empty() || + converter.latex_flavor == "xelatex") + xelatex_command_ = subst(command, token_from, ""); + } if (it == converterlist_.end()) { converterlist_.push_back(converter); @@ -246,28 +248,29 @@ void Converters::updateLast(Formats const & formats) } -void Converters::sort() -{ - std::sort(converterlist_.begin(), converterlist_.end()); -} - - -OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path) +OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path, + Buffer const * buffer) { for (Graph::EdgePath::const_iterator cit = path.begin(); cit != path.end(); ++cit) { Converter const & conv = converterlist_[*cit]; - if (conv.latex) + if (conv.latex) { + if (conv.latex_flavor == "latex") + return OutputParams::LATEX; if (conv.latex_flavor == "xelatex") return OutputParams::XETEX; if (conv.latex_flavor == "lualatex") return OutputParams::LUATEX; + if (conv.latex_flavor == "dvilualatex") + return OutputParams::DVILUATEX; if (conv.latex_flavor == "pdflatex") return OutputParams::PDFLATEX; + } if (conv.xml) return OutputParams::XML; } - return OutputParams::LATEX; + return buffer ? buffer->params().getOutputFlavor() + : OutputParams::LATEX; } @@ -303,7 +306,8 @@ bool Converters::convert(Buffer const * buffer, LYXERR(Debug::FILES, "No converter defined! " "I use convertDefault.py:\n\t" << command); Systemcall one; - one.startscript(Systemcall::Wait, command); + one.startscript(Systemcall::Wait, command, buffer ? + buffer->filePath() : string()); if (to_file.isReadableFile()) { if (conversionflags & try_cache) ConverterCache::get().add(orig_from, @@ -330,10 +334,10 @@ bool Converters::convert(Buffer const * buffer, // buffer is only invalid for importing, and then runparams is not // used anyway. OutputParams runparams(buffer ? &buffer->params().encoding() : 0); - runparams.flavor = getFlavor(edgepath); + runparams.flavor = getFlavor(edgepath, buffer); if (buffer) { - runparams.use_japanese = buffer->bufferFormat() == "platex"; + runparams.use_japanese = buffer->params().bufferFormat() == "platex"; runparams.use_indices = buffer->params().use_indices; runparams.bibtex_command = (buffer->params().bibtex_command == "default") ? string() : buffer->params().bibtex_command; @@ -346,6 +350,8 @@ bool Converters::convert(Buffer const * buffer, // 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. + // FIXME: This does not work if path is an UNC path on windows + // (bug 6127). string const path(onlyPath(from_file.absFileName())); // Prevent the compiler from optimizing away p FileName pp(path); @@ -368,7 +374,7 @@ bool Converters::convert(Buffer const * buffer, << conv.from << " to " << conv.to); } infile = outfile; - outfile = FileName(conv.result_dir.empty() + outfile = FileName(conv.result_file.empty() ? changeExtension(from_file.absFileName(), conv.To->extension()) : addName(subst(conv.result_dir, token_base, from_base), @@ -378,6 +384,9 @@ bool Converters::convert(Buffer const * buffer, // if input and output files are equal, we use a // temporary file as intermediary (JMarc) FileName real_outfile; + if (!conv.result_file.empty()) + real_outfile = FileName(changeExtension(from_file.absFileName(), + conv.To->extension())); if (outfile == infile) { real_outfile = infile; // when importing, a buffer does not necessarily exist @@ -390,16 +399,41 @@ bool Converters::convert(Buffer const * buffer, if (conv.latex) { run_latex = true; - string const command = subst(conv.command, token_from, ""); + string command = conv.command; + command = subst(command, token_from, ""); + command = subst(command, token_latex_encoding, buffer ? + buffer->params().encoding().latexName() : string()); LYXERR(Debug::FILES, "Running " << 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_ - << " to update aux file"); - runLaTeX(*buffer, latex_command_, runparams, errorList); + if (conv.need_aux && !run_latex) { + string command; + switch (runparams.flavor) { + case OutputParams::DVILUATEX: + command = dvilualatex_command_; + break; + case OutputParams::LUATEX: + command = lualatex_command_; + break; + case OutputParams::PDFLATEX: + command = pdflatex_command_; + break; + case OutputParams::XETEX: + command = xelatex_command_; + break; + default: + command = latex_command_; + break; + } + if (!command.empty()) { + LYXERR(Debug::FILES, "Running " + << command + << " to update aux file"); + if (!runLaTeX(*buffer, command, + runparams, errorList)) + return false; + } } // FIXME UNICODE @@ -412,8 +446,9 @@ bool Converters::convert(Buffer const * buffer, 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_path, quoteName(infile.onlyPath().absFileName())); - command = subst(command, token_orig_path, quoteName(orig_from.onlyPath().absFileName())); + command = subst(command, token_path, quoteName(onlyPath(infile.absFileName()))); + command = subst(command, token_orig_path, quoteName(onlyPath(orig_from.absFileName()))); + command = subst(command, token_orig_from, quoteName(onlyFileName(orig_from.absFileName()))); command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string()); command = libScriptSearch(command); @@ -436,12 +471,15 @@ bool Converters::convert(Buffer const * buffer, int res; if (dummy) { res = one.startscript(Systemcall::DontWait, - to_filesystem8bit(from_utf8(command))); + to_filesystem8bit(from_utf8(command)), + buffer ? buffer->filePath() : string()); // We're not waiting for the result, so we can't do anything // else here. } else { res = one.startscript(Systemcall::Wait, - to_filesystem8bit(from_utf8(command))); + to_filesystem8bit(from_utf8(command)), + buffer ? buffer->filePath() + : string()); if (!real_outfile.empty()) { Mover const & mover = getMover(conv.to); if (!mover.rename(outfile, real_outfile)) @@ -461,7 +499,8 @@ bool Converters::convert(Buffer const * buffer, " < " + quoteName(infile2 + ".out") + " > " + quoteName(logfile); one.startscript(Systemcall::Wait, - to_filesystem8bit(from_utf8(command2))); + to_filesystem8bit(from_utf8(command2)), + buffer->filePath()); if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList)) return false; } @@ -605,7 +644,8 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, // do the LaTeX run(s) string const name = buffer.latexName(); - LaTeX latex(command, runparams, FileName(makeAbsPath(name))); + LaTeX latex(command, runparams, FileName(makeAbsPath(name)), + buffer.filePath()); TeXErrors terr; ShowMessage show(buffer); latex.message.connect(show); @@ -684,12 +724,20 @@ Converters::getReachableTo(string const & target, bool const clear_visited) vector const Converters::getReachable(string const & from, bool const only_viewable, - bool const clear_visited) + bool const clear_visited, set const & excludes) { + set excluded_numbers;; + + set::const_iterator sit = excludes.begin(); + set::const_iterator const end = excludes.end(); + for (; sit != end; ++sit) + excluded_numbers.insert(formats.getNumber(*sit)); + vector const & reachables = G_.getReachable(formats.getNumber(from), only_viewable, - clear_visited); + clear_visited, + excluded_numbers); return intToFormat(reachables); } @@ -713,8 +761,9 @@ vector Converters::importableFormats() { vector l = loaders(); vector result = getReachableTo(l[0], true); - for (vector::const_iterator it = l.begin() + 1; - it != l.end(); ++it) { + vector::const_iterator it = l.begin() + 1; + vector::const_iterator en = l.end(); + for (; it != en; ++it) { vector r = getReachableTo(*it, false); result.insert(result.end(), r.begin(), r.end()); } @@ -726,8 +775,9 @@ vector Converters::exportableFormats(bool only_viewable) { vector s = savers(); vector result = getReachable(s[0], only_viewable, true); - for (vector::const_iterator it = s.begin() + 1; - it != s.end(); ++it) { + vector::const_iterator it = s.begin() + 1; + vector::const_iterator en = s.end(); + for (; it != en; ++it) { vector r = getReachable(*it, only_viewable, false); result.insert(result.end(), r.begin(), r.end()); @@ -753,6 +803,7 @@ vector Converters::savers() const v.push_back("latex"); v.push_back("literate"); v.push_back("luatex"); + v.push_back("dviluatex"); v.push_back("lyx"); v.push_back("xhtml"); v.push_back("pdflatex");