X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.h;h=ad8badffbc363ac05aaddd0eaf29b05b19da51d2;hb=b08a653f3549e08fffc5318c87da305651ecc197;hp=1dabbacaec4c011e44093c1d09f37ea54b9fcf03;hpb=c349472d35bc13c17fd9c7f9dfe6c1b3694bdcb4;p=lyx.git

diff --git a/src/Language.h b/src/Language.h
index 1dabbacaec..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;
 
@@ -36,7 +36,7 @@ class Language {
 public:
 	///
 	Language() : rightToLeft_(false), encoding_(0), internal_enc_(false),
-				 has_gui_support_(false) {}
+				 has_gui_support_(false), word_wrap_(true) {}
 	/// LyX language name
 	std::string const lang() const { return lang_; }
 	/// Babel language name
@@ -45,20 +45,26 @@ 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
 	std::string const display() const { return display_; }
 	/// is this a RTL language?
 	bool rightToLeft() const { return rightToLeft_; }
+	/// shall text be wrapped at word boundary ?
+	bool wordWrap() const { return word_wrap_; }
 	/**
 	 * Translate a string from the layout files that appears in the output.
 	 * It takes the translations from lib/layouttranslations instead of
@@ -88,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_; }
 	///
@@ -110,9 +118,13 @@ private:
 	///
 	trivstring polyglossia_opts_;
 	///
+	trivstring xindy_;
+	///
 	trivstring quote_style_;
 	///
-	trivstring requires_;
+	trivstring active_chars_;
+	///
+	trivstring required_;
 	///
 	trivstring provides_;
 	///
@@ -138,10 +150,10 @@ private:
 	///
 	bool internal_enc_;
 	///
-	bool as_babel_options_;
-	///
 	bool has_gui_support_;
 	///
+	bool word_wrap_;
+	///
 	TranslationMap layoutTranslations_;
 };
 
@@ -166,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.