X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.h;h=9df1a501a29c75ba12c7ebc3c8f13517f7f4d3c4;hb=705302f6dee4e4be9ea46213aa1b0cc18be0cfb0;hp=4de8d5cd54cde3b519b50bd30b38e560dc90209e;hpb=ceb50a253cc09c94e113386b5c54fb408035e1af;p=lyx.git

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index 4de8d5cd54..9df1a501a2 100644
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -12,7 +12,7 @@
 #ifndef INSET_NOTE_H
 #define INSET_NOTE_H
 
-#include "InsetCollapsable.h"
+#include "InsetCollapsible.h"
 
 
 namespace lyx {
@@ -43,7 +43,7 @@ public:
 /////////////////////////////////////////////////////////////////////////
 
 /// The PostIt note inset, and other annotations
-class InsetNote : public InsetCollapsable
+class InsetNote : public InsetCollapsible
 {
 public:
 	///
@@ -60,32 +60,33 @@ private:
 	///
 	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; }
 	///
-	bool noFontChange() const { return params_.type != InsetNoteParams::Note; }
-	/*!
-	 * Is the content of this inset part of the output document?
-	 *
-	 * Note that Note insets are not considered part of the
-	 * document, even in their 'greyed out' incarnation.
-	 */
-	bool producesOutput() const { return false; }
+	bool allowSpellCheck() const;
+	///
+	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;
 	///
@@ -95,15 +96,13 @@ private:
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void addToToc(DocIterator const &);
-	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
 	Inset * clone() const { return new InsetNote(*this); }
 	/// used by the constructors
 	void init();
 	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
+	std::string contextMenuName() const;
 	///
 	friend class InsetNoteParams;