X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.h;h=e12dc9b2a6ad910eeb38c531f32e7acd47ae916e;hb=ae348f8af96100a154b3792d27732d621d44ec89;hp=b0eeff259dd3c62a8ee9d2007b785d920051f2bd;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/language.h b/src/language.h
index b0eeff259d..e12dc9b2a6 100644
--- a/src/language.h
+++ b/src/language.h
@@ -25,42 +25,30 @@ class Encoding;
 class Language {
 public:
 	///
-	Language() : RightToLeft_(false) {}
+	Language() : rightToLeft_(false) {}
 	///
 	Language(std::string const & l, std::string const & b, std::string const & d,
-		 bool rtl, Encoding const * e, std::string const & c,
+		 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),
-		  encoding_(e), code_(c), latex_options_(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 & lang() const { return lang_; }
 	///
-	std::string const & babel() const {
-		return babel_;
-	}
+	std::string const & babel() const { return babel_; }
 	///
-	std::string const & display() const {
-		return display_;
-	}
+	std::string const & display() const { return display_; }
 	///
-	bool RightToLeft() const {
-		return RightToLeft_;
-	}
+	bool rightToLeft() const { return rightToLeft_; }
 	///
-	Encoding const * encoding() const {
-		return encoding_;
-	}
+	Encoding const * encoding() const { return encoding_; }
 	///
-	std::string const & code() const {
-		return code_;
-	}
+	std::string const & encodingStr() const { return encodingStr_; }
 	///
-	std::string const & latex_options() const {
-		return latex_options_;
-	}
+	std::string const & code() const { return code_; }
+	///
+	std::string const & latex_options() const { return latex_options_; }
 private:
 	///
 	std::string lang_;
@@ -69,7 +57,9 @@ private:
 	///
 	std::string display_;
 	///
-	bool RightToLeft_;
+	bool rightToLeft_;
+	///
+	std::string encodingStr_;
 	///
 	Encoding const * encoding_;
 	///
@@ -92,17 +82,11 @@ public:
 	///
 	Language const * getLanguage(std::string const & language) const;
 	///
-	size_type size() const {
-		return languagelist.size();
-	}
+	size_type size() const { return languagelist.size(); }
 	///
-	const_iterator begin() const {
-		return languagelist.begin();
-	}
+	const_iterator begin() const { return languagelist.begin(); }
 	///
-	const_iterator end() const {
-		return languagelist.end();
-	}
+	const_iterator end() const { return languagelist.end(); }
 	///
 
 private: