X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=e588218047aea9c790753aa0d94b1a118188bd99;hb=1e190a2af27ca99831f51567c16e6b39bf4317c3;hp=2093bc373cd028b963ce77b86fa68c6234695906;hpb=6b64fc8ca6c660684b048e4b04665b7e472ba1c0;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 2093bc373c..e588218047 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -5,6 +5,7 @@
  *
  * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
+ * \author Jürgen Spitzmüller
  * \author Dekel Tsur
  *
  * Full author contact details are available in file CREDITS.
@@ -20,6 +21,8 @@
 
 #include "support/debug.h"
 #include "support/FileName.h"
+#include "support/lstrings.h"
+#include "support/Messages.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -36,49 +39,162 @@ Language const * latex_language = &latex_lang;
 Language const * reset_language = 0;
 
 
+bool Language::readLanguage(Lexer & lex)
+{
+	enum LanguageTags {
+		LA_AS_BABELOPTS = 1,
+		LA_BABELNAME,
+		LA_ENCODING,
+		LA_END,
+		LA_GUINAME,
+		LA_INTERNAL_ENC,
+		LA_LANG_CODE,
+		LA_LANG_VARIETY,
+		LA_POLYGLOSSIANAME,
+		LA_POLYGLOSSIAOPTS,
+		LA_POSTBABELPREAMBLE,
+		LA_PREBABELPREAMBLE,
+		LA_RTL
+	};
+
+	// Keep these sorted alphabetically!
+	LexerKeyword languageTags[] = {
+		{ "asbabeloptions",       LA_AS_BABELOPTS },
+		{ "babelname",            LA_BABELNAME },
+		{ "encoding",             LA_ENCODING },
+		{ "end",                  LA_END },
+		{ "guiname",              LA_GUINAME },
+		{ "internalencoding",     LA_INTERNAL_ENC },
+		{ "langcode",             LA_LANG_CODE },
+		{ "langvariety",          LA_LANG_VARIETY },
+		{ "polyglossianame",      LA_POLYGLOSSIANAME },
+		{ "polyglossiaopts",      LA_POLYGLOSSIAOPTS },
+		{ "postbabelpreamble",    LA_POSTBABELPREAMBLE },
+		{ "prebabelpreamble",     LA_PREBABELPREAMBLE },
+		{ "rtl",                  LA_RTL }
+	};
+
+	bool error = false;
+	bool finished = false;
+	lex.pushTable(languageTags);
+	// parse style section
+	while (!finished && lex.isOK() && !error) {
+		int le = lex.lex();
+		// See comment in LyXRC.cpp.
+		switch (le) {
+		case Lexer::LEX_FEOF:
+			continue;
+
+		case Lexer::LEX_UNDEF: // parse error
+			lex.printError("Unknown language tag `$$Token'");
+			error = true;
+			continue;
+
+		default: 
+			break;
+		}
+		switch (static_cast<LanguageTags>(le)) {
+		case LA_END: // end of structure
+			finished = true;
+			break;
+		case LA_AS_BABELOPTS:
+			lex >> as_babel_options_;
+			break;
+		case LA_BABELNAME:
+			lex >> babel_;
+			break;
+		case LA_POLYGLOSSIANAME:
+			lex >> polyglossia_name_;
+			break;
+		case LA_POLYGLOSSIAOPTS:
+			lex >> polyglossia_opts_;
+			break;
+		case LA_ENCODING:
+			lex >> encodingStr_;
+			break;
+		case LA_GUINAME:
+			lex >> display_;
+			break;
+		case LA_INTERNAL_ENC:
+			lex >> internal_enc_;
+			break;
+		case LA_LANG_CODE:
+			lex >> code_;
+			break;
+		case LA_LANG_VARIETY:
+			lex >> variety_;
+			break;
+		case LA_POSTBABELPREAMBLE:
+			babel_postsettings_ =
+				lex.getLongString("EndPostBabelPreamble");
+			break;
+		case LA_PREBABELPREAMBLE:
+			babel_presettings_ =
+				lex.getLongString("EndPreBabelPreamble");
+			break;
+		case LA_RTL:
+			lex >> rightToLeft_;
+			break;
+		}
+	}
+	lex.popTable();
+	return finished && !error;
+}
+
+
 bool Language::read(Lexer & lex)
 {
+	as_babel_options_ = 0;
 	encoding_ = 0;
-	lex >> lang_;
-	lex >> babel_;
-	lex >> display_;
-	lex >> rightToLeft_;
-	lex >> encodingStr_;
-	lex >> code_;
-	lex >> latex_options_;
-	if (!lex)
+	internal_enc_ = 0;
+	rightToLeft_ = 0;
+
+	if (!lex.next()) {
+		lex.printError("No name given for language: `$$Token'.");
 		return false;
+	}
+
+	lang_ = lex.getString();
+	LYXERR(Debug::INFO, "Reading language " << lang_);
+	if (!readLanguage(lex)) {
+		LYXERR0("Error parsing language `" << lang_ << '\'');
+		return false;
+	}
 
 	encoding_ = encodings.fromLyXName(encodingStr_);
 	if (!encoding_ && !encodingStr_.empty()) {
 		encoding_ = encodings.fromLyXName("iso8859-1");
 		LYXERR0("Unknown encoding " << encodingStr_);
 	}
+	// cache translation status. Calling getMessages() directly in
+	// PrefLanguage::PrefLanguage() did only work if the gui language
+	// was set to auto (otherwise all languages would be marked as available).
+	translated_ = getMessages(code()).available();
 	return true;
 }
 
-bool Language::internalFontEncoding() const
-{
-	// FIXME: list incomplete
-	// FIXME: instead of hardcoding, this
-	// should go to the languages file
-	return lang_ == "hebrew"
-		|| lang_ == "greek"
-		|| lang_ == "polutonikogreek";
-}
-
-
 void Languages::read(FileName const & filename)
 {
 	Lexer lex;
 	lex.setFile(filename);
 	lex.setContext("Languages::read");
-	while (1) {
+	while (lex.isOK()) {
+		int le = lex.lex();
+		switch (le) {
+		case Lexer::LEX_FEOF:
+			continue;
+
+		default:
+			break;
+		}
+		if (lex.getString() != "Language") {
+			lex.printError("Unknown Language tag `$$Token'");
+			continue;
+		}
 		Language l;
 		l.read(lex);
 		if (!lex)
 			break;
-		LYXERR(Debug::INFO, "Reading language " << l.lang());
 		if (l.lang() == "latex")
 			latex_lang = l;
 		else if (l.lang() == "ignore")