X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=a7a0dc16abf0fad7856075ad085271d6f600d724;hb=f24bb4a91980a17c00c12ec0bbb457e0f182215f;hp=90fed5757ae0ca969b665152de43bc24022e91c4;hpb=ecf62a8f21e457936ed285d4fbcbed7348bb636b;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 90fed5757a..a7a0dc16ab 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -19,16 +19,16 @@
 #include "BufferView.h"
 #include "ColorSet.h"
 #include "Cursor.h"
-#include "DispatchResult.h"
 #include "Exporter.h"
+#include "FontInfo.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "InsetLayout.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "output_docbook.h"
-#include "TextClass.h"
-#include "TocBackend.h"
+#include "output_latex.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -207,11 +207,28 @@ bool InsetNote::isMacroScope() const
 
 void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 {
-	if (params_.type == InsetNoteParams::Note)
+	if (params_.type != InsetNoteParams::Greyedout
+	    && runparams_in.find_effective()
+	    && !runparams_in.find_with_non_output())
 		return;
 
+	if (params_.type == InsetNoteParams::Note) {
+		if (runparams_in.find_with_non_output()) {
+			OutputParams runparams(runparams_in);
+			InsetCollapsible::latex(os, runparams);
+			runparams_in.encoding = runparams.encoding;
+		}
+		return;
+	}
+
 	OutputParams runparams(runparams_in);
 	if (params_.type == InsetNoteParams::Comment) {
+		if (runparams_in.inComment) {
+			// Nested comments should just output the contents.
+			latexParagraphs(buffer(), text(), os, runparams);
+			return;
+		}
+
 		runparams.inComment = true;
 		// Ignore files that are exported inside a comment
 		runparams.exportdata.reset(new ExportData);
@@ -241,18 +258,25 @@ void InsetNote::latex(otexstream & 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;
+	if (!runparams_in.find_with_non_output()) {
+		if (params_.type == InsetNoteParams::Note)
+			return 0;
+		else if (params_.type == InsetNoteParams::Comment
+		    && runparams_in.find_effective())
+			return 0;
+	}
 
 	OutputParams runparams(runparams_in);
-	if (params_.type == InsetNoteParams::Comment) {
+	if (params_.type != InsetNoteParams::Greyedout) {
 		runparams.inComment = true;
 		// Ignore files that are exported inside a comment
 		runparams.exportdata.reset(new ExportData);
 	}
-	os << '[' << buffer().B_("note") << ":\n";
+	if (!runparams_in.find_with_non_output())
+		os << '[' << buffer().B_("note") << ":\n";
 	InsetText::plaintext(os, runparams, max_length);
-	os << "\n]";
+	if (!runparams_in.find_with_non_output())
+		os << "\n]";
 
 	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
@@ -296,7 +320,7 @@ void InsetNote::validate(LaTeXFeatures & features) const
 {
 	switch (params_.type) {
 	case InsetNoteParams::Comment:
-		if (features.runparams().flavor == FLAVOR::HTML)
+		if (features.runparams().flavor == Flavor::Html)
 			// we do output this but set display to "none" by default,
 			// but people might want to use it.
 			InsetCollapsible::validate(features);
@@ -328,12 +352,15 @@ bool InsetNote::allowSpellCheck() const
 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")) {
+	    && buffer().params().isnotefontcolor) {
 		ColorCode c = lcolor.getFromLyXName("notefontcolor");
 		if (c != Color_none)
 			font.setColor(c);
+		// This is the local color (not overridden by other documents)
+		ColorCode lc = lcolor.getFromLyXName("notefontcolor@" + buffer().fileName().absFileName());
+		if (lc != Color_none)
+			font.setPaintColor(lc);
 	}
 	return font;
 }