Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 189c290791b9a2470f50045457fa97a23c323e05..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()
 {
@@ -61,15 +60,6 @@ NoteTranslator const init_notetranslator()
 }
 
 
-NoteTranslatorLoc const init_notetranslator_loc()
-{
-       NoteTranslatorLoc translator(_("Note[[InsetNote]]"), InsetNoteParams::Note);
-       translator.addPair(_("Comment"), InsetNoteParams::Comment);
-       translator.addPair(_("Greyed out"), InsetNoteParams::Greyedout);
-       return translator;
-}
-
-
 NoteTranslator const & notetranslator()
 {
        static NoteTranslator translator = init_notetranslator();
@@ -77,17 +67,9 @@ NoteTranslator const & notetranslator()
 }
 
 
-NoteTranslatorLoc const & notetranslator_loc()
-{
-       static NoteTranslatorLoc translator = init_notetranslator_loc();
-       return translator;
-}
-
 } // anon
 
 
-
-
 InsetNoteParams::InsetNoteParams()
        : type(Note)
 {}
@@ -128,7 +110,7 @@ InsetNote::~InsetNote()
 }
 
 
-docstring InsetNote::name() const 
+docstring InsetNote::layoutName() const
 {
        return from_ascii("Note:" + notetranslator().find(params_.type));
 }
@@ -154,13 +136,6 @@ void InsetNote::read(Lexer & lex)
 }
 
 
-void InsetNote::setButtonLabel()
-{
-       docstring const label = notetranslator_loc().find(params_.type);
-       setLabel(label);
-}
-
-
 bool InsetNote::showInsetDialog(BufferView * bv) const
 {
        bv->showDialog("note", params2string(params()),
@@ -174,8 +149,12 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY:
+               cur.recordUndoInset(ATOMIC_UNDO, this);
                string2params(to_utf8(cmd.argument()), params_);
                setButtonLabel();
+               // what we really want here is a TOC update, but that means
+               // a full buffer update
+               cur.forceBufferUpdate();
                break;
 
        case LFUN_INSET_DIALOG_UPDATE:
@@ -215,16 +194,16 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit)
+void InsetNote::addToToc(DocIterator const & cpit) const
 {
        DocIterator pit = cpit;
-       pit.push_back(CursorSlice(*this));
+       pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
 
        Toc & toc = buffer().tocBackend().toc("note");
-       docstring str;
-       str = notetranslator_loc().find(params_.type) + from_ascii(": ")
-               + text().getPar(0).asString();
-       toc.push_back(TocItem(pit, 0, str));
+       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)));
        // Proceed with the rest of the inset.
        InsetCollapsable::addToToc(cpit);
 }
@@ -240,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) {
@@ -252,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:
@@ -265,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'));
 }
 
 
@@ -334,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");
@@ -346,9 +326,9 @@ void InsetNote::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetNote::contextMenu(BufferView const &, int, int) const
+string InsetNote::contextMenuName() const
 {
-       return from_ascii("context-note");
+       return "context-note";
 }
 
 bool InsetNote::allowSpellCheck() const