X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=19f6035e0738e54b7007954109597f49ec6c497e;hb=6b49b6b129af9417fea7ea907a44a46fbbd38340;hp=995a4ad693b465d4fcaf95b0df8ea21644fb07ab;hpb=4b1777d2fa533f5a36f010c592a0408be92cdbd2;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 995a4ad693..19f6035e07 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -18,6 +18,7 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "BufferParams.h"
+#include "ColorSet.h"
 #include "Counters.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
@@ -50,7 +51,6 @@ namespace lyx {
 namespace {
 
 typedef Translator<string, InsetNoteParams::Type> NoteTranslator;
-typedef Translator<docstring, InsetNoteParams::Type> NoteTranslatorLoc;
 
 NoteTranslator const init_notetranslator()
 {
@@ -111,7 +111,7 @@ InsetNote::~InsetNote()
 }
 
 
-docstring InsetNote::name() const 
+docstring InsetNote::layoutName() const
 {
 	return from_ascii("Note:" + notetranslator().find(params_.type));
 }
@@ -195,18 +195,20 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit) const
+void InsetNote::addToToc(DocIterator const & cpit, bool output_active) const
 {
 	DocIterator pit = cpit;
 	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(docstring(), 3, 60)));
+	toc.push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
+
 	// Proceed with the rest of the inset.
-	InsetCollapsable::addToToc(cpit);
+	bool doing_output = output_active && producesOutput();
+	InsetCollapsable::addToToc(cpit, doing_output);
 }
 
 
@@ -220,10 +222,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 +234,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,19 +245,18 @@ 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'));
 }
 
 
-int InsetNote::plaintext(odocstream & os,
-			 OutputParams const & runparams_in) const
+int InsetNote::plaintext(odocstringstream & os,
+			 OutputParams const & runparams_in, size_t max_length) const
 {
 	if (params_.type == InsetNoteParams::Note)
 		return 0;
@@ -269,7 +268,7 @@ int InsetNote::plaintext(odocstream & os,
 		runparams.exportdata.reset(new ExportData);
 	}
 	os << '[' << buffer().B_("note") << ":\n";
-	InsetText::plaintext(os, runparams);
+	InsetText::plaintext(os, runparams, max_length);
 	os << "\n]";
 
 	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -314,6 +313,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 +329,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
@@ -336,6 +339,19 @@ bool InsetNote::allowSpellCheck() const
 	return (params_.type == InsetNoteParams::Greyedout || lyxrc.spellcheck_notes);
 }
 
+FontInfo InsetNote::getFont() const
+{
+	FontInfo font = getLayout().font();
+	// FIXME: This hardcoded color is a hack!
+	if (params_.type == InsetNoteParams::Greyedout
+	    && buffer().params().notefontcolor != lyx::rgbFromHexName("#cccccc")) {
+		ColorCode c = lcolor.getFromLyXName("notefontcolor");
+		if (c != Color_none)
+			font.setColor(c);
+	}
+	return font;
+}
+
 
 string InsetNote::params2string(InsetNoteParams const & params)
 {