X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=d8d1dd1ca87a512388f024ad87506127ace1d9ab;hb=e45427de389bc188f02ebe0de2c052740dcde09c;hp=f2a463868e381d2badae7bd5aa23ee1304a32261;hpb=ada0bd00f07c85235c6653a0f7ecb04a8c28b54d;p=lyx.git diff --git a/src/Converter.cpp b/src/Converter.cpp index f2a463868e..d8d1dd1ca8 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -16,55 +16,29 @@ #include "Buffer.h" #include "buffer_funcs.h" #include "BufferParams.h" -#include "debug.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/lstrings.h" #include "support/os.h" #include "support/Package.h" #include "support/Path.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,6 +48,7 @@ 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"); @@ -90,8 +65,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,7 +77,7 @@ 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) {} @@ -279,6 +254,8 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path) cit != path.end(); ++cit) { Converter const & conv = converterlist_[*cit]; if (conv.latex) + if (contains(conv.from, "xetex")) + return OutputParams::XETEX; if (contains(conv.to, "pdf")) return OutputParams::PDFLATEX; if (conv.xml) @@ -311,25 +288,31 @@ bool Converters::convert(Buffer const * buffer, 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; + LYXERR(Debug::FILES, "No converter defined! " + "I use convertDefault.py:\n\t" << command); Systemcall one; one.startscript(Systemcall::Wait, command); - if (isFileReadable(to_file)) { + 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" @@ -342,6 +325,15 @@ bool Converters::convert(Buffer const * buffer, // used anyway. 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. @@ -351,7 +343,7 @@ bool Converters::convert(Buffer const * buffer, 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(); @@ -365,9 +357,10 @@ bool Converters::convert(Buffer const * buffer, cit != edgepath.end(); ++cit) { Converter const & conv = converterlist_[*cit]; bool dummy = conv.To->dummy() && conv.to != "program"; - if (!dummy) - LYXERR(Debug::FILES) << "Converting from " - << conv.from << " to " << conv.to << endl; + if (!dummy) { + 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()) @@ -392,15 +385,14 @@ bool Converters::convert(Buffer const * buffer, if (conv.latex) { run_latex = true; string const command = subst(conv.command, token_from, ""); - LYXERR(Debug::FILES) << "Running " << command << endl; + 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; + LYXERR(Debug::FILES, "Running " << latex_command_ + << " to update aux file"); runLaTeX(*buffer, latex_command_, runparams, errorList); } @@ -414,6 +406,8 @@ 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 = libScriptSearch(command); if (!conv.parselog.empty()) @@ -426,7 +420,7 @@ bool Converters::convert(Buffer const * buffer, 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)); @@ -446,10 +440,8 @@ bool Converters::convert(Buffer const * buffer, 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; @@ -525,9 +517,8 @@ bool Converters::move(string const & fmt, 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(); + 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); @@ -535,8 +526,7 @@ bool Converters::move(string const & fmt, 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 @@ -578,7 +568,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; } @@ -586,13 +576,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::signals::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_; }; @@ -603,36 +591,36 @@ 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(); + string const name = buffer.latexName(); LaTeX latex(command, runparams, FileName(makeAbsPath(name))); 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 ((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.")); } - buffer.busy(false); + buffer.setBusy(false); int const ERROR_MASK = LaTeX::NO_LOGFILE | @@ -647,19 +635,23 @@ 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); } } -std::vector const -Converters::intToFormat(std::vector const & input) +vector const +Converters::intToFormat(vector const & input) { vector result(input.size()); @@ -703,11 +695,64 @@ 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); + for (vector::const_iterator it = l.begin() + 1; + it != l.end(); ++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); + for (vector::const_iterator it = s.begin() + 1; + it != s.end(); ++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("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