X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.cpp;h=9b5c3f0961f119f2ed6ff50e38d4cb9dd4d40feb;hb=50060053e36b3e9dfe03bc33ed3abac1eacc54b0;hp=47c9a613436cb262818da8d226178b8c81b408c4;hpb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;p=lyx.git diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 47c9a61343..9b5c3f0961 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -62,6 +62,7 @@ #include "support/lstrings.h" // contains #include "support/lyxalgo.h" #include "support/mutex.h" +#include "support/ExceptionMessage.h" #include "support/bind.h" @@ -169,10 +170,10 @@ InsetLabel * createLabel(Buffer * buf, docstring const & label_str) InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p) : InsetCommand(buf, p), include_label(uniqueID()), - preview_(new RenderMonitoredPreview(this)), failedtoload_(false), + preview_(make_unique(this)), failedtoload_(false), set_label_(false), label_(0), child_buffer_(0) { - preview_->fileChanged(bind(&InsetInclude::fileChanged, this)); + preview_->connect([=](){ fileChanged(); }); if (isListings(params())) { InsetListingsParams listing_params(to_utf8(p["lstparams"])); @@ -184,10 +185,10 @@ InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p) InsetInclude::InsetInclude(InsetInclude const & other) : InsetCommand(other), include_label(other.include_label), - preview_(new RenderMonitoredPreview(this)), failedtoload_(false), + preview_(make_unique(this)), failedtoload_(false), set_label_(false), label_(0), child_buffer_(0) { - preview_->fileChanged(bind(&InsetInclude::fileChanged, this)); + preview_->connect([=](){ fileChanged(); }); if (other.label_) label_ = new InsetLabel(*other.label_); @@ -309,7 +310,7 @@ void InsetInclude::editIncluded(string const & file) lyx::dispatch(fr); } else // tex file or other text file in verbatim mode - formats.edit(buffer(), + theFormats().edit(buffer(), support::makeAbsPath(file, support::onlyPath(buffer().absFileName())), "text"); } @@ -639,7 +640,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const "file\n`%1$s'\n" "Please, check whether it actually exists."), included_file.displayName()); - Alert::warning(_("Missing included file"), text); + throw ExceptionMessage(ErrorException, _("Error: "), + text); } return; } @@ -656,6 +658,18 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const 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); + } + // 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. @@ -682,7 +696,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const // Don't assume the child's format is latex string const inc_format = tmp->params().bufferFormat(); FileName const tmpwritefile(changeExtension(writefile.absFileName(), - formats.extension(inc_format))); + theFormats().extension(inc_format))); // FIXME: handle non existing files // The included file might be written in a different encoding @@ -702,7 +716,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const onlyPath().absFileName(), runparams, Buffer::OnlyBody)) { if (!runparams.silent) { docstring msg = bformat(_("Included file `%1$s' " - "was not exported correctly.\nWarning: " + "was not exported correctly.\n " "LaTeX export is probably incomplete."), included_file.displayName()); ErrorList const & el = tmp->errorList("Export"); @@ -710,7 +724,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const msg = bformat(from_ascii("%1$s\n\n%2$s\n\n%3$s"), msg, el.begin()->error, el.begin()->description); - Alert::warning(_("Export failure"), msg); + throw ExceptionMessage(ErrorException, _("Error: "), + msg); } } runparams.encoding = oldEnc; @@ -727,14 +742,15 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const if (!success && !runparams.silent) { docstring msg = bformat(_("Included file `%1$s' " - "was not exported correctly.\nWarning: " + "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); - Alert::warning(_("Export failure"), msg); + throw ExceptionMessage(ErrorException, _("Error: "), + msg); } } } else { @@ -1087,7 +1103,7 @@ bool preview_wanted(InsetCommandParams const & params, Buffer const & buffer) docstring latexString(InsetInclude const & inset) { odocstringstream ods; - otexstream os(ods, false); + otexstream os(ods); // We don't need to set runparams.encoding since this will be done // by latex() anyway. OutputParams runparams(0); @@ -1126,40 +1142,37 @@ void InsetInclude::addPreview(DocIterator const & /*inset_pos*/, void InsetInclude::addToToc(DocIterator const & cpit, bool output_active, - UpdateType utype) const + UpdateType utype, TocBackend & backend) const { - TocBackend & backend = buffer().tocBackend(); - if (isListings(params())) { if (label_) - label_->addToToc(cpit, output_active, utype); - + label_->addToToc(cpit, output_active, utype, backend); + TocBuilder & b = backend.builder("listing"); + b.pushItem(cpit, screenLabel(), output_active); InsetListingsParams p(to_utf8(params()["lstparams"])); - string caption = p.getParamValue("caption"); - if (caption.empty()) - return; - shared_ptr toc = backend.toc("listing"); - docstring str = convert(toc->size() + 1) - + ". " + from_utf8(caption); - DocIterator pit = cpit; - toc->push_back(TocItem(pit, 0, str, output_active)); + b.argumentItem(from_utf8(p.getParamValue("caption"))); + b.pop(); } else { Buffer const * const childbuffer = getChildBuffer(); + + TocBuilder & b = backend.builder("child"); + docstring str = childbuffer ? childbuffer->fileName().displayName() + : from_ascii("?"); + b.pushItem(cpit, str, output_active); + b.pop(); + if (!childbuffer) return; - shared_ptr toc = backend.toc("child"); - docstring str = childbuffer->fileName().displayName(); - toc->push_back(TocItem(cpit, 0, str, output_active)); - - childbuffer->tocBackend().update(output_active, utype); - TocList const & childtoclist = childbuffer->tocBackend().tocs(); - TocList::const_iterator it = childtoclist.begin(); - TocList::const_iterator const end = childtoclist.end(); - for(; it != end; ++it) { - shared_ptr toc = backend.toc(it->first); - toc->insert(toc->end(), it->second->begin(), it->second->end()); - } + // 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)); } }