Fix greyedout note in RTL (#8647)

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 37055027862167ce14776f1b327c751b17d2dcce..6283e88c05d343084b6a2f2d48707fbc47422232 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -37,6 +37,7 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Translator.h"
 
 #include "frontends/Application.h"
@@ -68,7 +69,7 @@ NoteTranslator const & notetranslator()
 }
 
 
-} // anon
+} // namespace
 
 
 InsetNoteParams::InsetNoteParams()
@@ -99,7 +100,7 @@ void InsetNoteParams::read(Lexer & lex)
 /////////////////////////////////////////////////////////////////////
 
 InsetNote::InsetNote(Buffer * buf, string const & label)
-       : InsetCollapsable(buf)
+       : InsetCollapsible(buf)
 {
        params_.type = notetranslator().find(label);
 }
@@ -126,14 +127,14 @@ Inset::DisplayType InsetNote::display() const
 void InsetNote::write(ostream & os) const
 {
        params_.write(os);
-       InsetCollapsable::write(os);
+       InsetCollapsible::write(os);
 }
 
 
 void InsetNote::read(Lexer & lex)
 {
        params_.read(lex);
-       InsetCollapsable::read(lex);
+       InsetCollapsible::read(lex);
 }
 
 
@@ -161,7 +162,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
                if (params_.type == params.type)
                  break;
 
-               cur.recordUndoInset(ATOMIC_UNDO, this);
+               cur.recordUndoInset(this);
                string2params(to_utf8(cmd.argument()), params_);
                setButtonLabel();
                // what we really want here is a TOC update, but that means
@@ -175,7 +176,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        default:
-               InsetCollapsable::doDispatch(cur, cmd);
+               InsetCollapsible::doDispatch(cur, cmd);
                break;
        }
 }
@@ -202,35 +203,18 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
                return true;
 
        default:
-               return InsetCollapsable::getStatus(cur, cmd, flag);
+               return InsetCollapsible::getStatus(cur, cmd, flag);
        }
 }
 
 
-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().forOutliner(str, TOC_ENTRY_LENGTH);
-       toc.push_back(TocItem(pit, 0, str, output_active, toolTipText(docstring(), 3, 60)));
-
-       // Proceed with the rest of the inset.
-       bool doing_output = output_active && producesOutput();
-       InsetCollapsable::addToToc(cpit, doing_output);
-}
-
-
 bool InsetNote::isMacroScope() const
 {
        // LyX note has no latex output
        if (params_.type == InsetNoteParams::Note)
                return true;
 
-       return InsetCollapsable::isMacroScope();
+       return InsetCollapsible::isMacroScope();
 }
 
 
@@ -244,7 +228,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
                runparams.inComment = true;
                // Ignore files that are exported inside a comment
                runparams.exportdata.reset(new ExportData);
-       } 
+       }
 
        // 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
@@ -261,7 +245,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
        // 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);
+       InsetCollapsible::latex(os, runparams);
 
        runparams_in.encoding = runparams.encoding;
 }
@@ -316,7 +300,7 @@ docstring InsetNote::xhtml(XHTMLStream & xs, OutputParams const & rp) const
        if (params_.type == InsetNoteParams::Note)
                return docstring();
 
-       return InsetCollapsable::xhtml(xs, rp);
+       return InsetCollapsible::xhtml(xs, rp);
 }
 
 
@@ -324,16 +308,18 @@ 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);
+                       InsetCollapsible::validate(features);
+               else
+                       // Only do the requires
+                       features.useInsetLayout(getLayout());
                break;
        case InsetNoteParams::Greyedout:
-               features.require("color");
-               features.require("lyxgreyedout");
-               InsetCollapsable::validate(features);
+               if (features.hasRTLLanguage())
+                       features.require("environ");
+               InsetCollapsible::validate(features);
                break;
        case InsetNoteParams::Note:
                break;