X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.h;h=d234966071db6b5225373581843cceefeb847bc2;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=45e2347a27c7de1a37b55ee489053820a66321d2;hpb=c8d00ed1272cd489041bed2115081008b6a26489;p=lyx.git

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index 45e2347a27..d234966071 100644
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -23,16 +23,14 @@ public:
 	enum Type {
 		Note,
 		Comment,
-		Greyedout,
-		Framed,
-		Shaded
+		Greyedout
 	};
 	/// \c type defaults to Note
 	InsetNoteParams();
 	///
 	void write(std::ostream & os) const;
 	///
-	void read(LyXLex & lex);
+	void read(Lexer & lex);
 	///
 	Type type;
 };
@@ -50,16 +48,22 @@ public:
 	///
 	virtual docstring const editMessage() const;
 	///
-	InsetBase::Code lyxCode() const { return InsetBase::NOTE_CODE; }
+	InsetCode lyxCode() const { return NOTE_CODE; }
+	///
+	docstring name() const;
+	///
+	virtual DisplayType display() const;
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
-	void read(Buffer const & buf, LyXLex & lex);
+	void read(Buffer const & buf, Lexer & lex);
 	///
 	void setButtonLabel();
 	/// show the note dialog
 	bool showInsetDialog(BufferView * bv) const;
 	///
+	bool isMacroScope(Buffer const & buf) const;
+	///
 	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
 	int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
@@ -70,15 +74,19 @@ public:
 	///
 	InsetNoteParams const & params() const { return params_; }
 	///
-	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+	// Update the counters of this inset and of its contents
+	virtual void updateLabels(Buffer const &, ParIterator const &);
+	///
+	void addToToc(Buffer const &, ParConstIterator const &) const;
 protected:
 	InsetNote(InsetNote const &);
 	///
-	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 private:
 	friend class InsetNoteParams;
 
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual Inset * clone() const;
 
 	/// used by the constructors
 	void init();
@@ -92,7 +100,7 @@ public:
 	///
 	InsetNoteMailer(InsetNote & inset);
 	///
-	virtual InsetBase & inset() const { return inset_; }
+	virtual Inset & inset() const { return inset_; }
 	///
 	virtual std::string const & name() const { return name_; }
 	///