X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetInclude.cpp;h=870310ef2ddaa9c03f3186ee18d4fc39f29f3939;hb=eb294eadb5e7f22880da399ae082f74567bbfc4e;hp=33defcebfd5f832ba8417730346c704b7ea12b65;hpb=4062cbd27876ca915062007299f3cec99ce85470;p=lyx.git

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 33defcebfd..870310ef2d 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -182,7 +182,7 @@ char_type replaceCommaInBraces(docstring & params)
 InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p)
 	: InsetCommand(buf, p), include_label(uniqueID()),
 	  preview_(make_unique<RenderMonitoredPreview>(this)), failedtoload_(false),
-	  set_label_(false), label_(nullptr), child_buffer_(nullptr), file_exist_(false),
+	  label_(nullptr), child_buffer_(nullptr), file_exist_(false),
 	  recursion_error_(false)
 {
 	preview_->connect([this](){ fileChanged(); });
@@ -198,7 +198,7 @@ InsetInclude::InsetInclude(Buffer * buf, InsetCommandParams const & p)
 InsetInclude::InsetInclude(InsetInclude const & other)
 	: InsetCommand(other), include_label(other.include_label),
 	  preview_(make_unique<RenderMonitoredPreview>(this)), failedtoload_(false),
-	  set_label_(false), label_(nullptr), child_buffer_(nullptr), 
+	  label_(nullptr), child_buffer_(nullptr),
 	  file_exist_(other.file_exist_),recursion_error_(other.recursion_error_)
 {
 	preview_->connect([this](){ fileChanged(); });
@@ -376,7 +376,6 @@ void InsetInclude::setParams(InsetCommandParams const & p)
 	recursion_error_ = false;
 
 	InsetCommand::setParams(p);
-	set_label_ = false;
 
 	if (preview_->monitoring())
 		preview_->stopMonitoring();
@@ -619,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);
 
@@ -784,7 +783,7 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 		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()))));
@@ -1007,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 {
@@ -1196,6 +1195,12 @@ void InsetInclude::collectBibKeys(InsetIterator const & /*di*/, FileNameList & c
 }
 
 
+bool InsetInclude::inheritFont() const
+{
+	return !isVerbatim(params());
+}
+
+
 void InsetInclude::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	LBUFERR(mi.base.bv);
@@ -1210,13 +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, !file_exist_ || recursion_error_);
-		}
-		button_.metrics(mi, dim);
+		setBroken(!file_exist_ || recursion_error_);
+		InsetCommand::metrics(mi, dim);
 	}
-
 }
 
 
@@ -1234,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);
 }
 
 
@@ -1250,7 +1251,7 @@ string InsetInclude::contextMenuName() const
 }
 
 
-Inset::RowFlags InsetInclude::rowFlags() const
+int InsetInclude::rowFlags() const
 {
 	return type(params()) == INPUT ? Inline : Display;
 }
@@ -1425,12 +1426,9 @@ void InsetInclude::updateBuffer(ParIterator const & it, UpdateType utype, bool c
 	if (childbuffer) {
 		if (!checkForRecursiveInclude(childbuffer))
 			childbuffer->updateBuffer(Buffer::UpdateChildOnly, utype);
-		button_.update(screenLabel(), true, false, recursion_error_);
 		return;
 	}
 
-	button_.update(screenLabel(), true, false, !file_exist_);
-
 	if (!isListings(params()))
 		return;