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

[lyx.git] / src / encoding.h

diff --git a/src/encoding.h b/src/encoding.h
index 6821f93dba6d2abf9c39669969311a1f265fafa7..d83211adce3bd1ac81f411e566c013b113e69613 100644 (file)
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -20,6 +20,8 @@
 
 namespace lyx {
 
+namespace support { class FileName; }
+
 ///
 class Encoding {
 public:
@@ -46,8 +48,6 @@ private:
        std::string iconvName_;
 };
 
-extern Encoding symbol_encoding;
-
 class Encodings {
 public:
        ///
@@ -55,11 +55,11 @@ public:
        ///
        Encodings();
        ///
-       void read(std::string const & filename);
-       ///
-       Encoding const * getEncoding(std::string const & encoding) const;
-       ///
-       Encoding const * symbol_encoding() { return &symbol_encoding_; }
+       void read(support::FileName const & filename);
+       /// Get encoding from LyX name \p name
+       Encoding const * getFromLyXName(std::string const & name) const;
+       /// Get encoding from LaTeX name \p name
+       Encoding const * getFromLaTeXName(std::string const & name) const;
 
        ///
        enum Letter_Form {
@@ -86,8 +86,6 @@ public:
 private:
        ///
        EncodingList encodinglist;
-       ///
-       Encoding symbol_encoding_;
 };
 
 extern Encodings encodings;