Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 70278a9794a0156edd76e3040bd2f6591d4b7c3e..3d641a8a683b9ebf7d8f5699d10853734787fe61 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -5,7 +5,7 @@
  *
  * \author Angus Leeming
  * \author Martin Vermeer
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -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));
@@ -181,8 +175,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY:
                string2params(to_utf8(cmd.argument()), params_);
-               // get a bp from cur:
-               setLayout(cur.buffer().params());
+               setButtonLabel();
                break;
 
        case LFUN_INSET_DIALOG_UPDATE:
@@ -327,15 +320,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);
 }
 
 
@@ -365,37 +372,47 @@ 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)
+
+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))
+       string src = notetranslator().find(typeSrc);
+       string trt = notetranslator().find(typeTrt);
+       if (src != source || trt != target)
                return false;
 
        // did we found some conforming inset?
        bool ret = false;
 
-       Inset & inset = cur.buffer().inset();
+       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;
 }