X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=ab6dc162b972f10288627e660324043ddb31018f;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=16d1558b73924aba24b98510ce85be1c6be24e48;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 16d1558b73..ab6dc162b9 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -51,7 +51,7 @@ namespace {
 
 char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
 { N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
   N_("Inherit"), N_("Ignore") };
 
 char const * GUISeriesNames[4] =
@@ -75,7 +75,7 @@ char const * GUIMiscNames[5] =
 //
 char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
 { "roman", "sans", "typewriter", "symbol",
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
   "default", "error" };
 
 char const * LyXSeriesNames[4] =
@@ -724,14 +724,8 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 	if (orgfont.noun() != noun()) {
 		os << "\\noun " << LyXMiscNames[noun()] << "\n";
 	}
-	if (orgfont.color() != color()) {
-		// To make us file compatible with older
-		// lyx versions we emit "default" instead
-		// of "inherit"
-		string col_str(lcolor.getLyXName(color()));
-		if (col_str == "inherit") col_str = "default";
-		os << "\\color " << col_str << "\n";
-	}
+	if (orgfont.color() != color())
+		os << "\\color " << lcolor.getLyXName(color()) << '\n';
 	if (orgfont.language() != language() &&
 	    language() != latex_language) {
 		if (language())