X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.h;h=c80d61b27df1e6e7edccf455b440690b176dbf7b;hb=6f88e11da323c7159f80cf79d9f4486d3615e355;hp=7e509a4710baef72da7707c3f4ed294d0d454f8c;hpb=e1ac6d411850c934dfc582795bc1ed1570a381c5;p=lyx.git

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index 7e509a4710..c80d61b27d 100644
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -9,16 +9,16 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef INSETNOTE_H
-#define INSETNOTE_H
+#ifndef INSET_NOTE_H
+#define INSET_NOTE_H
 
 #include "InsetCollapsable.h"
-#include "MailInset.h"
 
 
 namespace lyx {
 
-class InsetNoteParams {
+class InsetNoteParams
+{
 public:
 	enum Type {
 		Note,
@@ -36,52 +36,68 @@ public:
 };
 
 
-/** The PostIt note inset, and other annotations
+/////////////////////////////////////////////////////////////////////////
+//
+// InsetNote
+//
+/////////////////////////////////////////////////////////////////////////
 
-*/
-class InsetNote : public InsetCollapsable {
+/// The PostIt note inset, and other annotations
+class InsetNote : public InsetCollapsable
+{
 public:
 	///
-	InsetNote(Buffer const &, std::string const &);
+	InsetNote(Buffer *, std::string const &);
 	///
 	~InsetNote();
 	///
+	static std::string params2string(InsetNoteParams const &);
+	///
+	static void string2params(std::string const &, InsetNoteParams &);
+	///
 	InsetNoteParams const & params() const { return params_; }
 private:
-	///
-	docstring editMessage() const;
 	///
 	InsetCode lyxCode() const { return NOTE_CODE; }
 	///
-	docstring name() const;
+	docstring layoutName() const;
+	///
+	DisplayType display() const;
+	/** returns false if, when outputing LaTeX, font changes should
+	    be closed before generating this inset. This is needed for
+	    insets that may contain several paragraphs */
+	bool inheritFont() const { return params_.type == InsetNoteParams::Note; }
+	/// Is the content of this inset part of the output document?
+	bool producesOutput() const
+		{ return params_.type == InsetNoteParams::Greyedout; }
 	///
-	virtual DisplayType display() const;
+	bool allowSpellCheck() const;
 	///
-	bool noFontChange() const { return params_.type != InsetNoteParams::Note; }
+	FontInfo getFont() const;
 	///
 	void write(std::ostream &) const;
 	///
 	void read(Lexer & lex);
-	///
-	void setButtonLabel();
 	/// show the note dialog
 	bool showInsetDialog(BufferView * bv) const;
 	///
 	bool isMacroScope() const;
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
+	///
 	void validate(LaTeXFeatures &) const;
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
-	// Update the counters of this inset and of its contents
-	void updateLabels(ParIterator const &);
 	///
-	void addToToc(ParConstIterator const &) const;
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype) const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
@@ -89,7 +105,7 @@ private:
 	/// used by the constructors
 	void init();
 	///
-	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	std::string contextMenuName() const;
 	///
 	friend class InsetNoteParams;
 
@@ -97,30 +113,6 @@ private:
 	InsetNoteParams params_;
 };
 
-
-class InsetNoteMailer : public MailInset {
-public:
-	///
-	InsetNoteMailer(InsetNote & inset);
-	///
-	virtual Inset & inset() const { return inset_; }
-	///
-	virtual std::string const & name() const { return name_; }
-	///
-	virtual std::string const inset2string(Buffer const &) const;
-	///
-	static std::string const params2string(InsetNoteParams const &);
-	///
-	static void string2params(std::string const &, InsetNoteParams &);
-
-private:
-	///
-	static std::string const name_;
-	///
-	InsetNote & inset_;
-};
-
-
 } // namespace lyx
 
-#endif
+#endif // INSET_NOTE_H