Fix generation of invalid LyX files

* src/lyxfont.C
	(LyXFont::lyxWriteChanges): Don't change color "inherit" to
	"default", since that cannot be read in.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15654 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-11-01 09:38:54 +00:00
parent 551fe79880
commit 4c34726901

View File

@ -724,14 +724,8 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
if (orgfont.noun() != noun()) { if (orgfont.noun() != noun()) {
os << "\\noun " << LyXMiscNames[noun()] << "\n"; os << "\\noun " << LyXMiscNames[noun()] << "\n";
} }
if (orgfont.color() != color()) { if (orgfont.color() != color())
// To make us file compatible with older os << "\\color " << lcolor.getLyXName(color()) << '\n';
// 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.language() != language() && if (orgfont.language() != language() &&
language() != latex_language) { language() != latex_language) {
if (language()) if (language())