X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=4f625b55b9e18bb97e8b6d971669809a7dd388fb;hb=715b8cda54a2aded29260b57ff201b16fd906f21;hp=799abca1bad32e6c4d9a9274f2721e783520f8a1;hpb=b852df91bc2c88779a7e675574121819cfc3a44d;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 799abca1ba..4f625b55b9 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -45,13 +45,13 @@ Language const * reset_language = 0;
 
 bool Language::isPolyglossiaExclusive() const
 {
-	return babel().empty() && !polyglossia().empty() && requires().empty();
+	return babel().empty() && !polyglossia().empty() && required().empty();
 }
 
 
 bool Language::isBabelExclusive() const
 {
-	return !babel().empty() && polyglossia().empty() && requires().empty();
+	return !babel().empty() && polyglossia().empty() && required().empty();
 }
 
 
@@ -140,17 +140,20 @@ bool Language::readLanguage(Lexer & lex)
 		LA_LANG_VARIETY,
 		LA_POLYGLOSSIANAME,
 		LA_POLYGLOSSIAOPTS,
+		LA_XINDYNAME,
 		LA_POSTBABELPREAMBLE,
 		LA_PREBABELPREAMBLE,
 		LA_PROVIDES,
 		LA_REQUIRES,
 		LA_QUOTESTYLE,
 		LA_RTL,
-		LA_WORDWRAP
+		LA_WORDWRAP,
+		LA_ACTIVECHARS
 	};
 
 	// Keep these sorted alphabetically!
 	LexerKeyword languageTags[] = {
+		{ "activechars",          LA_ACTIVECHARS },
 		{ "babelname",            LA_BABELNAME },
 		{ "dateformats",          LA_DATEFORMATS },
 		{ "encoding",             LA_ENCODING },
@@ -169,7 +172,8 @@ bool Language::readLanguage(Lexer & lex)
 		{ "quotestyle",           LA_QUOTESTYLE },
 		{ "requires",             LA_REQUIRES },
 		{ "rtl",                  LA_RTL },
-		{"wordwrap",              LA_WORDWRAP }
+		{ "wordwrap",             LA_WORDWRAP },
+		{ "xindyname",            LA_XINDYNAME }
 	};
 
 	bool error = false;
@@ -204,9 +208,15 @@ bool Language::readLanguage(Lexer & lex)
 		case LA_POLYGLOSSIAOPTS:
 			lex >> polyglossia_opts_;
 			break;
+		case LA_XINDYNAME:
+			lex >> xindy_;
+			break;
 		case LA_QUOTESTYLE:
 			lex >> quote_style_;
 			break;
+		case LA_ACTIVECHARS:
+			lex >> active_chars_;
+			break;
 		case LA_ENCODING:
 			lex >> encodingStr_;
 			break;
@@ -248,7 +258,7 @@ bool Language::readLanguage(Lexer & lex)
 				lex.getLongString(from_ascii("EndPreBabelPreamble"));
 			break;
 		case LA_REQUIRES:
-			lex >> requires_;
+			lex >> required_;
 			break;
 		case LA_PROVIDES:
 			lex >> provides_;
@@ -268,9 +278,9 @@ bool Language::readLanguage(Lexer & lex)
 
 bool Language::read(Lexer & lex)
 {
-	encoding_ = 0;
-	internal_enc_ = 0;
-	rightToLeft_ = 0;
+	encoding_ = nullptr;
+	internal_enc_ = false;
+	rightToLeft_ = false;
 
 	if (!lex.next()) {
 		lex.printError("No name given for language: `$$Token'.");