* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / insetnote.h

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 8b93cf078606c151e4b6ddecb176096f5176721f..034f81158b8766b6c1b86a4e5babe26a08d64e29 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -12,17 +12,29 @@
 #ifndef INSETNOTE_H
 #define INSETNOTE_H
 
-
 #include "insetcollapsable.h"
+#include "mailinset.h"
+
 
+namespace lyx {
 
- struct InsetNoteParams {
+class InsetNoteParams {
+public:
+       enum Type {
+               Note,
+               Comment,
+               Greyedout,
+               Framed,
+               Shaded
+       };
+       /// \c type defaults to Note
+       InsetNoteParams();
        ///
        void write(std::ostream & os) const;
        ///
        void read(LyXLex & lex);
        ///
-       std::string type;
+       Type type;
 };
 
 
@@ -32,60 +44,53 @@
 class InsetNote : public InsetCollapsable {
 public:
        ///
-
-
        InsetNote(BufferParams const &, std::string const &);
-       /// Copy constructor
-       InsetNote(InsetNote const &);
        ///
        ~InsetNote();
        ///
-       virtual std::auto_ptr<InsetBase> clone() const;
+       virtual docstring const editMessage() const;
        ///
-       std::string const editMessage() const;
-       ///
-       InsetOld::Code lyxCode() const { return InsetOld::NOTE_CODE; }
+       InsetBase::Code lyxCode() const { return InsetBase::NOTE_CODE; }
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
        void read(Buffer const & buf, LyXLex & lex);
        ///
        void setButtonLabel();
-       ///
-       dispatch_result localDispatch(FuncRequest const &);
-       ///
-       void metrics(MetricsInfo &, Dimension &) const;
        /// show the note dialog
        bool showInsetDialog(BufferView * bv) const;
        ///
-       int latex(Buffer const &, std::ostream &,
-                       LatexRunParams const &) const;
-       ///
-       int linuxdoc(Buffer const &, std::ostream &) const;
+       int latex(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &, bool) const;
+       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int ascii(Buffer const &, std::ostream &, int) const;
+       int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
        InsetNoteParams const & params() const { return params_; }
-
+       ///
+       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+protected:
+       InsetNote(InsetNote const &);
+       ///
+       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
        friend class InsetNoteParams;
 
+       virtual std::auto_ptr<InsetBase> doClone() const;
+
        /// used by the constructors
        void init();
        ///
        InsetNoteParams params_;
 };
 
-#include "mailinset.h"
 
 class InsetNoteMailer : public MailInset {
 public:
        ///
-       InsetNoteMailer(std::string const & name, InsetNote & inset);
+       InsetNoteMailer(InsetNote & inset);
        ///
        virtual InsetBase & inset() const { return inset_; }
        ///
@@ -93,17 +98,18 @@ public:
        ///
        virtual std::string const inset2string(Buffer const &) const;
        ///
-       static std::string const params2string(std::string const &, InsetNoteParams const &);
+       static std::string const params2string(InsetNoteParams const &);
        ///
        static void string2params(std::string const &, InsetNoteParams &);
 
 private:
        ///
-       std::string const name_;
+       static std::string const name_;
        ///
        InsetNote & inset_;
 };
 
 
+} // namespace lyx
 
 #endif