X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.h;h=dd580da8a024b8895e1a8933bfddb3bab8df7e4a;hb=e15d3d35cba7266d8a1a22c7e4cd92d12599e103;hp=8022113891166fecfa0afb3887da430393f0d79a;hpb=7bc133b0a2e1c11e1bddc06259b871dd5ef90611;p=lyx.git

diff --git a/src/insets/InsetNote.h b/src/insets/InsetNote.h
index 8022113891..dd580da8a0 100644
--- a/src/insets/InsetNote.h
+++ b/src/insets/InsetNote.h
@@ -60,21 +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; }
-	/*!
-	 * 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; }
+	/** 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);
@@ -83,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;
 	///
@@ -95,7 +96,7 @@ private:
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const & di, bool output_active) const;
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
@@ -103,7 +104,7 @@ private:
 	/// used by the constructors
 	void init();
 	///
-	docstring contextMenuName() const;
+	std::string contextMenuName() const;
 	///
 	friend class InsetNoteParams;