X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.h;h=b59f015eca7d9318deb5ec513f6755681c45e453;hb=b198a36a363bb6a084407d476942d68ef5fb5e86;hp=9ec853d53387b4aacc2370ebefa3ea542913c0e2;hpb=c7a2011adf92bddf7dd9fc308b1df2c1dde9bef6;p=lyx.git

diff --git a/src/Font.h b/src/Font.h
index 9ec853d533..b59f015eca 100644
--- a/src/Font.h
+++ b/src/Font.h
@@ -33,7 +33,7 @@ class Font {
 
 public:
 	///
-	explicit Font(FontInfo = sane_font, Language const * l = 0);
+	explicit Font(FontInfo = sane_font, Language const * l = nullptr);
 
 	///
 	FontInfo & fontInfo() { return bits_; }
@@ -72,10 +72,12 @@ public:
 	    to this font. Returns number of chars written. Base is the
 	    font state active now.
 	*/
-	int latexWriteStartChanges(odocstream &, BufferParams const & bparams,
+	int latexWriteStartChanges(otexstream &, BufferParams const & bparams,
 				   OutputParams const & runparams,
 				   Font const & base,
-				   Font const & prev) const;
+				   Font const & prev,
+				   bool non_inherit_inset = false,
+				   bool needs_cprotection = false) const;
 
 	/** Writes the tail of the LaTeX needed to change to this font.
 	    Returns number of chars written. Base is the font state we want
@@ -86,11 +88,11 @@ public:
 				 Font const & base,
 				 Font const & next,
 				 bool & needPar,
-				 bool const & closeLanguage = true) const;
+				 bool closeLanguage = true) const;
 
 
 	/// Build GUI description of font state
-	docstring const stateText(BufferParams * params) const;
+	docstring const stateText(BufferParams * params = nullptr, bool const terse = false) const;
 
 	///
 	void validate(LaTeXFeatures & features) const;
@@ -117,6 +119,9 @@ private:
 	mutable bool open_encoding_;
 };
 
+///
+std::ostream & operator<<(std::ostream & os, FontInfo const & f);
+
 
 ///
 inline