Fix bug #6315: counters in insets that don't produce output have ghost values.

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 23fdb9878afa9fac4df7c1e34c12c1589ffc7011..d3c1b1e2b49938e7bf4fc4dab8d526502e1e07a2 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -27,7 +27,7 @@
 #include "InsetIterator.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
-#include "MetricsInfo.h"
+#include "LyXRC.h"
 #include "OutputParams.h"
 #include "ParIterator.h"
 #include "TextClass.h"
@@ -111,11 +111,11 @@ void InsetNoteParams::read(Lexer & lex)
 
 /////////////////////////////////////////////////////////////////////
 //
-// InsetNode
+// InsetNote
 //
 /////////////////////////////////////////////////////////////////////
 
-InsetNote::InsetNote(Buffer const & buf, string const & label)
+InsetNote::InsetNote(Buffer * buf, string const & label)
        : InsetCollapsable(buf)
 {
        params_.type = notetranslator().find(label);
@@ -128,12 +128,6 @@ InsetNote::~InsetNote()
 }
 
 
-docstring InsetNote::editMessage() const
-{
-       return _("Opened Note Inset");
-}
-
-
 docstring InsetNote::name() const 
 {
        return from_ascii("Note:" + notetranslator().find(params_.type));
@@ -177,12 +171,15 @@ bool InsetNote::showInsetDialog(BufferView * bv) const
 
 void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY:
+               cur.recordUndoInset(ATOMIC_UNDO, this);
                string2params(to_utf8(cmd.argument()), params_);
-               // get a bp from cur:
-               setLayout(cur.buffer().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:
@@ -199,7 +196,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY:
                // disallow comment and greyed out in commands
@@ -230,8 +227,8 @@ void InsetNote::addToToc(DocIterator const & cpit)
        Toc & toc = buffer().tocBackend().toc("note");
        docstring str;
        str = notetranslator_loc().find(params_.type) + from_ascii(": ")
-               + getNewLabel(str);
-       toc.push_back(TocItem(pit, 0, str));
+               + text().getPar(0).asString();
+       toc.push_back(TocItem(pit, 0, str, toolTipText()));
        // Proceed with the rest of the inset.
        InsetCollapsable::addToToc(cpit);
 }
@@ -327,15 +324,29 @@ int InsetNote::docbook(odocstream & os, OutputParams const & runparams_in) const
 }
 
 
+docstring InsetNote::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+{
+       if (params_.type == InsetNoteParams::Note)
+               return docstring();
+
+       return InsetCollapsable::xhtml(xs, rp);
+}
+
+
 void InsetNote::validate(LaTeXFeatures & features) const
 {
-       if (params_.type == InsetNoteParams::Comment)
+       switch (params_.type) {
+       case InsetNoteParams::Comment:
                features.require("verbatim");
-       if (params_.type == InsetNoteParams::Greyedout) {
+               break;
+       case InsetNoteParams::Greyedout:
                features.require("color");
                features.require("lyxgreyedout");
+               InsetCollapsable::validate(features);
+               break;
+       case InsetNoteParams::Note:
+               break;
        }
-       InsetText::validate(features);
 }
 
 
@@ -344,6 +355,11 @@ docstring InsetNote::contextMenu(BufferView const &, int, int) const
        return from_ascii("context-note");
 }
 
+bool InsetNote::allowSpellCheck() const
+{
+       return (params_.type == InsetNoteParams::Greyedout || lyxrc.spellcheck_notes);
+}
+
 
 string InsetNote::params2string(InsetNoteParams const & params)
 {
@@ -365,42 +381,16 @@ void InsetNote::string2params(string const & in, InsetNoteParams & params)
        Lexer lex;
        lex.setStream(data);
        lex.setContext("InsetNote::string2params");
-       lex >> "note" >> "Note";
+       lex >> "note";
+       // There are cases, such as when we are called via getStatus() from
+       // Dialog::canApply(), where we are just called with "note" rather
+       // than a full "note Note TYPE".
+       if (!lex.isOK())
+               return;
+       lex >> "Note";
 
        params.read(lex);
 }
 
-bool mutateNotes(Cursor & cur, string const & source, string const &target)
-{
-       InsetNoteParams::Type typeSrc = notetranslator().find(source);
-       InsetNoteParams::Type typeTrt = notetranslator().find(target);
-       // syntax check of arguments
-       string sSrc = notetranslator().find(typeSrc);
-       string sTrt = notetranslator().find(typeTrt);
-       if ((sSrc != source) || (sTrt != target))
-               return false;
-
-       // did we found some conforming inset?
-       bool ret = false;
-
-       cur.beginUndoGroup();
-       Inset & inset = cur.buffer().inset();
-       InsetIterator it  = inset_iterator_begin(inset);
-       InsetIterator const end = inset_iterator_end(inset);
-       for (; it != end; ++it) {
-               if (it->lyxCode() == NOTE_CODE) {
-                       InsetNote & ins = static_cast<InsetNote &>(*it);
-                       if (ins.params().type == typeSrc) {
-                               cur.buffer().undo().recordUndo(it);
-                               FuncRequest fr(LFUN_INSET_MODIFY, "note Note " + target);
-                               ins.dispatch(cur, fr);
-                               ret = true;
-                       }
-               }
-       }
-       cur.endUndoGroup();
-
-       return ret;
-}
 
 } // namespace lyx