X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=cb98b44194f86b3eaab0c3b5f8a39183885fa364;hb=bb277747d2fc128d65edb55662d075ce44100bc7;hp=664a4bb7180a32fe615384c8a584d277c48b0a99;hpb=3d590d3bd71a3522d525ce71220e99bd25b6a648;p=lyx.git diff --git a/src/Converter.cpp b/src/Converter.cpp index 664a4bb718..cb98b44194 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -105,7 +105,7 @@ 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), + From_(nullptr), To_(nullptr), latex_(false), xml_(false), need_aux_(false), nice_(false), need_auth_(false) {} @@ -123,9 +123,11 @@ void Converter::readFlags() "latex" : flag_value; } else if (flag_name == "xml") xml_ = true; - else if (flag_name == "needaux") + else if (flag_name == "needaux") { need_aux_ = true; - else if (flag_name == "resultdir") + latex_flavor_ = flag_value.empty() ? + "latex" : flag_value; + } else if (flag_name == "resultdir") result_dir_ = (flag_value.empty()) ? token_base : flag_value; else if (flag_name == "resultfile") @@ -136,6 +138,8 @@ void Converter::readFlags() nice_ = true; else if (flag_name == "needauth") need_auth_ = true; + else if (flag_name == "hyperref-driver") + href_driver_ = flag_value; } if (!result_dir_.empty() && result_file_.empty()) result_file_ = "index." + theFormats().extension(to_); @@ -153,7 +157,7 @@ Converter const * Converters::getConverter(string const & from, if (cit != converterlist_.end()) return &(*cit); else - return 0; + return nullptr; } @@ -236,11 +240,9 @@ void Converters::erase(string const & from, string const & to) // a list (instead of a vector), but this will cause other problems). void Converters::update(Formats const & formats) { - ConverterList::iterator it = converterlist_.begin(); - ConverterList::iterator end = converterlist_.end(); - for (; it != end; ++it) { - it->setFrom(formats.getFormat(it->from())); - it->setTo(formats.getFormat(it->to())); + for (auto & cv : converterlist_) { + cv.setFrom(formats.getFormat(cv.from())); + cv.setTo(formats.getFormat(cv.to())); } } @@ -260,10 +262,9 @@ void Converters::updateLast(Formats const & formats) 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()) { + for (auto const & edge : path) { + Converter const & conv = converterlist_[edge]; + if (conv.latex() || conv.need_aux()) { if (conv.latex_flavor() == "latex") return OutputParams::LATEX; if (conv.latex_flavor() == "xelatex") @@ -283,6 +284,17 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path, } +string Converters::getHyperrefDriver(Graph::EdgePath const & path) +{ + for (auto const & edge : path) { + Converter const & conv = converterlist_[edge]; + if (!conv.hyperref_driver().empty()) + return conv.hyperref_driver(); + } + return string(); +} + + bool Converters::checkAuth(Converter const & conv, string const & doc_fname, bool use_shell_escape) { @@ -384,18 +396,20 @@ bool Converters::checkAuth(Converter const & conv, string const & doc_fname, } -bool Converters::convert(Buffer const * buffer, +Converters::RetVal Converters::convert(Buffer const * buffer, FileName const & from_file, FileName const & to_file, FileName const & orig_from, string const & from_format, string const & to_format, - ErrorList & errorList, int conversionflags) + ErrorList & errorList, int conversionflags, bool includeall) { if (from_format == to_format) - return move(from_format, from_file, to_file, false); + return move(from_format, from_file, to_file, false) ? + SUCCESS : FAILURE; if ((conversionflags & try_cache) && ConverterCache::get().inCache(orig_from, to_format)) - return ConverterCache::get().copy(orig_from, to_format, to_file); + return ConverterCache::get().copy(orig_from, to_format, to_file) ? + SUCCESS : FAILURE; Graph::EdgePath edgepath = getPath(from_format, to_format); if (edgepath.empty()) { @@ -416,21 +430,31 @@ 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, - buffer ? buffer->filePath() : string(), - buffer ? buffer->layoutPos() : string()); + Systemcall::Starttype starttype = + (buffer && buffer->isClone()) ? + Systemcall::WaitLoop : Systemcall::Wait; + int const exitval = one.startscript(starttype, command, + buffer ? buffer->filePath() : string(), + buffer ? buffer->layoutPos() : string()); + if (exitval == Systemcall::KILLED) { + frontend::Alert::warning( + _("Converter killed"), + bformat(_("The following converter was killed by the user.\n %1$s\n"), + from_utf8(command))); + return KILLED; + } if (to_file.isReadableFile()) { if (conversionflags & try_cache) ConverterCache::get().add(orig_from, to_format, to_file); - return true; + return SUCCESS; } } // 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; + return FAILURE; } warned.insert(make_pair(from_format, to_format)); @@ -439,27 +463,32 @@ bool Converters::convert(Buffer const * buffer, "format files to %2$s.\n" "Define a converter in the preferences."), from_ascii(from_format), from_ascii(to_format))); - return false; + return FAILURE; } // buffer is only invalid for importing, and then runparams is not // used anyway. - OutputParams runparams(buffer ? &buffer->params().encoding() : 0); + OutputParams runparams(buffer ? &buffer->params().encoding() : nullptr); runparams.flavor = getFlavor(edgepath, buffer); if (buffer) { + BufferParams const & bp = buffer->params(); runparams.use_japanese = - (buffer->params().bufferFormat() == "latex" - || suffixIs(buffer->params().bufferFormat(), "-ja")) - && buffer->params().encoding().package() == Encoding::japanese; - runparams.use_indices = buffer->params().use_indices; - runparams.bibtex_command = buffer->params().bibtexCommand(); - runparams.index_command = (buffer->params().index_command == "default") ? - string() : buffer->params().index_command; - runparams.document_language = buffer->params().language->babel(); - runparams.only_childbibs = !buffer->params().useBiblatex() - && !buffer->params().useBibtopic() - && buffer->params().multibib == "child"; + (bp.bufferFormat() == "latex" + || suffixIs(bp.bufferFormat(), "-ja")) + && bp.encoding().package() == Encoding::japanese; + runparams.use_indices = bp.use_indices; + runparams.bibtex_command = bp.bibtexCommand(); + runparams.index_command = (bp.index_command == "default") ? + string() : bp.index_command; + runparams.document_language = bp.language->babel(); + runparams.xindy_language = bp.language->xindy(); + // Some macros rely on font encoding + runparams.main_fontenc = bp.main_font_encoding(); + runparams.only_childbibs = !bp.useBiblatex() + && !bp.useBibtopic() + && bp.multibib == "child"; + runparams.includeall = includeall; } // Some converters (e.g. lilypond) can only output files to the @@ -482,9 +511,8 @@ bool Converters::convert(Buffer const * buffer, 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]; + for (auto const & edge : edgepath) { + Converter const & conv = converterlist_[edge]; bool dummy = conv.To()->dummy() && conv.to() != "program"; if (!dummy) { LYXERR(Debug::FILES, "Converting from " @@ -550,11 +578,11 @@ bool Converters::convert(Buffer const * buffer, if (!checkAuth(conv, buffer ? buffer->absFileName() : string(), buffer && buffer->params().shell_escape)) - return false; + return FAILURE; if (conv.latex()) { // We are not importing, we have a buffer - LATTEST(buffer); + LASSERT(buffer, return FAILURE); run_latex = true; string command = conv.command(); command = subst(command, token_from, ""); @@ -564,12 +592,15 @@ bool Converters::convert(Buffer const * buffer, && !contains(command, "-shell-escape")) command += " -shell-escape "; LYXERR(Debug::FILES, "Running " << command); - if (!runLaTeX(*buffer, command, runparams, errorList)) - return false; + // FIXME KILLED + // Check changed return value here. + RetVal const retval = runLaTeX(*buffer, command, runparams, errorList); + if (retval != SUCCESS) + return retval; } else { if (conv.need_aux() && !run_latex) { // We are not importing, we have a buffer - LATTEST(buffer); + LASSERT(buffer, return FAILURE); string command; switch (runparams.flavor) { case OutputParams::DVILUATEX: @@ -592,9 +623,11 @@ bool Converters::convert(Buffer const * buffer, LYXERR(Debug::FILES, "Running " << command << " to update aux file"); - if (!runLaTeX(*buffer, command, - runparams, errorList)) - return false; + // FIXME KILLED + // Check changed return value here. + RetVal const retval = runLaTeX(*buffer, command, runparams, errorList); + if (retval != SUCCESS) + return retval; } } @@ -640,12 +673,23 @@ bool Converters::convert(Buffer const * buffer, // We're not waiting for the result, so we can't do anything // else here. } else { - res = one.startscript(Systemcall::Wait, + Systemcall::Starttype starttype = + (buffer && buffer->isClone()) ? + Systemcall::WaitLoop : Systemcall::Wait; + res = one.startscript(starttype, to_filesystem8bit(from_utf8(command)), buffer ? buffer->filePath() : string(), buffer ? buffer->layoutPos() : string()); + if (res == Systemcall::KILLED) { + frontend::Alert::warning( + _("Converter killed"), + bformat(_("The following converter was killed by the user.\n %1$s\n"), + from_utf8(command))); + return KILLED; + } + if (!real_outfile.empty()) { Mover const & mover = getMover(conv.to()); if (!mover.rename(outfile, real_outfile)) @@ -663,16 +707,35 @@ bool Converters::convert(Buffer const * buffer, string const command2 = conv.parselog() + " < " + quoteName(infile2 + ".out") + " > " + quoteName(logfile); - one.startscript(Systemcall::Wait, + res = one.startscript(starttype, to_filesystem8bit(from_utf8(command2)), - buffer->filePath(), - buffer->layoutPos()); - if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList)) - return false; + buffer ? buffer->filePath() : string(), + buffer ? buffer->layoutPos() : string()); + if (res == Systemcall::KILLED) { + frontend::Alert::warning( + _("Converter killed"), + bformat(_("The following converter was killed by the user.\n %1$s\n"), + from_utf8(command))); + return KILLED; + } + if (buffer && !scanLog(*buffer, command, makeAbsPath(logfile, path), errorList)) + return FAILURE; } } if (res) { + if (res == Systemcall::KILLED) { + Alert::information(_("Process Killed"), + bformat(_("The conversion process was killed while running:\n%1$s"), + wrapParas(from_utf8(command)))); + return KILLED; + } + if (res == Systemcall::TIMEOUT) { + Alert::information(_("Process Timed Out"), + bformat(_("The conversion process:\n%1$s\ntimed out before completing."), + wrapParas(from_utf8(command)))); + return KILLED; + } if (conv.to() == "program") { Alert::error(_("Build errors"), _("There were errors during the build process.")); @@ -683,14 +746,14 @@ bool Converters::convert(Buffer const * buffer, bformat(_("An error occurred while running:\n%1$s"), wrapParas(from_utf8(command)))); } - return false; + return FAILURE; } } } Converter const & conv = converterlist_[edgepath.back()]; if (conv.To()->dummy()) - return true; + return SUCCESS; if (!conv.result_dir().empty()) { // The converter has put the file(s) in a directory. @@ -705,14 +768,14 @@ bool Converters::convert(Buffer const * buffer, Alert::error(_("Cannot convert file"), bformat(_("Could not move a temporary directory from %1$s to %2$s."), from_utf8(from), from_utf8(to))); - return false; + return FAILURE; } } - return true; + return SUCCESS; } 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()) ? SUCCESS : FAILURE; } } @@ -730,9 +793,8 @@ bool Converters::move(string const & fmt, 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(); + for (auto const & f : files) { + string const from2 = f.absFileName(); string const file2 = onlyFileName(from2); if (prefixIs(file2, base)) { string const to2 = changeExtension( @@ -742,8 +804,8 @@ bool Converters::move(string const & fmt, Mover const & mover = getMover(fmt); bool const moved = copy - ? mover.copy(*it, FileName(to2)) - : mover.rename(*it, FileName(to2)); + ? mover.copy(f, FileName(to2)) + : mover.rename(f, FileName(to2)); if (!moved && no_errors) { Alert::error(_("Cannot convert file"), bformat(copy ? @@ -760,10 +822,8 @@ bool Converters::move(string const & fmt, 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) + for (auto const & cvt : converterlist_) { + if (cvt.from() == format || cvt.to() == format) return true; } return false; @@ -773,7 +833,7 @@ bool Converters::formatIsUsed(string const & format) bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, FileName const & filename, ErrorList & errorList) { - OutputParams runparams(0); + OutputParams runparams(nullptr); runparams.flavor = OutputParams::LATEX; LaTeX latex("", runparams, filename); TeXErrors terr; @@ -786,7 +846,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/, } -bool Converters::runLaTeX(Buffer const & buffer, string const & command, +Converters::RetVal Converters::runLaTeX(Buffer const & buffer, string const & command, OutputParams const & runparams, ErrorList & errorList) { buffer.setBusy(true); @@ -796,7 +856,7 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, string const name = buffer.latexName(); LaTeX latex(command, runparams, FileName(makeAbsPath(name)), buffer.filePath(), buffer.layoutPos(), - buffer.lastPreviewError()); + buffer.isClone(), buffer.freshStartRequired()); TeXErrors terr; // The connection closes itself at the end of the scope when latex is // destroyed. One cannot close (and destroy) buffer while the converter is @@ -806,9 +866,24 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, }); int const result = latex.run(terr); + if (result == Systemcall::KILLED) { + Alert::error(_("Export canceled"), + _("The export process was terminated by the user.")); + return KILLED; + } + if (result & LaTeX::ERRORS) buffer.bufferErrors(terr, errorList); + if ((result & LaTeX::UNDEF_CIT) || (result & LaTeX::UNDEF_UNKNOWN_REF)) { + buffer.bufferRefs(terr, errorList); + if (errorList.empty()) + errorList.push_back(ErrorItem(_("Undefined reference"), + _("Undefined references or citations were found during the build.\n" + "Please check the warnings in the LaTeX log (Document > LaTeX Log)."), + &buffer)); + } + if (!errorList.empty()) { // We will show the LaTeX Errors GUI later which contains // specific error messages so it would be repetitive to give @@ -832,15 +907,16 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command, _("No output file was generated.")); } - buffer.setBusy(false); int const ERROR_MASK = LaTeX::NO_LOGFILE | LaTeX::ERRORS | + LaTeX::UNDEF_CIT | + LaTeX::UNDEF_UNKNOWN_REF | LaTeX::NO_OUTPUT; - return (result & ERROR_MASK) == 0; + return (result & ERROR_MASK) == 0 ? SUCCESS : FAILURE; } @@ -852,11 +928,9 @@ void Converters::buildGraph() // 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 (; it != end ; ++it) { - int const from = theFormats().getNumber(it->from()); - int const to = theFormats().getNumber(it->to()); + for (auto const & cvt : converterlist_) { + int const from = theFormats().getNumber(cvt.from()); + int const to = theFormats().getNumber(cvt.to()); LASSERT(from >= 0, continue); LASSERT(to >= 0, continue); G_.addEdge(from, to); @@ -894,10 +968,8 @@ FormatList const Converters::getReachable(string const & from, { set excluded_numbers; - set::const_iterator sit = excludes.begin(); - set::const_iterator const end = excludes.end(); - for (; sit != end; ++sit) - excluded_numbers.insert(theFormats().getNumber(*sit)); + for (auto const & ex : excludes) + excluded_numbers.insert(theFormats().getNumber(ex)); vector const & reachables = G_.getReachable(theFormats().getNumber(from),