X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.cpp;h=4e44ec8c87800f1825b2d65da6991fb9b6a1d837;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=33bc7b5b75bccd3544d6bd1c4b51fd99383fcb57;hpb=1a374a931b7f72313df61c001f5275480b759c4c;p=lyx.git

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 33bc7b5b75..4e44ec8c87 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -657,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.
@@ -1090,7 +1102,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);
@@ -1131,37 +1143,33 @@ void InsetInclude::addPreview(DocIterator const & /*inset_pos*/,
 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, 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())
-			return;
-		shared_ptr<Toc> toc = backend.toc("listing");
-		docstring str = convert<docstring>(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 = buffer().tocBackend().builder("child");
+		docstring str = childbuffer ? childbuffer->fileName().displayName()
+			: from_ascii("?");
+		b.pushItem(cpit, str, output_active);
+		b.pop();
+
 		if (!childbuffer)
 			return;
 
-		shared_ptr<Toc> toc = backend.toc("child");
-		docstring str = childbuffer->fileName().displayName();
-		toc->push_back(TocItem(cpit, 0, str, output_active));
-
+		// Include Tocs from children
 		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> toc = backend.toc(it->first);
-			toc->insert(toc->end(), it->second->begin(), it->second->end());
+		for(auto const & pair : childbuffer->tocBackend().tocs()) {
+			string const & type = pair.first;
+			shared_ptr<Toc> child_toc = pair.second;
+			shared_ptr<Toc> toc = buffer().tocBackend().toc(type);
+			toc->insert(toc->end(), child_toc->begin(), child_toc->end());
 		}
 	}
 }