X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=0cfaaf24c5d94dbbcd5427f2a5b60f698dce5032;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=8d0d3a26102418fb33c3c2dce3712750ad58d8bf;hpb=372365845df7615b7b40db143d82b14cc98bb902;p=lyx.git

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 8d0d3a2610..0cfaaf24c5 100644
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -16,9 +16,11 @@
 #define LYXFONT_H
 
 #include "LColor.h"
+#include "support/docstream.h"
+
+
+namespace lyx {
 
-#include <iosfwd>
-#include <string>
 
 class LyXLex;
 class BufferParams;
@@ -60,6 +62,8 @@ public:
 		///
 		WASY_FAMILY,
 		///
+		ESINT_FAMILY,
+		///
 		INHERIT_FAMILY,
 		///
 		IGNORE_FAMILY,
@@ -295,18 +299,21 @@ public:
 	    to this font. Returns number of chars written. Base is the
 	    font state active now.
 	*/
-	int latexWriteStartChanges(std::ostream &, LyXFont const & base,
-				   LyXFont const & prev) const;
+	int latexWriteStartChanges(odocstream &, LyXFont const & base,
+	                           LyXFont const & prev,
+	                           BufferParams const &) 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
 	    to achieve.
 	*/
-	int latexWriteEndChanges(std::ostream &, LyXFont const & base,
-				 LyXFont const & next) const;
+	int latexWriteEndChanges(odocstream &, LyXFont const & base,
+	                         LyXFont const & next,
+	                         BufferParams const &) const;
+
 
 	/// Build GUI description of font state
-	std::string const stateText(BufferParams * params) const;
+	docstring const stateText(BufferParams * params) const;
 
 	///
 	LColor_color realColor() const;
@@ -377,6 +384,7 @@ bool LyXFont::isSymbolFont() const
 	case LyXFont::MSA_FAMILY:
 	case LyXFont::MSB_FAMILY:
 	case LyXFont::WASY_FAMILY:
+	case LyXFont::ESINT_FAMILY:
 		return true;
 	default:
 		return false;
@@ -408,4 +416,7 @@ bool operator!=(LyXFont const & font1, LyXFont const & font2)
 	return !(font1 == font2);
 }
 
+
+} // namespace lyx
+
 #endif