X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=05ee4f0fbb752c03f19a056fd94e9402c92197da;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=ed47e40e2271fe463fcd15e6b0a33f6228d7b862;hpb=9e9c96035cd48e30f658c96a8448c99c868772b3;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index ed47e40e22..05ee4f0fbb 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -111,7 +111,7 @@ InsetNote::~InsetNote()
 }
 
 
-docstring InsetNote::name() const 
+docstring InsetNote::layoutName() const
 {
 	return from_ascii("Note:" + notetranslator().find(params_.type));
 }
@@ -195,16 +195,16 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit)
+void InsetNote::addToToc(DocIterator const & cpit) const
 {
 	DocIterator pit = cpit;
-	pit.push_back(CursorSlice(*this));
+	pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
 
 	Toc & toc = buffer().tocBackend().toc("note");
 	InsetLayout const & il = getLayout();
 	docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
 	text().forToc(str, TOC_ENTRY_LENGTH);
-	toc.push_back(TocItem(pit, 0, str, toolTipText()));
+	toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
 	// Proceed with the rest of the inset.
 	InsetCollapsable::addToToc(cpit);
 }
@@ -220,10 +220,10 @@ bool InsetNote::isMacroScope() const
 }
 
 
-int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 {
 	if (params_.type == InsetNoteParams::Note)
-		return 0;
+		return;
 
 	OutputParams runparams(runparams_in);
 	if (params_.type == InsetNoteParams::Comment) {
@@ -232,8 +232,6 @@ int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const
 		runparams.exportdata.reset(new ExportData);
 	} 
 
-	odocstringstream ss;
-	InsetCollapsable::latex(ss, runparams);
 	// the space after the comment in 'a[comment] b' will be eaten by the
 	// comment environment since the space before b is ignored with the
 	// following latex output:
@@ -245,14 +243,13 @@ int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const
 	//  b
 	//
 	// Adding {} before ' b' fixes this.
-	if (params_.type == InsetNoteParams::Comment)
-		ss << "{}";
+	// The {} will be automatically added, but only if needed, for all
+	// insets whose InsetLayout Display tag is false. This is achieved
+	// by telling otexstream to protect an immediately following space
+	// and is done for both comment and greyedout insets.
+	InsetCollapsable::latex(os, runparams);
 
-	docstring const str = ss.str();
-	os << str;
 	runparams_in.encoding = runparams.encoding;
-	// Return how many newlines we issued.
-	return int(count(str.begin(), str.end(), '\n'));
 }