X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=76a716da3ac66beff9bf6d24d92fae6b3acf3665;hb=ac3f391b46d25784f3129e24658b73c4bc15febf;hp=1bc5634aa460c46e0a2c3622c4e099c5a6286609;hpb=e1453ef6873b8c6d371a62471c5d309154133866;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index 1bc5634aa4..76a716da3a 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -26,6 +26,7 @@
 #include "output_latex.h"
 #include "OutputParams.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
@@ -145,6 +146,8 @@ void Font::update(Font const & newfont,
 			setLanguage(default_language);
 		else
 			setLanguage(document_language);
+	else if (newfont.language() == reset_language)
+		setLanguage(document_language);
 	else if (newfont.language() != ignore_language)
 		setLanguage(newfont.language());
 }
@@ -623,7 +626,7 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
 		Encoding const * const ascii = encodings.fromLyXName("ascii");
 		pair<bool, int> const c = switchEncoding(os, bparams,
 				runparams, *ascii);
-		BOOST_ASSERT(c.first);
+		LASSERT(c.first, /**/);
 		count += c.second;
 		runparams.encoding = ascii;
 		open_encoding_ = false;
@@ -641,9 +644,8 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
 
 string Font::toString(bool const toggle) const
 {
-	string lang = "ignore";
-	if (language())
-		lang = language()->lang();
+	string const lang = (language() == reset_language)
+		? "reset" : language()->lang();
 
 	ostringstream os;
 	os << "family " << bits_.family() << '\n'
@@ -719,10 +721,7 @@ bool Font::fromString(string const & data, bool & toggle)
 
 		} else if (token == "language") {
 			string const next = lex.getString();
-			if (next == "ignore")
-				setLanguage(ignore_language);
-			else
-				setLanguage(languages.getLanguage(next));
+			setLanguage(languages.getLanguage(next));
 
 		} else if (token == "toggleall") {
 			toggle = lex.getBool();