X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=f208b7415f90fad9b8508c343596b6ac1d2d7a1a;hb=13739f37d5208e87e97c44ef2eeba35807ddb9c5;hp=fd4e7856f76f644219d1b938279c156e0b141f95;hpb=2c9c081e091f001af9c97f486da2a419365368b0;p=lyx.git diff --git a/src/Converter.cpp b/src/Converter.cpp index fd4e7856f7..f208b7415f 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -12,10 +12,11 @@ #include "Converter.h" -#include "ConverterCache.h" #include "Buffer.h" #include "buffer_funcs.h" #include "BufferParams.h" +#include "ConverterCache.h" +#include "Encoding.h" #include "ErrorList.h" #include "Format.h" #include "Language.h" @@ -49,7 +50,7 @@ string const token_base("$$b"); string const token_to("$$o"); string const token_path("$$p"); string const token_orig_path("$$r"); - +string const token_encoding("$$e"); string const add_options(string const & command, string const & options) @@ -107,9 +108,11 @@ void Converter::readFlags() string flag_name, flag_value; flag_list = split(flag_list, flag_value, ','); flag_value = split(flag_value, flag_name, '='); - if (flag_name == "latex") + if (flag_name == "latex") { latex = true; - else if (flag_name == "xml") + latex_flavor = flag_value.empty() ? + "latex" : flag_value; + } else if (flag_name == "xml") xml = true; else if (flag_name == "needaux") need_aux = true; @@ -185,11 +188,12 @@ void Converters::add(string const & from, string const & to, } 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 (converter.latex + && (latex_command_.empty() || converter.latex_flavor == "latex")) + latex_command_ = subst(command, token_from, ""); if (it == converterlist_.end()) { converterlist_.push_back(converter); @@ -254,7 +258,11 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path) cit != path.end(); ++cit) { Converter const & conv = converterlist_[*cit]; if (conv.latex) - if (contains(conv.to, "pdf")) + if (conv.latex_flavor == "xelatex") + return OutputParams::XETEX; + if (conv.latex_flavor == "lualatex") + return OutputParams::LUATEX; + if (conv.latex_flavor == "pdflatex") return OutputParams::PDFLATEX; if (conv.xml) return OutputParams::XML; @@ -282,7 +290,7 @@ bool Converters::convert(Buffer const * buffer, // if no special converter defined, then we take the // default one from ImageMagic. string const from_ext = from_format.empty() ? - getExtension(from_file.absFilename()) : + getExtension(from_file.absFileName()) : formats.extension(from_format); string const to_ext = formats.extension(to_format); string const command = @@ -324,12 +332,21 @@ bool Converters::convert(Buffer const * buffer, OutputParams runparams(buffer ? &buffer->params().encoding() : 0); runparams.flavor = getFlavor(edgepath); + if (buffer) { + runparams.use_japanese = buffer->bufferFormat() == "platex"; + runparams.use_indices = buffer->params().use_indices; + runparams.bibtex_command = (buffer->params().bibtex_command == "default") ? + string() : buffer->params().bibtex_command; + runparams.index_command = (buffer->params().index_command == "default") ? + string() : buffer->params().index_command; + } + // 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 const path(onlyPath(from_file.absFilename())); + string const path(onlyPath(from_file.absFileName())); // Prevent the compiler from optimizing away p FileName pp(path); PathChanger p(pp); @@ -338,8 +355,8 @@ bool Converters::convert(Buffer const * buffer, errorList.clear(); bool run_latex = false; - string from_base = changeExtension(from_file.absFilename(), ""); - string to_base = changeExtension(to_file.absFilename(), ""); + string from_base = changeExtension(from_file.absFileName(), ""); + string to_base = changeExtension(to_file.absFileName(), ""); FileName infile; FileName outfile = from_file; for (Graph::EdgePath::const_iterator cit = edgepath.begin(); @@ -352,11 +369,11 @@ bool Converters::convert(Buffer const * buffer, } infile = outfile; outfile = FileName(conv.result_dir.empty() - ? changeExtension(from_file.absFilename(), conv.To->extension()) + ? changeExtension(from_file.absFileName(), 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) @@ -367,7 +384,7 @@ bool Converters::convert(Buffer const * buffer, if (buffer) outfile = FileName(addName(buffer->temppath(), "tmpfile.out")); else - outfile = FileName(addName(package().temp_dir().absFilename(), + outfile = FileName(addName(package().temp_dir().absFileName(), "tmpfile.out")); } @@ -386,17 +403,18 @@ bool Converters::convert(Buffer const * buffer, } // FIXME UNICODE - string const infile2 = - to_utf8(makeRelPath(from_utf8(infile.absFilename()), from_utf8(path))); - string const outfile2 = - to_utf8(makeRelPath(from_utf8(outfile.absFilename()), from_utf8(path))); + string const infile2 = + to_utf8(makeRelPath(from_utf8(infile.absFileName()), from_utf8(path))); + string const outfile2 = + to_utf8(makeRelPath(from_utf8(outfile.absFileName()), from_utf8(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_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_encoding, buffer ? buffer->params().encoding().iconvName() : string()); command = libScriptSearch(command); if (!conv.parselog.empty()) @@ -457,8 +475,8 @@ bool Converters::convert(Buffer const * buffer, // 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_utf8(command.substr(0, 50)))); + bformat(_("An error occurred while running:\n%1$s"), + wrapParas(from_utf8(command)))); } return false; } @@ -501,16 +519,16 @@ bool Converters::move(string const & fmt, return true; bool no_errors = true; - string const path = onlyPath(from.absFilename()); - string const base = onlyFilename(removeExtension(from.absFilename())); - string const to_base = removeExtension(to.absFilename()); - string const to_extension = getExtension(to.absFilename()); + string const path = onlyPath(from.absFileName()); + string const base = onlyFileName(removeExtension(from.absFileName())); + string const to_base = removeExtension(to.absFileName()); + string const to_extension = getExtension(to.absFileName()); - support::FileNameList const files = FileName(path).dirList(getExtension(from.absFilename())); + support::FileNameList const files = FileName(path).dirList(getExtension(from.absFileName())); for (support::FileNameList::const_iterator it = files.begin(); it != files.end(); ++it) { - string const from2 = it->absFilename(); - string const file2 = onlyFilename(from2); + string const from2 = it->absFileName(); + string const file2 = onlyFileName(from2); if (prefixIs(file2, base)) { string const to2 = changeExtension( to_base + file2.substr(base.length()), @@ -597,13 +615,13 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, buffer.bufferErrors(terr, errorList); // check return value from latex.run(). - if ((result & LaTeX::NO_LOGFILE)) { + if ((result & LaTeX::NO_LOGFILE) && !buffer.isClone()) { 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) { + } else if ((result & LaTeX::NO_OUTPUT) && !buffer.isClone()) { Alert::warning(_("Output is empty"), _("An empty output file was generated.")); } @@ -624,13 +642,17 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, void Converters::buildGraph() { + // clear graph's data structures G_.init(formats.size()); - ConverterList::iterator beg = converterlist_.begin(); + // each of the converters knows how to convert one format to another + // so, for each of them, we create an arrow on the graph, going from + // the one to the other + ConverterList::iterator it = 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); + for (; it != end ; ++it) { + int const from = formats.getNumber(it->from); + int const to = formats.getNumber(it->to); + G_.addEdge(from, to); } } @@ -691,8 +713,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()); } @@ -700,6 +723,21 @@ vector Converters::importableFormats() } +vector Converters::exportableFormats(bool only_viewable) +{ + vector s = savers(); + vector result = getReachable(s[0], only_viewable, true); + 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()); + } + return result; +} + + vector Converters::loaders() const { vector v; @@ -710,4 +748,21 @@ vector Converters::loaders() const } +vector Converters::savers() const +{ + vector v; + v.push_back("docbook"); + v.push_back("latex"); + v.push_back("literate"); + v.push_back("luatex"); + v.push_back("lyx"); + v.push_back("xhtml"); + v.push_back("pdflatex"); + v.push_back("platex"); + v.push_back("text"); + v.push_back("xetex"); + return v; +} + + } // namespace lyx