X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=9b4ba5768d42407f9dd5da5d63be85b67b9bf13d;hb=9914f21bceef9610bd1822f96eff0aa6d1a8df7c;hp=47fe721ced880553d84bbf29e2ca48a8d58c1a2f;hpb=de1655f92b2c56868f30d66036c05f7ddd4e0f19;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 47fe721ced..9b4ba5768d 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -50,7 +50,6 @@ namespace lyx {
 namespace {
 
 typedef Translator<string, InsetNoteParams::Type> NoteTranslator;
-typedef Translator<docstring, InsetNoteParams::Type> NoteTranslatorLoc;
 
 NoteTranslator const init_notetranslator()
 {
@@ -111,7 +110,7 @@ InsetNote::~InsetNote()
 }
 
 
-docstring InsetNote::name() const 
+docstring InsetNote::layoutName() const
 {
 	return from_ascii("Note:" + notetranslator().find(params_.type));
 }
@@ -195,16 +194,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 const label = translateIfPossible(il.labelstring());
-	docstring const str = label + from_ascii(": ") + text().getPar(0).asString();
-	toc.push_back(TocItem(pit, 0, str, toolTipText()));
+	docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
+	text().forToc(str, TOC_ENTRY_LENGTH);
+	toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
 	// Proceed with the rest of the inset.
 	InsetCollapsable::addToToc(cpit);
 }
@@ -220,10 +219,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 +231,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 +242,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'));
 }
 
 
@@ -314,6 +310,10 @@ void InsetNote::validate(LaTeXFeatures & features) const
 	switch (params_.type) {
 	case InsetNoteParams::Comment:
 		features.require("verbatim");
+		if (features.runparams().flavor == OutputParams::HTML)
+			// we do output this but set display to "none" by default,
+			// but people might want to use it.
+			InsetCollapsable::validate(features);
 		break;
 	case InsetNoteParams::Greyedout:
 		features.require("color");
@@ -326,9 +326,9 @@ void InsetNote::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetNote::contextMenuName() const
+string InsetNote::contextMenuName() const
 {
-	return from_ascii("context-note");
+	return "context-note";
 }
 
 bool InsetNote::allowSpellCheck() const