* src/frontends/qt4/QTocDialog.C (updateGui):

[lyx.git] / src / lyxfont.h

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 8d0d3a26102418fb33c3c2dce3712750ad58d8bf..b8ac5516557aa9f4d300a1c81f7cd273704513c5 100644 (file)
--- 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,18 @@ public:
            to this font. Returns number of chars written. Base is the
            font state active now.
        */
-       int latexWriteStartChanges(std::ostream &, LyXFont const & base,
+       int latexWriteStartChanges(odocstream &, LyXFont const & base,
                                   LyXFont const & prev) 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,
+       int latexWriteEndChanges(odocstream &, LyXFont const & base,
                                 LyXFont const & next) 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 +381,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 +413,7 @@ bool operator!=(LyXFont const & font1, LyXFont const & font2)
        return !(font1 == font2);
 }
 
+
+} // namespace lyx
+
 #endif