Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index e1d9a09928142ece105380b319106e5a5120d68e..3d641a8a683b9ebf7d8f5699d10853734787fe61 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -115,7 +115,7 @@ void InsetNoteParams::read(Lexer & lex)
 //
 /////////////////////////////////////////////////////////////////////
 
-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,7 +175,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY:
                string2params(to_utf8(cmd.argument()), params_);
-               setLayout(buffer().params());
+               setButtonLabel();
                break;
 
        case LFUN_INSET_DIALOG_UPDATE:
@@ -326,6 +320,15 @@ 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
 {
        switch (params_.type) {
@@ -369,7 +372,13 @@ 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);
 }