X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.cpp;h=4e44ec8c87800f1825b2d65da6991fb9b6a1d837;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=fe0c1edae48e374b5d87df5d80093f28b6f1bfc9;hpb=be468136df13bc705fec9a22f0d0fd52036afbe4;p=lyx.git diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index fe0c1edae4..4e44ec8c87 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -31,12 +31,12 @@ #include "LayoutFile.h" #include "LayoutModuleList.h" #include "LyX.h" -#include "LyXRC.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,6 +61,8 @@ #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" @@ -77,6 +79,8 @@ namespace { docstring const uniqueID() { static unsigned int seed = 1000; + static Mutex mutex; + Mutex::Locker lock(&mutex); return "file" + convert(++seed); } @@ -125,7 +129,7 @@ bool isVerbatim(InsetCommandParams const & params) bool isInputOrInclude(InsetCommandParams const & params) { Types const t = type(params); - return t == INPUT || t == INCLUDE; + return t == INPUT || t == INCLUDE; } @@ -407,7 +411,9 @@ Buffer * InsetInclude::getChildBuffer() const { Buffer * childBuffer = loadIfNeeded(); - // FIXME: recursive includes + // 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; } @@ -551,7 +557,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const from_utf8(incfile), true); } - FileName const writefile(makeAbsPath(mangled, masterBuffer->temppath())); + FileName const writefile(makeAbsPath(mangled, runparams.for_preview ? + buffer().temppath() : masterBuffer->temppath())); LYXERR(Debug::LATEX, "incfile:" << incfile); LYXERR(Debug::LATEX, "exportfile:" << exportfile); @@ -650,6 +657,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. @@ -683,9 +702,9 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const // and language. Encoding const * const oldEnc = runparams.encoding; Language const * const oldLang = runparams.master_language; - // If the master has full unicode flavor (XeTeX, LuaTeX), + // If the master uses non-TeX fonts (XeTeX, LuaTeX), // the children must be encoded in plain utf8! - runparams.encoding = runparams.isFullUnicode() ? + runparams.encoding = masterBuffer->params().useNonTeXFonts ? encodings.fromLyXName("utf8-plain") : &tmp->params().encoding(); runparams.master_language = buffer().params().language; @@ -696,7 +715,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"); @@ -704,7 +723,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; @@ -721,14 +741,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 { @@ -972,6 +993,11 @@ void InsetInclude::collectBibKeys(InsetIterator const & /*di*/) const Buffer * child = loadIfNeeded(); if (!child) 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()) + return; child->collectBibKeys(); } @@ -981,7 +1007,7 @@ void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const LBUFERR(mi.base.bv); bool use_preview = false; - if (RenderPreview::status() != LyXRC::PREVIEW_OFF) { + if (RenderPreview::previewText()) { graphics::PreviewImage const * pimage = preview_->getPreviewImage(mi.base.bv->buffer()); use_preview = pimage && pimage->image(); @@ -1007,7 +1033,7 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const LBUFERR(pi.base.bv); bool use_preview = false; - if (RenderPreview::status() != LyXRC::PREVIEW_OFF) { + if (RenderPreview::previewText()) { graphics::PreviewImage const * pimage = preview_->getPreviewImage(pi.base.bv->buffer()); use_preview = pimage && pimage->image(); @@ -1020,6 +1046,12 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const } +void InsetInclude::write(ostream & os) const +{ + params().Write(os, &buffer()); +} + + string InsetInclude::contextMenuName() const { return "context-include"; @@ -1051,7 +1083,7 @@ void InsetInclude::fileChanged() const return; preview_->removePreview(*buffer); - add_preview(*preview_.get(), *this, *buffer); + add_preview(*preview_, *this, *buffer); preview_->startLoading(*buffer); } @@ -1069,13 +1101,13 @@ bool preview_wanted(InsetCommandParams const & params, Buffer const & buffer) docstring latexString(InsetInclude const & inset) { - TexRow texrow; odocstringstream ods; - otexstream os(ods, texrow); + 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; + runparams.for_preview = true; inset.latex(os, runparams); return ods.str(); @@ -1086,8 +1118,7 @@ void add_preview(RenderMonitoredPreview & renderer, InsetInclude const & inset, Buffer const & buffer) { InsetCommandParams const & params = inset.params(); - if (RenderPreview::status() != LyXRC::PREVIEW_OFF && - preview_wanted(params, buffer)) { + if (RenderPreview::previewText() && preview_wanted(params, buffer)) { renderer.setAbsFile(includedFileName(buffer, params)); docstring const snippet = latexString(inset); renderer.addPreview(snippet, buffer); @@ -1109,41 +1140,38 @@ void InsetInclude::addPreview(DocIterator const & /*inset_pos*/, } -void InsetInclude::addToToc(DocIterator const & cpit, bool output_active) const +void InsetInclude::addToToc(DocIterator const & cpit, bool output_active, + UpdateType utype) const { - TocBackend & backend = buffer().tocBackend(); - if (isListings(params())) { if (label_) - label_->addToToc(cpit, output_active); - + label_->addToToc(cpit, output_active, utype); + TocBuilder & b = buffer().tocBackend().builder("listing"); + b.pushItem(cpit, screenLabel(), output_active); InsetListingsParams p(to_utf8(params()["lstparams"])); - string caption = p.getParamValue("caption"); - if (caption.empty()) + b.argumentItem(from_utf8(p.getParamValue("caption"))); + b.pop(); + } else { + Buffer const * const childbuffer = getChildBuffer(); + + TocBuilder & b = buffer().tocBackend().builder("child"); + docstring str = childbuffer ? childbuffer->fileName().displayName() + : from_ascii("?"); + b.pushItem(cpit, str, output_active); + b.pop(); + + if (!childbuffer) return; - Toc & 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)); - return; - } - Buffer const * const childbuffer = getChildBuffer(); - if (!childbuffer) - return; - Toc & toc = backend.toc("child"); - docstring str = childbuffer->fileName().displayName(); - toc.push_back(TocItem(cpit, 0, str, output_active)); - - TocList & toclist = backend.tocs(); - childbuffer->tocBackend().update(output_active); - TocList const & childtoclist = childbuffer->tocBackend().tocs(); - TocList::const_iterator it = childtoclist.begin(); - TocList::const_iterator const end = childtoclist.end(); - for(; it != end; ++it) - toclist[it->first].insert(toclist[it->first].end(), - it->second.begin(), it->second.end()); + // Include Tocs from children + childbuffer->tocBackend().update(output_active, utype); + for(auto const & pair : childbuffer->tocBackend().tocs()) { + string const & type = pair.first; + shared_ptr child_toc = pair.second; + shared_ptr toc = buffer().tocBackend().toc(type); + toc->insert(toc->end(), child_toc->begin(), child_toc->end()); + } + } }