X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.h;h=9df1a501a29c75ba12c7ebc3c8f13517f7f4d3c4;hb=2746fdf7ddbde99d9396a4ea83942e9f572abbb9;hp=24f9a66542e94149778bbb1e06044c51274b432e;hpb=d866717ef7503a1373dd1cb3925e1ac97b079192;p=lyx.git

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index 24f9a66542..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,17 +60,21 @@ private:
 	///
 	InsetCode lyxCode() const { return NOTE_CODE; }
 	///
-	docstring name() const;
+	docstring layoutName() const;
 	///
 	DisplayType display() const;
-	///
-	bool noFontChange() const { return params_.type != InsetNoteParams::Note; }
+	/** 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 allowSpellCheck() const;
 	///
+	FontInfo getFont() const;
+	///
 	void write(std::ostream &) const;
 	///
 	void read(Lexer & lex);
@@ -81,7 +85,8 @@ private:
 	///
 	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;
 	///
@@ -91,15 +96,13 @@ private:
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void addToToc(DocIterator const &) const;
-	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
 	Inset * clone() const { return new InsetNote(*this); }
 	/// used by the constructors
 	void init();
 	///
-	docstring contextMenuName() const;
+	std::string contextMenuName() const;
 	///
 	friend class InsetNoteParams;