X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=6acd05a22b1b8c902138575bb9d1af700c2db187;hb=57b69a5efddf9f3c148007322f00dad6c253a2ed;hp=3108d6d286d057bf5ad79f7c3c0f3dfbf190ce00;hpb=26f336769af8dd5c48c2c0241cd3fbfc50a3c65e;p=lyx.git diff --git a/src/Converter.cpp b/src/Converter.cpp index 3108d6d286..6acd05a22b 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -12,59 +12,35 @@ #include "Converter.h" -#include "ConverterCache.h" #include "Buffer.h" #include "buffer_funcs.h" #include "BufferParams.h" -#include "debug.h" +#include "ConverterCache.h" +#include "Encoding.h" #include "ErrorList.h" #include "Format.h" -#include "gettext.h" #include "Language.h" #include "LaTeX.h" #include "Mover.h" #include "frontends/alert.h" +#include "support/debug.h" +#include "support/FileNameList.h" #include "support/filetools.h" -#include "support/lyxlib.h" +#include "support/gettext.h" +#include "support/lassert.h" +#include "support/lstrings.h" #include "support/os.h" #include "support/Package.h" -#include "support/Path.h" +#include "support/PathChanger.h" #include "support/Systemcall.h" -using std::endl; -using std::find_if; -using std::string; -using std::vector; -using std::distance; - +using namespace std; +using namespace lyx::support; 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::FileName; -using support::getExtension; -using support::isFileReadable; -using support::libFileSearch; -using support::libScriptSearch; -using support::makeAbsPath; -using support::makeRelPath; -using support::onlyFilename; -using support::onlyPath; -using support::package; -using support::prefixIs; -using support::quoteName; -using support::removeExtension; -using support::split; -using support::subst; -using support::Systemcall; - namespace Alert = lyx::frontend::Alert; @@ -74,7 +50,10 @@ string const token_from("$$i"); 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) @@ -90,8 +69,8 @@ string const dvipdfm_options(BufferParams const & bp) string result; if (bp.papersize != PAPER_CUSTOM) { - string const paper_size = bp.paperSizeName(); - if (paper_size != "b5" && paper_size != "foolscap") + string const paper_size = bp.paperSizeName(BufferParams::DVIPDFM); + if (!paper_size.empty()) result = "-p "+ paper_size; if (bp.orientation == ORIENTATION_LANDSCAPE) @@ -102,12 +81,12 @@ string const dvipdfm_options(BufferParams const & bp) } -class ConverterEqual : public std::binary_function { +class ConverterEqual { 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 c.from() == from_ && c.to() == to_; } private: string const from_; @@ -119,55 +98,44 @@ private: 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) + : from_(f), to_(t), command_(c), flags_(l), + From_(0), To_(0), latex_(false), xml_(false), + need_aux_(false), nice_(false) {} void Converter::readFlags() { - string flag_list(flags); + string flag_list(flags_); while (!flag_list.empty()) { string flag_name, flag_value; flag_list = split(flag_list, flag_value, ','); flag_value = split(flag_value, flag_name, '='); - if (flag_name == "latex") - latex = true; - else if (flag_name == "xml") - xml = true; + if (flag_name == "latex") { + latex_ = true; + latex_flavor_ = flag_value.empty() ? + "latex" : flag_value; + } else if (flag_name == "xml") + xml_ = true; else if (flag_name == "needaux") - need_aux = true; + need_aux_ = true; else if (flag_name == "resultdir") - result_dir = (flag_value.empty()) + result_dir_ = (flag_value.empty()) ? token_base : flag_value; else if (flag_name == "resultfile") - result_file = flag_value; + result_file_ = flag_value; else if (flag_name == "parselog") - parselog = flag_value; + parselog_ = flag_value; + else if (flag_name == "nice") + nice_ = true; } - if (!result_dir.empty() && result_file.empty()) - result_file = "index." + formats.extension(to); + if (!result_dir_.empty() && result_file_.empty()) + result_file_ = "index." + formats.extension(to_); //if (!contains(command, token_from)) // latex = true; } -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 { @@ -205,22 +173,36 @@ void Converters::add(string const & from, string const & to, Converter converter(from, to, command, flags); if (it != converterlist_.end() && !flags.empty() && flags[0] == '*') { converter = *it; - converter.command = command; - converter.flags = flags; + converter.setCommand(command); + converter.setFlags(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. // The latex_command is used to update the .aux file when running // a converter that uses it. + 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); } else { - converter.From = it->From; - converter.To = it->To; + converter.setFrom(it->From()); + converter.setTo(it->To()); *it = converter; } } @@ -249,8 +231,8 @@ void Converters::update(Formats const & formats) ConverterList::iterator it = converterlist_.begin(); ConverterList::iterator end = converterlist_.end(); for (; it != end; ++it) { - it->From = formats.getFormat(it->from); - it->To = formats.getFormat(it->to); + it->setFrom(formats.getFormat(it->from())); + it->setTo(formats.getFormat(it->to())); } } @@ -261,30 +243,35 @@ void Converters::updateLast(Formats const & formats) { if (converterlist_.begin() != converterlist_.end()) { ConverterList::iterator it = converterlist_.end() - 1; - it->From = formats.getFormat(it->from); - it->To = formats.getFormat(it->to); + it->setFrom(formats.getFormat(it->from())); + it->setTo(formats.getFormat(it->to())); } } -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 (contains(conv.to, "pdf")) + 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) + } + if (conv.xml()) return OutputParams::XML; } - return OutputParams::LATEX; + return buffer ? buffer->params().getOutputFlavor() + : OutputParams::LATEX; } @@ -307,29 +294,37 @@ 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 = - support::os::python() + ' ' + + os::python() + ' ' + quoteName(libFileSearch("scripts", "convertDefault.py").toFilesystemEncoding()) + - ' ' + - quoteName(from_ext + ':' + from_file.toFilesystemEncoding()) + - ' ' + - quoteName(to_ext + ':' + to_file.toFilesystemEncoding()); - LYXERR(Debug::FILES) - << "No converter defined! " - "I use convertDefault.py:\n\t" - << command << endl; + ' ' + from_ext + ' ' + + quoteName(from_file.toFilesystemEncoding()) + + ' ' + to_ext + ' ' + + quoteName(to_file.toFilesystemEncoding()); + LYXERR(Debug::FILES, "No converter defined! " + "I use convertDefault.py:\n\t" << command); Systemcall one; - one.startscript(Systemcall::Wait, command); - if (isFileReadable(to_file)) { + one.startscript(Systemcall::Wait, command, + buffer ? buffer->filePath() : string(), + buffer ? buffer->layoutPos() : string()); + if (to_file.isReadableFile()) { if (conversionflags & try_cache) ConverterCache::get().add(orig_from, to_format, to_file); return true; } } + + // only warn once per session and per file type + static std::map warned; + if (warned.find(from_format) != warned.end() && warned.find(from_format)->second == to_format) { + return false; + } + warned.insert(make_pair(from_format, to_format)); + Alert::error(_("Cannot convert file"), bformat(_("No information for converting %1$s " "format files to %2$s.\n" @@ -341,93 +336,137 @@ 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->params().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; + runparams.document_language = buffer->params().language->babel(); + } // 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())); + // 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); - support::Path p(pp); + PathChanger p(pp); // empty the error list before any new conversion takes place. 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(); cit != edgepath.end(); ++cit) { Converter const & conv = converterlist_[*cit]; - bool dummy = conv.To->dummy() && conv.to != "program"; + bool dummy = conv.To()->dummy() && conv.to() != "program"; if (!dummy) { - LYXERR(Debug::FILES) << "Converting from " - << conv.from << " to " << conv.to << endl; + LYXERR(Debug::FILES, "Converting from " + << conv.from() << " to " << conv.to()); } infile = outfile; - outfile = FileName(conv.result_dir.empty() - ? changeExtension(from_file.absFilename(), conv.To->extension()) - : addName(subst(conv.result_dir, + outfile = FileName(conv.result_file().empty() + ? 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)))); + subst(conv.result_file(), + token_base, onlyFileName(from_base)))); // 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 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")); } - if (conv.latex) { + if (conv.latex()) { run_latex = true; - string const command = subst(conv.command, token_from, ""); - LYXERR(Debug::FILES) << "Running " << command << endl; + 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"<< endl; - 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 - 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; + 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 = libScriptSearch(command); + 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()); - if (!conv.parselog.empty()) + if (!conv.parselog().empty()) command += " 2> " + quoteName(infile2 + ".out"); - if (conv.from == "dvi" && conv.to == "ps") + // it is not actually not necessary to test for buffer here, + // but it pleases coverity. + if (buffer && conv.from() == "dvi" && conv.to() == "ps") command = add_options(command, buffer->params().dvips_options()); - else if (conv.from == "dvi" && prefixIs(conv.to, "pdf")) + else if (buffer && conv.from() == "dvi" && prefixIs(conv.to(), "pdf")) command = add_options(command, dvipdfm_options(buffer->params())); - LYXERR(Debug::FILES) << "Calling " << command << endl; + LYXERR(Debug::FILES, "Calling " << command); if (buffer) buffer->message(_("Executing command: ") + from_utf8(command)); @@ -436,49 +475,54 @@ 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(), + buffer ? buffer->layoutPos() : 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(), + buffer ? buffer->layoutPos() + : string()); if (!real_outfile.empty()) { - Mover const & mover = getMover(conv.to); + Mover const & mover = getMover(conv.to()); if (!mover.rename(outfile, real_outfile)) res = -1; else - LYXERR(Debug::FILES) - << "renaming file " << outfile - << " to " << real_outfile - << endl; + LYXERR(Debug::FILES, "renaming file " << outfile + << " to " << real_outfile); // Finally, don't forget to tell any future // converters to use the renamed file... outfile = real_outfile; } - - if (!conv.parselog.empty()) { + + if (!conv.parselog().empty()) { string const logfile = infile2 + ".log"; - string const script = libScriptSearch(conv.parselog); - string const command2 = script + + string const command2 = conv.parselog() + " < " + quoteName(infile2 + ".out") + " > " + quoteName(logfile); one.startscript(Systemcall::Wait, - to_filesystem8bit(from_utf8(command2))); + to_filesystem8bit(from_utf8(command2)), + buffer->filePath(), + buffer->layoutPos()); if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList)) return false; } } if (res) { - if (conv.to == "program") { + 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_utf8(command.substr(0, 50)))); + bformat(_("An error occurred while running:\n%1$s"), + wrapParas(from_utf8(command)))); } return false; } @@ -486,18 +530,18 @@ bool Converters::convert(Buffer const * buffer, } Converter const & conv = converterlist_[edgepath.back()]; - if (conv.To->dummy()) + if (conv.To()->dummy()) return true; - if (!conv.result_dir.empty()) { + if (!conv.result_dir().empty()) { // The converter has put the file(s) in a directory. // In this case we ignore the given to_file. if (from_base != to_base) { - string const from = subst(conv.result_dir, + string const from = subst(conv.result_dir(), token_base, from_base); - string const to = subst(conv.result_dir, + string const to = subst(conv.result_dir(), token_base, to_base); - Mover const & mover = getMover(conv.from); + Mover const & mover = getMover(conv.from()); if (!mover.rename(FileName(from), FileName(to))) { Alert::error(_("Cannot convert file"), bformat(_("Could not move a temporary directory from %1$s to %2$s."), @@ -509,7 +553,7 @@ bool Converters::convert(Buffer const * buffer, } else { if (conversionflags & try_cache) ConverterCache::get().add(orig_from, to_format, outfile); - return move(conv.to, outfile, to_file, conv.latex); + return move(conv.to(), outfile, to_file, conv.latex()); } } @@ -521,23 +565,21 @@ 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()); - - vector const files = dirList(FileName(path), - getExtension(from.absFilename())); - for (vector::const_iterator it = files.begin(); + 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())); + 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()), to_extension); - LYXERR(Debug::FILES) << "moving " << from2 - << " to " << to2 << endl; + LYXERR(Debug::FILES, "moving " << from2 << " to " << to2); Mover const & mover = getMover(fmt); bool const moved = copy @@ -562,7 +604,7 @@ bool Converters::formatIsUsed(string const & format) ConverterList::const_iterator cit = converterlist_.begin(); ConverterList::const_iterator end = converterlist_.end(); for (; cit != end; ++cit) { - if (cit->from == format || cit->to == format) + if (cit->from() == format || cit->to() == format) return true; } return false; @@ -579,7 +621,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, int const result = latex.scanLogFile(terr); if (result & LaTeX::ERRORS) - bufferErrors(buffer, terr, errorList); + buffer.bufferErrors(terr, errorList); return true; } @@ -587,13 +629,11 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, namespace { -class showMessage : public std::unary_function, public boost::signals::trackable { +class ShowMessage + : public boost::signals2::trackable { public: - showMessage(Buffer const & b) : buffer_(b) {}; - void operator()(docstring const & m) const - { - buffer_.message(m); - } + ShowMessage(Buffer const & b) : buffer_(b) {} + void operator()(docstring const & msg) const { buffer_.message(msg); } private: Buffer const & buffer_; }; @@ -604,36 +644,47 @@ private: bool Converters::runLaTeX(Buffer const & buffer, string const & command, OutputParams const & runparams, ErrorList & errorList) { - buffer.busy(true); + buffer.setBusy(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, FileName(makeAbsPath(name))); + string const name = buffer.latexName(); + LaTeX latex(command, runparams, FileName(makeAbsPath(name)), + buffer.filePath(), buffer.layoutPos(), + buffer.lastPreviewError()); TeXErrors terr; - showMessage show(buffer); + ShowMessage show(buffer); latex.message.connect(show); int const result = latex.run(terr); if (result & LaTeX::ERRORS) - bufferErrors(buffer, terr, errorList); + buffer.bufferErrors(terr, errorList); - // check return value from latex.run(). - if ((result & LaTeX::NO_LOGFILE)) { + if (!errorList.empty()) { + // We will show the LaTeX Errors GUI later which contains + // specific error messages so it would be repetitive to give + // e.g. the "finished with an error" dialog in addition. + } + else if (result & LaTeX::NO_LOGFILE) { 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::NONZERO_ERROR) { + docstring const str = + bformat(_( "The external program\n%1$s\n" + "finished with an error. " + "It is recommended you fix the cause of the external " + "program's error (check the logs). "), from_utf8(command)); + Alert::error(_("LaTeX failed"), str); } else if (result & LaTeX::NO_OUTPUT) { Alert::warning(_("Output is empty"), - _("An empty output file was generated.")); + _("No output file was generated.")); } - buffer.busy(false); + buffer.setBusy(false); int const ERROR_MASK = LaTeX::NO_LOGFILE | @@ -641,26 +692,31 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, LaTeX::NO_OUTPUT; return (result & ERROR_MASK) == 0; - } 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()); + LASSERT(from >= 0, continue); + LASSERT(to >= 0, continue); + G_.addEdge(from, to); } } -std::vector const -Converters::intToFormat(std::vector const & input) +vector const +Converters::intToFormat(vector const & input) { vector result(input.size()); @@ -686,12 +742,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); } @@ -704,11 +768,68 @@ bool Converters::isReachable(string const & from, string const & to) } -Graph::EdgePath const -Converters::getPath(string const & from, string const & to) +Graph::EdgePath Converters::getPath(string const & from, string const & to) { return G_.getPath(formats.getNumber(from), formats.getNumber(to)); } + +vector Converters::importableFormats() +{ + vector l = loaders(); + vector result = getReachableTo(l[0], true); + 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()); + } + return result; +} + + +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; + v.push_back("lyx"); + v.push_back("text"); + v.push_back("textparagraph"); + return v; +} + + +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("dviluatex"); + 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