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

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index 4a69a19d4e..c80d61b27d 100644
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -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);
@@ -79,9 +83,10 @@ private:
 	///
 	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;
 	///
@@ -91,7 +96,8 @@ private:
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const & di, bool output_active,
+				  UpdateType utype) const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
@@ -99,7 +105,7 @@ private:
 	/// used by the constructors
 	void init();
 	///
-	docstring contextMenuName() const;
+	std::string contextMenuName() const;
 	///
 	friend class InsetNoteParams;