Remove indentation on screen after a plain separator inset

[lyx.git] / src / insets / InsetNote.cpp

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index c9b0b8823a7f85d1209f59a95c7fac3551ac4e28..a7a0dc16abf0fad7856075ad085271d6f600d724 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -28,6 +28,7 @@
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "output_docbook.h"
+#include "output_latex.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -206,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);
@@ -240,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
 }
@@ -332,6 +357,10 @@ FontInfo InsetNote::getFont() const
                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;
 }