X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.cpp;h=506f3586e071e50f833578198cd83bb4a7d4a4ca;hb=0a6ff99f28686066675848f3410f77c0947bc357;hp=70050fd5bcfe8968cbf57d7bf7774df419d1224e;hpb=86994bf75320524ec656fd70950633c83d445a6c;p=lyx.git

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 70050fd5bc..506f3586e0 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -76,6 +76,7 @@ namespace {
 
 docstring const uniqueID()
 {
+	// FIXME THREAD
 	static unsigned int seed = 1000;
 	return "file" + convert<docstring>(++seed);
 }
@@ -388,7 +389,8 @@ docstring InsetInclude::screenLabel() const
 			temp = listings_label_;
 			break;
 		case NONE:
-			LASSERT(false, /**/);
+			LASSERT(false, temp = buffer().B_("Unknown"));
+			break;
 	}
 
 	temp += ": ";
@@ -406,7 +408,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;
 }
 
@@ -535,6 +539,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 
 	if (!runparams.nice)
 		incfile = mangled;
+	else if (!runparams.silent)
+		; // no warning wanted
 	else if (!isValidLaTeXFileName(incfile)) {
 		frontend::Alert::warning(_("Invalid filename"),
 			_("The following filename will cause troubles "
@@ -625,42 +631,46 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 
 		Buffer * tmp = loadIfNeeded();
 		if (!tmp) {
-			docstring text = bformat(_("Could not load included "
-				"file\n`%1$s'\n"
-				"Please, check whether it actually exists."),
-				included_file.displayName());
-			Alert::warning(_("Missing included file"), text);
+			if (!runparams.silent) {
+				docstring text = bformat(_("Could not load included "
+					"file\n`%1$s'\n"
+					"Please, check whether it actually exists."),
+					included_file.displayName());
+				Alert::warning(_("Missing included file"), text);
+			}
 			return;
 		}
 
-		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);
-		}
-
-		// 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()) {
+		if (!runparams.silent) {
+			if (tmp->params().baseClass() != masterBuffer->params().baseClass()) {
+				// FIXME UNICODE
 				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);
+					"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);
+			}
+
+			// 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);
+				}
 			}
 		}
 
@@ -687,16 +697,18 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 		runparams.is_child = true;
 		if (!tmp->makeLaTeXFile(tmpwritefile, masterFileName(buffer()).
 				onlyPath().absFileName(), runparams, Buffer::OnlyBody)) {
-			docstring msg = bformat(_("Included file `%1$s' "
+			if (!runparams.silent) {
+				docstring msg = bformat(_("Included file `%1$s' "
 					"was not exported correctly.\nWarning: "
 					"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"),
+				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);
-			Alert::warning(_("Export failure"), msg);
+				Alert::warning(_("Export failure"), msg);
+			}
 		}
 		runparams.encoding = oldEnc;
 		runparams.master_language = oldLang;
@@ -710,7 +722,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 							included_file,
 							inc_format, tex_format, el);
 
-			if (!success) {
+			if (!success && !runparams.silent) {
 				docstring msg = bformat(_("Included file `%1$s' "
 						"was not exported correctly.\nWarning: "
 						"LaTeX export is probably incomplete."),
@@ -768,7 +780,8 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 	// converter on the included file. But that's just masochistic.)
 	FileName const included_file = includedFileName(buffer(), params());
 	if (!isLyXFileName(included_file.absFileName())) {
-		frontend::Alert::warning(_("Unsupported Inclusion"),
+		if (!rp.silent)
+			frontend::Alert::warning(_("Unsupported Inclusion"),
 					 bformat(_("LyX does not know how to include non-LyX files when "
 					           "generating HTML output. Offending file:\n%1$s"),
 					            params()["filename"]));
@@ -813,12 +826,19 @@ docstring InsetInclude::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 int InsetInclude::plaintext(odocstringstream & os,
         OutputParams const & op, size_t) const
 {
-	// don't write the file just because we're making a tooltip or toc entry!!
-	if (op.for_tooltip || op.for_toc || isVerbatim(params()) || isListings(params())) {
-		os << '[' << screenLabel() << '\n';
-		// FIXME: We don't know the encoding of the file, default to UTF-8.
-		os << includedFileName(buffer(), params()).fileContents("UTF-8");
-		os << "\n]";
+	// 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) {
+		os << '[' << screenLabel() << '\n'
+		   << getParam("filename") << "\n]";
+		return PLAINTEXT_NEWLINE + 1; // one char on a separate line
+	}
+
+	if (isVerbatim(params()) || isListings(params())) {
+		os << '[' << screenLabel() << '\n'
+		   // FIXME: We don't know the encoding of the file, default to UTF-8.
+		   << includedFileName(buffer(), params()).fileContents("UTF-8")
+		   << "\n]";
 		return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 	}
 
@@ -897,14 +917,13 @@ int InsetInclude::docbook(odocstream & os, OutputParams const & runparams) const
 
 void InsetInclude::validate(LaTeXFeatures & features) const
 {
-	string incfile = to_utf8(params()["filename"]);
-	string writefile;
-
-	LASSERT(&buffer() == &features.buffer(), /**/);
+	LATTEST(&buffer() == &features.buffer());
 
+	string incfile = to_utf8(params()["filename"]);
 	string const included_file =
 		includedFileName(buffer(), params()).absFileName();
 
+	string writefile;
 	if (isLyXFileName(included_file))
 		writefile = changeExtension(included_file, ".sgml");
 	else
@@ -939,9 +958,12 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 			// 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 = false;
+			features.runparams().is_child = is_child;
 			features.setBuffer(buffer());
 		}
 	}
@@ -953,13 +975,18 @@ 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();
 }
 
 
 void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	LASSERT(mi.base.bv, /**/);
+	LBUFERR(mi.base.bv);
 
 	bool use_preview = false;
 	if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {
@@ -985,7 +1012,7 @@ void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetInclude::draw(PainterInfo & pi, int x, int y) const
 {
-	LASSERT(pi.base.bv, /**/);
+	LBUFERR(pi.base.bv);
 
 	bool use_preview = false;
 	if (RenderPreview::status() != LyXRC::PREVIEW_OFF) {