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 5e75174820de5b1ee5f2600235d467bd80cc264c..77a0a0a43267a72504fcbe7882458428f5d4facb 100644 (file)
--- a/src/language.h
+++ b/src/language.h
@@ -19,6 +19,10 @@
 #include <string>
 
 
+namespace lyx {
+
+namespace support { class FileName; }
+
 class Encoding;
 
 ///
@@ -28,10 +32,10 @@ public:
        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)
+                 encodingStr_(es), encoding_(e), code_(c), latex_options_(o)
                {}
        ///
        std::string const & lang() const { return lang_; }
@@ -40,10 +44,12 @@ public:
        ///
        std::string const & display() const { return display_; }
        ///
-       bool RightToLeft() const { return rightToLeft_; }
+       bool rightToLeft() const { return rightToLeft_; }
        ///
        Encoding const * encoding() const { return encoding_; }
        ///
+       std::string const & encodingStr() const { return encodingStr_; }
+       ///
        std::string const & code() const { return code_; }
        ///
        std::string const & latex_options() const { return latex_options_; }
@@ -57,6 +63,8 @@ private:
        ///
        bool rightToLeft_;
        ///
+       std::string encodingStr_;
+       ///
        Encoding const * encoding_;
        ///
        std::string code_;
@@ -74,7 +82,7 @@ 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;
        ///
@@ -96,4 +104,7 @@ extern Language const * english_language;
 extern Language const * ignore_language;
 extern Language const * latex_language;
 
+
+} // namespace lyx
+
 #endif