X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.cpp;h=870310ef2ddaa9c03f3186ee18d4fc39f29f3939;hb=eb294eadb5e7f22880da399ae082f74567bbfc4e;hp=09d4be3cc76c55a2dc9bb382800fda72d4db5fab;hpb=aeed6fb8fa35c045697fe6950c6109be8d30884c;p=lyx.git diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 09d4be3cc7..870310ef2d 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Lars Gullik Bjønnes - * \author Richard Heck (conversion to InsetCommand) + * \author Richard Kimberly Heck (conversion to InsetCommand) * * Full author contact details are available in file CREDITS. */ @@ -20,7 +20,6 @@ #include "BufferView.h" #include "Converter.h" #include "Cursor.h" -#include "DispatchResult.h" #include "Encoding.h" #include "ErrorList.h" #include "Exporter.h" @@ -28,14 +27,11 @@ #include "FuncRequest.h" #include "FuncStatus.h" #include "LaTeXFeatures.h" -#include "LayoutFile.h" #include "LayoutModuleList.h" #include "LyX.h" -#include "Lexer.h" #include "MetricsInfo.h" #include "output_plaintext.h" #include "output_xhtml.h" -#include "OutputParams.h" #include "texstream.h" #include "TextClass.h" #include "TocBackend.h" @@ -61,12 +57,9 @@ #include "support/gettext.h" #include "support/lassert.h" #include "support/lstrings.h" // contains -#include "support/lyxalgo.h" #include "support/mutex.h" #include "support/ExceptionMessage.h" -#include "support/bind.h" - using namespace std; using namespace lyx::support; @@ -160,7 +153,7 @@ FileName const includedFileName(Buffer const & buffer, InsetLabel * createLabel(Buffer * buf, docstring const & label_str) { if (label_str.empty()) - return 0; + return nullptr; InsetCommandParams icp(LABEL_CODE); icp["name"] = label_str; return new InsetLabel(buf, icp); @@ -189,9 +182,10 @@ char_type replaceCommaInBraces(docstring & params) InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p) : InsetCommand(buf, p), include_label(uniqueID()), preview_(make_unique(this)), failedtoload_(false), - set_label_(false), label_(0), child_buffer_(0), file_exist_(false) + label_(nullptr), child_buffer_(nullptr), file_exist_(false), + recursion_error_(false) { - preview_->connect([=](){ fileChanged(); }); + preview_->connect([this](){ fileChanged(); }); if (isListings(params())) { InsetListingsParams listing_params(to_utf8(p["lstparams"])); @@ -204,9 +198,10 @@ InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p) InsetInclude::InsetInclude(InsetInclude const & other) : InsetCommand(other), include_label(other.include_label), preview_(make_unique(this)), failedtoload_(false), - set_label_(false), label_(0), child_buffer_(0), file_exist_(other.file_exist_) + label_(nullptr), child_buffer_(nullptr), + file_exist_(other.file_exist_),recursion_error_(other.recursion_error_) { - preview_->connect([=](){ fileChanged(); }); + preview_->connect([this](){ fileChanged(); }); if (other.label_) label_ = new InsetLabel(*other.label_); @@ -289,7 +284,7 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd) if (new_label.empty()) { delete label_; - label_ = 0; + label_ = nullptr; } else { docstring old_label; if (label_) @@ -374,10 +369,13 @@ bool InsetInclude::getStatus(Cursor & cur, FuncRequest const & cmd, void InsetInclude::setParams(InsetCommandParams const & p) { // invalidate the cache - child_buffer_ = 0; + child_buffer_ = nullptr; + + // reset in order to allow loading new file + failedtoload_ = false; + recursion_error_ = false; InsetCommand::setParams(p); - set_label_ = false; if (preview_->monitoring()) preview_->stopMonitoring(); @@ -401,7 +399,7 @@ bool InsetInclude::isChildIncluded() const docstring InsetInclude::screenLabel() const { - docstring pre = file_exist_ ? docstring() : _("FILE MISSING:"); + docstring pre = file_exist_ ? docstring() : _("MISSING:"); docstring temp; @@ -410,10 +408,10 @@ docstring InsetInclude::screenLabel() const temp = buffer().B_("Input"); break; case VERB: - temp = buffer().B_("Verbatim"); + temp = buffer().B_("Verbatim"); break; case VERBAST: - temp = buffer().B_("Verbatim*"); + temp = buffer().B_("Verbatim*"); break; case INCLUDE: if (isChildIncluded()) @@ -440,17 +438,6 @@ docstring InsetInclude::screenLabel() const } -Buffer * InsetInclude::getChildBuffer() const -{ - Buffer * childBuffer = loadIfNeeded(); - - // FIXME RECURSIVE INCLUDE - // This isn't sufficient, as the inclusion could be downstream. - // But it'll have to do for now. - return (childBuffer == &buffer()) ? 0 : childBuffer; -} - - Buffer * InsetInclude::loadIfNeeded() const { // This is for background export and preview. We don't even want to @@ -460,47 +447,53 @@ Buffer * InsetInclude::loadIfNeeded() const // Don't try to load it again if we failed before. if (failedtoload_ || isVerbatim(params()) || isListings(params())) - return 0; + return nullptr; FileName const included_file = includedFileName(buffer(), params()); // Use cached Buffer if possible. - if (child_buffer_ != 0) { + if (child_buffer_ != nullptr) { if (theBufferList().isLoaded(child_buffer_) // additional sanity check: make sure the Buffer really is // associated with the file we want. && child_buffer_ == theBufferList().getBuffer(included_file)) return child_buffer_; // Buffer vanished, so invalidate cache and try to reload. - child_buffer_ = 0; + child_buffer_ = nullptr; } if (!isLyXFileName(included_file.absFileName())) - return 0; + return nullptr; Buffer * child = theBufferList().getBuffer(included_file); + if (checkForRecursiveInclude(child)) + return child; + if (!child) { // the readonly flag can/will be wrong, not anymore I think. if (!included_file.exists()) { failedtoload_ = true; - return 0; + return nullptr; } child = theBufferList().newBuffer(included_file.absFileName()); if (!child) // Buffer creation is not possible. - return 0; + return nullptr; + buffer().pushIncludedBuffer(child); // Set parent before loading, such that macros can be tracked child->setParent(&buffer()); if (child->loadLyXFile() != Buffer::ReadSuccess) { failedtoload_ = true; - child->setParent(0); + child->setParent(nullptr); //close the buffer we just opened theBufferList().release(child); - return 0; + buffer().popIncludedBuffer(); + return nullptr; } + buffer().popIncludedBuffer(); if (!child->errorList("Parse").empty()) { // FIXME: Do something. } @@ -523,6 +516,26 @@ Buffer * InsetInclude::loadIfNeeded() const } +bool InsetInclude::checkForRecursiveInclude( + Buffer const * cbuf, bool silent) const +{ + if (recursion_error_) + return true; + + if (!buffer().isBufferIncluded(cbuf)) + return false; + + if (!silent) { + docstring const msg = _("The file\n%1$s\n has attempted to include itself.\n" + "The document set will not work properly until this is fixed!"); + frontend::Alert::warning(_("Recursive Include"), + bformat(msg, from_utf8(cbuf->fileName().absFileName()))); + } + recursion_error_ = true; + return true; +} + + void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const { string incfile = ltrim(to_utf8(params()["filename"])); @@ -547,22 +560,18 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const } FileName const included_file = includedFileName(buffer(), params()); + Buffer const * const masterBuffer = buffer().masterBuffer(); - // Check we're not trying to include ourselves. - // FIXME RECURSIVE INCLUDE - // This isn't sufficient, as the inclusion could be downstream. - // But it'll have to do for now. - if (isInputOrInclude(params()) && - buffer().absFileName() == included_file.absFileName()) - { - Alert::error(_("Recursive input"), - bformat(_("Attempted to include file %1$s in itself! " - "Ignoring inclusion."), from_utf8(incfile))); + if (runparams.inDeletedInset) { + // We cannot strike-out whole children, + // so we just output a note. + os << "\\textbf{" + << bformat(buffer().B_("[INCLUDED FILE %1$s DELETED!]"), + from_utf8(included_file.onlyFileName())) + << "}"; return; } - Buffer const * const masterBuffer = buffer().masterBuffer(); - // if incfile is relative, make it relative to the master // buffer directory. if (!FileName::isAbsolute(incfile)) { @@ -609,9 +618,9 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const FileName const writefile(makeAbsPath(mangled, runparams.for_preview ? buffer().temppath() : masterBuffer->temppath())); - LYXERR(Debug::LATEX, "incfile:" << incfile); - LYXERR(Debug::LATEX, "exportfile:" << exportfile); - LYXERR(Debug::LATEX, "writefile:" << writefile); + LYXERR(Debug::OUTFILE, "incfile:" << incfile); + LYXERR(Debug::OUTFILE, "exportfile:" << exportfile); + LYXERR(Debug::OUTFILE, "writefile:" << writefile); string const tex_format = flavor2format(runparams.flavor); @@ -644,7 +653,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const break; } case LISTINGS: { - // Here, listings and minted have sligthly different behaviors. + // Here, listings and minted have slightly different behaviors. // Using listings, it is always possible to have a caption, // even for non-floats. Using minted, only floats can have a // caption. So, with minted we use the following strategy. @@ -762,152 +771,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const // in a comment or doing a dryrun return; - if (isInputOrInclude(params()) && - isLyXFileName(included_file.absFileName())) { - // if it's a LyX file and we're inputting or including, - // try to load it so we can write the associated latex - - Buffer * tmp = loadIfNeeded(); - if (!tmp) { - if (!runparams.silent) { - docstring text = bformat(_("Could not load included " - "file\n`%1$s'\n" - "Please, check whether it actually exists."), - included_file.displayName()); - throw ExceptionMessage(ErrorException, _("Error: "), - text); - } - return; - } - - if (!runparams.silent) { - if (tmp->params().baseClass() != masterBuffer->params().baseClass()) { - // FIXME UNICODE - docstring text = bformat(_("Included file `%1$s'\n" - "has textclass `%2$s'\n" - "while parent file has textclass `%3$s'."), - included_file.displayName(), - from_utf8(tmp->params().documentClass().name()), - from_utf8(masterBuffer->params().documentClass().name())); - Alert::warning(_("Different textclasses"), text, true); - } - - string const child_tf = tmp->params().useNonTeXFonts ? "true" : "false"; - string const master_tf = masterBuffer->params().useNonTeXFonts ? "true" : "false"; - if (tmp->params().useNonTeXFonts != masterBuffer->params().useNonTeXFonts) { - docstring text = bformat(_("Included file `%1$s'\n" - "has use-non-TeX-fonts set to `%2$s'\n" - "while parent file has use-non-TeX-fonts set to `%3$s'."), - included_file.displayName(), - from_utf8(child_tf), - from_utf8(master_tf)); - Alert::warning(_("Different use-non-TeX-fonts settings"), text, true); - } - else if (tmp->params().inputenc != masterBuffer->params().inputenc) { - docstring text = bformat(_("Included file `%1$s'\n" - "uses input encoding \"%2$s\" [%3$s]\n" - "while parent file uses input encoding \"%4$s\" [%5$s]."), - included_file.displayName(), - _(tmp->params().inputenc), - from_utf8(tmp->params().encoding().guiName()), - _(masterBuffer->params().inputenc), - from_utf8(masterBuffer->params().encoding().guiName())); - Alert::warning(_("Different LaTeX input encodings"), text, true); - } - - // Make sure modules used in child are all included in master - // FIXME It might be worth loading the children's modules into the master - // over in BufferParams rather than doing this check. - LayoutModuleList const masterModules = masterBuffer->params().getModules(); - LayoutModuleList const childModules = tmp->params().getModules(); - LayoutModuleList::const_iterator it = childModules.begin(); - LayoutModuleList::const_iterator end = childModules.end(); - for (; it != end; ++it) { - string const module = *it; - LayoutModuleList::const_iterator found = - find(masterModules.begin(), masterModules.end(), module); - if (found == masterModules.end()) { - docstring text = bformat(_("Included file `%1$s'\n" - "uses module `%2$s'\n" - "which is not used in parent file."), - included_file.displayName(), from_utf8(module)); - Alert::warning(_("Module not found"), text, true); - } - } - } - - tmp->markDepClean(masterBuffer->temppath()); - - // Don't assume the child's format is latex - string const inc_format = tmp->params().bufferFormat(); - FileName const tmpwritefile(changeExtension(writefile.absFileName(), - theFormats().extension(inc_format))); - - // FIXME: handle non existing files - // The included file might be written in a different encoding - // and language. - Encoding const * const oldEnc = runparams.encoding; - Language const * const oldLang = runparams.master_language; - // If the master uses non-TeX fonts (XeTeX, LuaTeX), - // the children must be encoded in plain utf8! - if (masterBuffer->params().useNonTeXFonts) - runparams.encoding = encodings.fromLyXName("utf8-plain"); - else if (oldEnc) - runparams.encoding = oldEnc; - else runparams.encoding = &tmp->params().encoding(); - runparams.master_language = buffer().params().language; - runparams.par_begin = 0; - runparams.par_end = tmp->paragraphs().size(); - runparams.is_child = true; - Buffer::ExportStatus retval = - tmp->makeLaTeXFile(tmpwritefile, masterFileName(buffer()). - onlyPath().absFileName(), runparams, Buffer::OnlyBody); - if (retval == Buffer::ExportKilled && buffer().isClone() && - buffer().isExporting()) { - // We really shouldn't get here, I don't think. - LYXERR0("No conversion exception?"); - throw ConversionException(); - } - else if (retval != Buffer::ExportSuccess) { - if (!runparams.silent) { - docstring msg = bformat(_("Included file `%1$s' " - "was not exported correctly.\n " - "LaTeX export is probably incomplete."), - included_file.displayName()); - ErrorList const & el = tmp->errorList("Export"); - if (!el.empty()) - msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"), - msg, el.begin()->error, el.begin()->description); - throw ExceptionMessage(ErrorException, _("Error: "), msg); - } - } - runparams.encoding = oldEnc; - runparams.master_language = oldLang; - runparams.is_child = false; - - // If needed, use converters to produce a latex file from the child - if (tmpwritefile != writefile) { - ErrorList el; - Converters::RetVal const conv_retval = - theConverters().convert(tmp, tmpwritefile, writefile, - included_file, inc_format, tex_format, el); - if (conv_retval == Converters::KILLED && buffer().isClone() && - buffer().isExporting()) { - // We really shouldn't get here, I don't think. - LYXERR0("No conversion exception?"); - throw ConversionException(); - } else if (conv_retval != Converters::SUCCESS && !runparams.silent) { - docstring msg = bformat(_("Included file `%1$s' " - "was not exported correctly.\n " - "LaTeX export is probably incomplete."), - included_file.displayName()); - if (!el.empty()) - msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"), - msg, el.begin()->error, el.begin()->description); - throw ExceptionMessage(ErrorException, _("Error: "), msg); - } - } - } else { + if (!isInputOrInclude(params()) || + !isLyXFileName(included_file.absFileName())) { // In this case, it's not a LyX file, so we copy the file // to the temp dir, so that .aux files etc. are not created // in the original dir. Files included by this file will be @@ -915,22 +780,168 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const // input@path, see ../Buffer.cpp. unsigned long const checksum_in = included_file.checksum(); unsigned long const checksum_out = writefile.checksum(); - if (checksum_in != checksum_out) { if (!included_file.copyTo(writefile)) { // FIXME UNICODE - LYXERR(Debug::LATEX, + LYXERR(Debug::OUTFILE, to_utf8(bformat(_("Could not copy the file\n%1$s\n" "into the temporary directory."), from_utf8(included_file.absFileName())))); - return; } } + return; + } + + + // it's a LyX file and we're inputting or including, so + // try to load it so we can write the associated latex + Buffer * tmp = loadIfNeeded(); + if (!tmp) { + if (!runparams.silent) { + docstring text = bformat(_("Could not load included " + "file\n`%1$s'\n" + "Please, check whether it actually exists."), + included_file.displayName()); + throw ExceptionMessage(ErrorException, _("Error: "), + text); + } + return; + } + + if (recursion_error_) + return; + + if (!runparams.silent) { + if (tmp->params().baseClass() != masterBuffer->params().baseClass()) { + // FIXME UNICODE + docstring text = bformat(_("Included file `%1$s'\n" + "has textclass `%2$s'\n" + "while parent file has textclass `%3$s'."), + included_file.displayName(), + from_utf8(tmp->params().documentClass().name()), + from_utf8(masterBuffer->params().documentClass().name())); + Alert::warning(_("Different textclasses"), text, true); + } + + string const child_tf = tmp->params().useNonTeXFonts ? "true" : "false"; + string const master_tf = masterBuffer->params().useNonTeXFonts ? "true" : "false"; + if (tmp->params().useNonTeXFonts != masterBuffer->params().useNonTeXFonts) { + docstring text = bformat(_("Included file `%1$s'\n" + "has use-non-TeX-fonts set to `%2$s'\n" + "while parent file has use-non-TeX-fonts set to `%3$s'."), + included_file.displayName(), + from_utf8(child_tf), + from_utf8(master_tf)); + Alert::warning(_("Different use-non-TeX-fonts settings"), text, true); + } + else if (tmp->params().inputenc != masterBuffer->params().inputenc) { + docstring text = bformat(_("Included file `%1$s'\n" + "uses input encoding \"%2$s\" [%3$s]\n" + "while parent file uses input encoding \"%4$s\" [%5$s]."), + included_file.displayName(), + _(tmp->params().inputenc), + from_utf8(tmp->params().encoding().guiName()), + _(masterBuffer->params().inputenc), + from_utf8(masterBuffer->params().encoding().guiName())); + Alert::warning(_("Different LaTeX input encodings"), text, true); + } + + // Make sure modules used in child are all included in master + // FIXME It might be worth loading the children's modules into the master + // over in BufferParams rather than doing this check. + LayoutModuleList const masterModules = masterBuffer->params().getModules(); + LayoutModuleList const childModules = tmp->params().getModules(); + LayoutModuleList::const_iterator it = childModules.begin(); + LayoutModuleList::const_iterator end = childModules.end(); + for (; it != end; ++it) { + string const module = *it; + LayoutModuleList::const_iterator found = + find(masterModules.begin(), masterModules.end(), module); + if (found == masterModules.end()) { + docstring text = bformat(_("Included file `%1$s'\n" + "uses module `%2$s'\n" + "which is not used in parent file."), + included_file.displayName(), from_utf8(module)); + Alert::warning(_("Module not found"), text, true); + } + } + } + + tmp->markDepClean(masterBuffer->temppath()); + + // Don't assume the child's format is latex + string const inc_format = tmp->params().bufferFormat(); + FileName const tmpwritefile(changeExtension(writefile.absFileName(), + theFormats().extension(inc_format))); + + // FIXME: handle non existing files + // The included file might be written in a different encoding + // and language. + Encoding const * const oldEnc = runparams.encoding; + Language const * const oldLang = runparams.master_language; + // If the master uses non-TeX fonts (XeTeX, LuaTeX), + // the children must be encoded in plain utf8! + if (masterBuffer->params().useNonTeXFonts) + runparams.encoding = encodings.fromLyXName("utf8-plain"); + else if (oldEnc) + runparams.encoding = oldEnc; + else runparams.encoding = &tmp->params().encoding(); + runparams.master_language = buffer().params().language; + runparams.par_begin = 0; + runparams.par_end = tmp->paragraphs().size(); + runparams.is_child = true; + Buffer::ExportStatus retval = + tmp->makeLaTeXFile(tmpwritefile, masterFileName(buffer()). + onlyPath().absFileName(), runparams, Buffer::OnlyBody); + if (retval == Buffer::ExportKilled && buffer().isClone() && + buffer().isExporting()) { + // We really shouldn't get here, I don't think. + LYXERR0("No conversion exception?"); + throw ConversionException(); + } + else if (retval != Buffer::ExportSuccess) { + if (!runparams.silent) { + docstring msg = bformat(_("Included file `%1$s' " + "was not exported correctly.\n " + "LaTeX export is probably incomplete."), + included_file.displayName()); + ErrorList const & el = tmp->errorList("Export"); + if (!el.empty()) + msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"), + msg, el.begin()->error, el.begin()->description); + throw ExceptionMessage(ErrorException, _("Error: "), msg); + } + } + runparams.encoding = oldEnc; + runparams.master_language = oldLang; + runparams.is_child = false; + + // If needed, use converters to produce a latex file from the child + if (tmpwritefile != writefile) { + ErrorList el; + Converters::RetVal const conv_retval = + theConverters().convert(tmp, tmpwritefile, writefile, + included_file, inc_format, tex_format, el); + if (conv_retval == Converters::KILLED && buffer().isClone() && + buffer().isExporting()) { + // We really shouldn't get here, I don't think. + LYXERR0("No conversion exception?"); + throw ConversionException(); + } else if (conv_retval != Converters::SUCCESS && !runparams.silent) { + docstring msg = bformat(_("Included file `%1$s' " + "was not exported correctly.\n " + "LaTeX export is probably incomplete."), + included_file.displayName()); + if (!el.empty()) + msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"), + msg, el.begin()->error, el.begin()->description); + throw ExceptionMessage(ErrorException, _("Error: "), msg); + } } } -docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const +docstring InsetInclude::xhtml(XMLStream & xs, OutputParams const & rp) const { if (rp.inComment) return docstring(); @@ -940,11 +951,11 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const bool const listing = isListings(params()); if (listing || isVerbatim(params())) { if (listing) - xs << html::StartTag("pre"); + xs << xml::StartTag("pre"); // FIXME: We don't know the encoding of the file, default to UTF-8. xs << includedFileName(buffer(), params()).fileContents("UTF-8"); if (listing) - xs << html::EndTag("pre"); + xs << xml::EndTag("pre"); return docstring(); } @@ -963,19 +974,13 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const // In the other cases, we will generate the HTML and include it. - // Check we're not trying to include ourselves. - // FIXME RECURSIVE INCLUDE - if (buffer().absFileName() == included_file.absFileName()) { - Alert::error(_("Recursive input"), - bformat(_("Attempted to include file %1$s in itself! " - "Ignoring inclusion."), ltrim(params()["filename"]))); - return docstring(); - } - Buffer const * const ibuf = loadIfNeeded(); if (!ibuf) return docstring(); + if (recursion_error_) + return docstring(); + // are we generating only some paragraphs, or all of them? bool const all_pars = !rp.dryrun || (rp.par_begin == 0 && @@ -986,12 +991,12 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const op.par_begin = 0; op.par_end = 0; ibuf->writeLyXHTMLSource(xs.os(), op, Buffer::IncludedFile); - } else - xs << XHTMLStream::ESCAPE_NONE - << ""; + } else { + xs << XMLStream::ESCAPE_NONE << ""; + } + return docstring(); } @@ -1001,14 +1006,14 @@ int InsetInclude::plaintext(odocstringstream & os, { // just write the filename if we're making a tooltip or toc entry, // or are generating this for advanced search - if (op.for_tooltip || op.for_toc || op.for_search) { + if (op.for_tooltip || op.for_toc || op.find_effective()) { os << '[' << screenLabel() << '\n' << ltrim(getParam("filename")) << "\n]"; return PLAINTEXT_NEWLINE + 1; // one char on a separate line } if (isVerbatim(params()) || isListings(params())) { - if (op.for_search) { + if (op.find_effective()) { os << '[' << screenLabel() << ']'; } else { @@ -1026,70 +1031,89 @@ int InsetInclude::plaintext(odocstringstream & os, os << str; return str.size(); } + + if (recursion_error_) + return 0; + writePlaintextFile(*ibuf, os, op); return 0; } -int InsetInclude::docbook(odocstream & os, OutputParams const & runparams) const +void InsetInclude::docbook(XMLStream & xs, OutputParams const & rp) const { - string incfile = ltrim(to_utf8(params()["filename"])); + if (rp.inComment) + return; - // Do nothing if no file name has been specified - if (incfile.empty()) - return 0; + // For verbatim and listings, we just include the contents of the file as-is. + bool const verbatim = isVerbatim(params()); + bool const listing = isListings(params()); + if (listing || verbatim) { + if (listing) + xs << xml::StartTag("programlisting"); + else if (verbatim) + xs << xml::StartTag("literallayout"); - string const included_file = includedFileName(buffer(), params()).absFileName(); + // FIXME: We don't know the encoding of the file, default to UTF-8. + xs << includedFileName(buffer(), params()).fileContents("UTF-8"); - // Check we're not trying to include ourselves. - // FIXME RECURSIVE INCLUDE - // This isn't sufficient, as the inclusion could be downstream. - // But it'll have to do for now. - if (buffer().absFileName() == included_file) { - Alert::error(_("Recursive input"), - bformat(_("Attempted to include file %1$s in itself! " - "Ignoring inclusion."), from_utf8(incfile))); - return 0; - } + if (listing) + xs << xml::EndTag("programlisting"); + else if (verbatim) + xs << xml::EndTag("literallayout"); - string exppath = incfile; - if (!runparams.export_folder.empty()) { - exppath = makeAbsPath(exppath, runparams.export_folder).realPath(); - FileName(exppath).onlyPath().createPath(); + return; } - // write it to a file (so far the complete file) - string const exportfile = changeExtension(exppath, ".sgml"); - DocFileName writefile(changeExtension(included_file, ".sgml")); - - Buffer * tmp = loadIfNeeded(); - if (tmp) { - string const mangled = writefile.mangledFileName(); - writefile = makeAbsPath(mangled, - buffer().masterBuffer()->temppath()); - if (!runparams.nice) - incfile = mangled; - - LYXERR(Debug::LATEX, "incfile:" << incfile); - LYXERR(Debug::LATEX, "exportfile:" << exportfile); - LYXERR(Debug::LATEX, "writefile:" << writefile); - - tmp->makeDocBookFile(writefile, runparams, Buffer::OnlyBody); + // We don't know how to input or include non-LyX files. Input it as a comment. + FileName const included_file = includedFileName(buffer(), params()); + if (!isLyXFileName(included_file.absFileName())) { + if (!rp.silent) + frontend::Alert::warning(_("Unsupported Inclusion"), + bformat(_("LyX does not know how to process included non-LyX files when " + "generating DocBook output. The content of the file will be output as a " + "comment. Offending file:\n%1$s"), + ltrim(params()["filename"]))); + + // Read the file, output it wrapped into comments. + xs << XMLStream::ESCAPE_NONE << ""; + + xs << XMLStream::ESCAPE_NONE << ""; + + xs << XMLStream::ESCAPE_NONE << ""; } - runparams.exportdata->addExternalFile("docbook", writefile, - exportfile); - runparams.exportdata->addExternalFile("docbook-xml", writefile, - exportfile); + // In the other cases, we generate the DocBook version and include it. + Buffer const * const ibuf = loadIfNeeded(); + if (!ibuf) + return; - if (isVerbatim(params()) || isListings(params())) { - os << ""; - } else - os << '&' << include_label << ';'; + if (recursion_error_) + return; - return 0; + // are we generating only some paragraphs, or all of them? + bool const all_pars = !rp.dryrun || + (rp.par_begin == 0 && + rp.par_end == (int) buffer().text().paragraphs().size()); + + OutputParams op = rp; + if (all_pars) { + op.par_begin = 0; + op.par_end = 0; + op.inInclude = true; + op.docbook_in_par = false; + ibuf->writeDocBookSource(xs.os(), op, Buffer::IncludedFile); + } else { + xs << XMLStream::ESCAPE_NONE << ""; + } } @@ -1133,40 +1157,47 @@ void InsetInclude::validate(LaTeXFeatures & features) const // Load the file in the include if it needs // to be loaded: Buffer * const tmp = loadIfNeeded(); - if (tmp) { - // the file is loaded - // make sure the buffer isn't us - // FIXME RECURSIVE INCLUDES - // This is not sufficient, as recursive includes could be - // more than a file away. But it will do for now. - if (tmp && tmp != &buffer()) { - // We must temporarily change features.buffer, - // otherwise it would always be the master buffer, - // and nested includes would not work. - features.setBuffer(*tmp); - // Maybe this is already a child - bool const is_child = - features.runparams().is_child; - features.runparams().is_child = true; - tmp->validate(features); - features.runparams().is_child = is_child; - features.setBuffer(buffer()); - } - } + if (!tmp) + return; + + // the file is loaded + if (checkForRecursiveInclude(tmp)) + return; + buffer().pushIncludedBuffer(tmp); + + // We must temporarily change features.buffer, + // otherwise it would always be the master buffer, + // and nested includes would not work. + features.setBuffer(*tmp); + // Maybe this is already a child + bool const is_child = + features.runparams().is_child; + features.runparams().is_child = true; + tmp->validate(features); + features.runparams().is_child = is_child; + features.setBuffer(buffer()); + + buffer().popIncludedBuffer(); } void InsetInclude::collectBibKeys(InsetIterator const & /*di*/, FileNameList & checkedFiles) const { - Buffer * child = loadIfNeeded(); - if (!child) + Buffer * ibuf = loadIfNeeded(); + if (!ibuf) return; - // FIXME RECURSIVE INCLUDE - // This isn't sufficient, as the inclusion could be downstream. - // But it'll have to do for now. - if (child == &buffer()) + + if (checkForRecursiveInclude(ibuf)) return; - child->collectBibKeys(checkedFiles); + buffer().pushIncludedBuffer(ibuf); + ibuf->collectBibKeys(checkedFiles); + buffer().popIncludedBuffer(); +} + + +bool InsetInclude::inheritFont() const +{ + return !isVerbatim(params()); } @@ -1184,15 +1215,9 @@ void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const if (use_preview) { preview_->metrics(mi, dim); } else { - if (!set_label_) { - set_label_ = true; - button_.update(screenLabel(), true, false); - } - button_.metrics(mi, dim); + setBroken(!file_exist_ || recursion_error_); + InsetCommand::metrics(mi, dim); } - - Box b(0, dim.wid, -dim.asc, dim.des); - button_.setBox(b); } @@ -1210,7 +1235,7 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const if (use_preview) preview_->draw(pi, x, y); else - button_.draw(pi, x, y); + InsetCommand::draw(pi, x, y); } @@ -1226,9 +1251,9 @@ string InsetInclude::contextMenuName() const } -Inset::DisplayType InsetInclude::display() const +int InsetInclude::rowFlags() const { - return type(params()) == INPUT ? Inline : AlignCenter; + return type(params()) == INPUT ? Inline : Display; } @@ -1273,8 +1298,8 @@ docstring latexString(InsetInclude const & inset) otexstream os(ods); // We don't need to set runparams.encoding since this will be done // by latex() anyway. - OutputParams runparams(0); - runparams.flavor = OutputParams::LATEX; + OutputParams runparams(nullptr); + runparams.flavor = Flavor::LaTeX; runparams.for_preview = true; inset.latex(os, runparams); @@ -1288,7 +1313,19 @@ void add_preview(RenderMonitoredPreview & renderer, InsetInclude const & inset, InsetCommandParams const & params = inset.params(); if (RenderPreview::previewText() && preview_wanted(params, buffer)) { renderer.setAbsFile(includedFileName(buffer, params)); - docstring const snippet = latexString(inset); + docstring snippet; + try { + // InsetInclude::latex() throws if generation of LaTeX + // fails, e.g. if lyx2lyx fails because file is too + // new, or knitr fails. + snippet = latexString(inset); + } catch (...) { + // remove current preview because it is likely + // associated with the previous included file name + renderer.removePreview(buffer); + LYXERR0("Preview of include failed."); + return; + } renderer.addPreview(snippet, buffer); } } @@ -1318,36 +1355,45 @@ void InsetInclude::addToToc(DocIterator const & cpit, bool output_active, b.pushItem(cpit, screenLabel(), output_active); InsetListingsParams p(to_utf8(params()["lstparams"])); b.argumentItem(from_utf8(p.getParamValue("caption"))); - b.pop(); - } else if (isVerbatim(params())) { - TocBuilder & b = backend.builder("child"); - b.pushItem(cpit, screenLabel(), output_active); - b.pop(); - } else { - Buffer const * const childbuffer = getChildBuffer(); - + b.pop(); + return; + } + if (isVerbatim(params())) { TocBuilder & b = backend.builder("child"); - docstring str = childbuffer ? childbuffer->fileName().displayName() - : from_ascii("?"); - b.pushItem(cpit, str, output_active); + b.pushItem(cpit, screenLabel(), output_active); b.pop(); - - if (!childbuffer) - return; - - // Update the child's tocBackend. The outliner uses the master's, but - // the navigation menu uses the child's. - childbuffer->tocBackend().update(output_active, utype); - // Include Tocs from children - childbuffer->inset().addToToc(DocIterator(), output_active, utype, - backend); - //Copy missing outliner names (though the user has been warned against - //having different document class and module selection between master - //and child). - for (pair const & name - : childbuffer->params().documentClass().outlinerNames()) - backend.addName(name.first, translateIfPossible(name.second)); + return; } + // the common case + Buffer const * const childbuffer = loadIfNeeded(); + + TocBuilder & b = backend.builder("child"); + string const fname = ltrim(to_utf8(params()["filename"])); + // mark non-existent file with MISSING + docstring const str = (file_exist_ ? from_ascii("") : _("MISSING: ")) + + from_utf8(onlyFileName(fname)) + " (" + from_utf8(fname) + ")"; + b.pushItem(cpit, str, output_active); + b.pop(); + + if (!childbuffer) + return; + + if (checkForRecursiveInclude(childbuffer)) + return; + buffer().pushIncludedBuffer(childbuffer); + // Update the child's tocBackend. The outliner uses the master's, but + // the navigation menu uses the child's. + childbuffer->tocBackend().update(output_active, utype); + // Include Tocs from children + childbuffer->inset().addToToc(DocIterator(), output_active, utype, + backend); + buffer().popIncludedBuffer(); + // Copy missing outliner names (though the user has been warned against + // having different document class and module selection between master + // and child). + for (auto const & name + : childbuffer->params().documentClass().outlinerNames()) + backend.addName(name.first, translateIfPossible(name.second)); } @@ -1373,22 +1419,21 @@ void InsetInclude::updateCommand() } -void InsetInclude::updateBuffer(ParIterator const & it, UpdateType utype) +void InsetInclude::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted) { file_exist_ = includedFileExist(); - - button_.update(screenLabel(), true, false); - - Buffer const * const childbuffer = getChildBuffer(); + Buffer const * const childbuffer = loadIfNeeded(); if (childbuffer) { - childbuffer->updateBuffer(Buffer::UpdateChildOnly, utype); + if (!checkForRecursiveInclude(childbuffer)) + childbuffer->updateBuffer(Buffer::UpdateChildOnly, utype); return; } + if (!isListings(params())) return; if (label_) - label_->updateBuffer(it, utype); + label_->updateBuffer(it, utype, deleted); InsetListingsParams const par(to_utf8(params()["lstparams"])); if (par.getParamValue("caption").empty()) {