X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=86df589be609d14678af1b5925e69c3cae8a555a;hb=53c5edb99e5566fd7c0a1192a697b7b7796919d8;hp=07a0348d80e4ac14af04e85d8a1c6b3d557fe572;hpb=ff367a38b1815c6ee5d85f9ab1b1dee80b3a3fd2;p=lyx.git

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 07a0348d80..86df589be6 100644
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -19,25 +19,13 @@
 #include <iosfwd>
 
 #include "LString.h"
-#include "language.h"
 #include "LColor.h"
-
-// It might happen that locale.h defines ON and OFF. This is not good
-// for us, since we use these names below. But of course this is due
-// to some old compilers. Than is broken when it comes to C++ scoping.
-#include "gettext.h" // so that we are sure tht it won't be included
-// later. 
-#ifdef ON
-#undef ON
-#endif
-
-#ifdef OFF
-#undef OFF
-#endif
+#include "language.h"
 
 class LyXLex;
 class BufferParams;
 
+
 ///
 class LyXFont {
 public:
@@ -376,6 +364,33 @@ LyXFont::FONT_SHAPE LyXFont::shape() const
 }
 
 
+inline
+LyXFont::LyXFont()
+	: bits(sane), lang(default_language)
+{}
+
+
+inline
+LyXFont::FONT_FAMILY LyXFont::family() const 
+{
+	return bits.family;
+}
+
+
+inline
+LyXFont::FONT_SERIES LyXFont::series() const
+{
+	return bits.series;
+}
+
+
+inline
+LyXFont::FONT_SIZE LyXFont::size() const
+{
+	return bits.size;
+}
+
+
 inline
 LyXFont::FONT_MISC_STATE LyXFont::emph() const
 {
@@ -383,6 +398,13 @@ LyXFont::FONT_MISC_STATE LyXFont::emph() const
 }
 
 
+inline
+LyXFont::FONT_MISC_STATE LyXFont::noun() const
+{
+	return bits.noun;
+}
+
+
 ///
 std::ostream & operator<<(std::ostream &, LyXFont::FONT_MISC_STATE);