Context menu for InsetArgument

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 995a4ad693b465d4fcaf95b0df8ea21644fb07ab..9b4ba5768d42407f9dd5da5d63be85b67b9bf13d 100644 (file)
--- 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));
 }
@@ -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