X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.h;h=8cde3686c8fb1c342dfb3a85050877599496c5ab;hb=f5123ccfa82215030c70561af881175d92244492;hp=59085ec847133da20b9b9dde0859b7681dcf1227;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git

diff --git a/src/Language.h b/src/Language.h
index 59085ec847..8cde3686c8 100644
--- a/src/Language.h
+++ b/src/Language.h
@@ -4,10 +4,10 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -24,6 +24,7 @@ namespace lyx {
 namespace support { class FileName; }
 
 class Encoding;
+class Lexer;
 
 ///
 class Language {
@@ -31,13 +32,6 @@ public:
 	///
 	Language() : rightToLeft_(false) {}
 	///
-	Language(std::string const & l, std::string const & b, std::string const & d,
-		 bool rtl, std::string const & es, Encoding const * e, std::string const & c,
-		 std::string const & o)
-		: lang_(l), babel_(b), display_(d), rightToLeft_(rtl),
-		  encodingStr_(es), encoding_(e), code_(c), latex_options_(o)
-		{}
-	///
 	std::string const & lang() const { return lang_; }
 	///
 	std::string const & babel() const { return babel_; }
@@ -51,8 +45,20 @@ public:
 	std::string const & encodingStr() const { return encodingStr_; }
 	///
 	std::string const & code() const { return code_; }
+	/// set code (needed for rc.spellchecker_alt_lang)
+	void setCode(std::string const c) { code_ = c; }
+	///
+	std::string const & variety() const { return variety_; }
+	/// set variety (needed for rc.spellchecker_alt_lang)
+	void setVariety(std::string const v) { variety_ = v; }
 	///
 	std::string const & latex_options() const { return latex_options_; }
+	///
+	bool internalFontEncoding() const;
+	///
+	bool read(Lexer & lex);
+	// for the use in std::map
+	friend bool operator<(Language const & p, Language const & q);
 private:
 	///
 	std::string lang_;
@@ -67,11 +73,22 @@ private:
 	///
 	Encoding const * encoding_;
 	///
+	std::string codeStr_;
+	///
 	std::string code_;
 	///
+	std::string variety_;
+	///
 	std::string latex_options_;
 };
 
+
+inline bool operator<(Language const & p, Language const & q)
+{
+	return q.lang() > p.lang();
+}
+
+
 class Languages
 {
 public:
@@ -98,11 +115,18 @@ private:
 	LanguageList languagelist;
 };
 
+/// Global singleton instance.
 extern Languages languages;
+/// Default language defined in LyXRC
 extern Language const * default_language;
-extern Language const * english_language;
+/// Used to indicate that the language should be left unchanged when
+/// applying a font change.
 extern Language const * ignore_language;
+/// Default language defined in LyXRC
 extern Language const * latex_language;
+/// Used to indicate that the language should be reset to the Buffer
+// language when applying a font change.
+extern Language const * reset_language;
 
 
 } // namespace lyx