X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fencoding.h;h=cce42157aa27003685985de4d6c0c1f354cd1f0a;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=1463126c03a3c56575f2288647ebb5d0745619c3;hpb=de6418f37765fe452f135f96dee6d49897bff215;p=lyx.git diff --git a/src/encoding.h b/src/encoding.h index 1463126c03..cce42157aa 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -26,29 +26,26 @@ public: /// Encoding() {} /// - Encoding(std::string const & n, std::string const & l, char_type const * e) - : Name_(n), LatexName_(l) + Encoding(std::string const & n, std::string const & l, + std::string const & i) + : Name_(n), LatexName_(l), iconvName_(i) { - for (int i = 0; i < 256; ++i) - encoding_table[i] = e[i]; } /// std::string const & name() const { return Name_; } /// std::string const & latexName() const { return LatexName_; } /// - char_type ucs(char_type c) const; + std::string const & iconvName() const { return iconvName_; } private: /// std::string Name_; /// std::string LatexName_; /// - char_type encoding_table[256]; + std::string iconvName_; }; -extern Encoding symbol_encoding; - class Encodings { public: /// @@ -57,10 +54,10 @@ public: Encodings(); /// void read(std::string const & filename); - /// - Encoding const * getEncoding(std::string const & encoding) const; - /// - Encoding const * symbol_encoding() { return &symbol_encoding_; } + /// 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 { @@ -87,8 +84,6 @@ public: private: /// EncodingList encodinglist; - /// - Encoding symbol_encoding_; }; extern Encodings encodings;