X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=8959e619e8535c54a7e32c7c4ec6c9c70ae71518;hb=21226de2b87a86be19fff025cace3d286a75aa76;hp=7e4014b74feffbcb73abe920c237b2ff403322ce;hpb=9972899fa2437cf17346fe081c109e685176cb66;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 7e4014b74f..8959e619e8 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -22,6 +22,7 @@
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
+#include "language.h"
 #include "FontLoader.h"
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
@@ -39,9 +40,9 @@ using std::strlen;
 
 namespace {
 
-char const * GUIFamilyNames[11] = 
+char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = 
 { N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"),
-  "cmsy", "cmm", "cmex", "msa", "msb",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
   N_("Inherit"), N_("Ignore") };
 
 char const * GUISeriesNames[4] = 
@@ -63,9 +64,9 @@ char const * GUIMiscNames[5] =
 //
 // Strings used to read and write .lyx format files
 //
-char const * LyXFamilyNames[11] = 
+char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] = 
 { "roman", "sans", "typewriter", "symbol",
-  "cmsy", "cmm", "cmex", "msa", "msb",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
   "default", "error" };
 
 char const * LyXSeriesNames[4] = 
@@ -77,7 +78,7 @@ char const * LyXShapeNames[6] =
 char const * LyXSizeNames[14] = 
 { "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
   "larger", "largest", "huge", "giant", 
-  "increase-error", "decrease-error", "default", "error" };
+  "increase", "decrease", "default", "error" };
 
 char const * LyXMiscNames[5] = 
 { "off", "on", "toggle", "default", "error" };
@@ -158,6 +159,11 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
 }
 
 
+LyXFont::LyXFont()
+	: bits(sane), lang(default_language)
+{}
+
+
 LyXFont::LyXFont(LyXFont::FONT_INIT1)
 #ifndef INHERIT_LANGUAGE
 	: bits(inherit), lang(default_language)