X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.h;h=ad8badffbc363ac05aaddd0eaf29b05b19da51d2;hb=5be391b274f2cbf4a1da03bc5ee2136cb6c4e660;hp=ee3828cc6032d17834c48b65a4fed711153ef7af;hpb=bf88ad495cead6e97a05fee59e41414648145fc1;p=lyx.git

diff --git a/src/Language.h b/src/Language.h
index ee3828cc60..ad8badffbc 100644
--- a/src/Language.h
+++ b/src/Language.h
@@ -15,12 +15,11 @@
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
-#include "BufferParams.h"
-
 #include "support/docstring.h"
 #include "support/trivstring.h"
 
 #include <map>
+#include <set>
 #include <vector>
 
 
@@ -28,6 +27,7 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+class BufferParams;
 class Encoding;
 class Lexer;
 
@@ -45,14 +45,18 @@ public:
 	std::string const polyglossia() const { return polyglossia_name_; }
 	/// polyglossia language options
 	std::string const polyglossiaOpts() const { return polyglossia_opts_; }
+	/// polyglossia language options
+	std::string const xindy() const { return xindy_; }
 	/// Is this language only supported by polyglossia?
 	bool isPolyglossiaExclusive() const;
 	/// Is this language only supported by babel?
 	bool isBabelExclusive() const;
 	/// quotation marks style
 	std::string const quoteStyle() const { return quote_style_; }
+	/// active characters
+	std::string const activeChars() const { return active_chars_; }
 	/// requirement (package, function)
-	std::string const requires() const { return requires_; }
+	std::string const required() const { return required_; }
 	/// provides feature
 	std::string const provides() const { return provides_; }
 	/// translatable GUI name
@@ -90,6 +94,8 @@ public:
 	std::string fontenc(BufferParams const &) const;
 	/// Return the localized date formats (long, medium, short format)
 	std::string dateFormat(size_t i) const;
+	/// Return the localized decimal separator
+	docstring decimalSeparator() const;
 	/// This language corresponds to a translation of the GUI
 	bool hasGuiSupport() const { return has_gui_support_; }
 	///
@@ -112,9 +118,13 @@ private:
 	///
 	trivstring polyglossia_opts_;
 	///
+	trivstring xindy_;
+	///
 	trivstring quote_style_;
 	///
-	trivstring requires_;
+	trivstring active_chars_;
+	///
+	trivstring required_;
 	///
 	trivstring provides_;
 	///
@@ -140,8 +150,6 @@ private:
 	///
 	bool internal_enc_;
 	///
-	bool as_babel_options_;
-	///
 	bool has_gui_support_;
 	///
 	bool word_wrap_;
@@ -170,19 +178,22 @@ public:
 	///
 	Language const * getFromCode(std::string const & code) const;
 	///
+	Language const * getFromCode(std::string const & code,
+			std::set<Language const *> const & tryfirst) const;
+	///
 	void readLayoutTranslations(support::FileName const & filename);
 	///
 	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:
 	///
-	LanguageList languagelist;
+	LanguageList languagelist_;
 };
 
 /// Global singleton instance.