do not create invalid .lyx files when importing \i{}, \j{}, \l{} or \L{}.

[lyx.git] / src / language.h

diff --git a/src/language.h b/src/language.h
index b0eeff259dd3c62a8ee9d2007b785d920051f2bd..77a0a0a43267a72504fcbe7882458428f5d4facb 100644 (file)
--- a/src/language.h
+++ b/src/language.h
@@ -19,48 +19,40 @@
 #include <string>
 
 
+namespace lyx {
+
+namespace support { class FileName; }
+
 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 & encodingStr() const { return encodingStr_; }
        ///
-       std::string const & code() const {
-               return code_;
-       }
+       std::string const & code() const { return code_; }
        ///
-       std::string const & latex_options() const {
-               return latex_options_;
-       }
+       std::string const & latex_options() const { return latex_options_; }
 private:
        ///
        std::string lang_;
@@ -69,7 +61,9 @@ private:
        ///
        std::string display_;
        ///
-       bool RightToLeft_;
+       bool rightToLeft_;
+       ///
+       std::string encodingStr_;
        ///
        Encoding const * encoding_;
        ///
@@ -88,21 +82,15 @@ public:
        ///
        typedef LanguageList::size_type size_type;
        ///
-       void read(std::string const & filename);
+       void read(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:
@@ -116,4 +104,7 @@ extern Language const * english_language;
 extern Language const * ignore_language;
 extern Language const * latex_language;
 
+
+} // namespace lyx
+
 #endif