* Painter.h:

[lyx.git] / src / encoding.h

diff --git a/src/encoding.h b/src/encoding.h
index 832cf465170eec87c68bb457a54edb7eef6fe0ee..6821f93dba6d2abf9c39669969311a1f265fafa7 100644 (file)
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -13,11 +13,12 @@
 #ifndef ENCODING_H
 #define ENCODING_H
 
-#include "support/std_string.h"
 #include <map>
+#include <string>
 
-///
-typedef unsigned short int Uchar;
+#include "support/types.h"
+
+namespace lyx {
 
 ///
 class Encoding {
@@ -25,30 +26,24 @@ public:
        ///
        Encoding() {}
        ///
-       Encoding(string const & n, string const & l, Uchar const * e)
-               : Name_(n), LatexName_(l) {
-               for (int i = 0; i < 256; ++i)
-                       encoding_table[i] = e[i];
+       Encoding(std::string const & n, std::string const & l,
+                std::string const & i)
+               : Name_(n), LatexName_(l), iconvName_(i)
+       {
        }
        ///
-       string const & Name() const {
-               return Name_;
-       }
+       std::string const & name() const { return Name_; }
        ///
-       string const & LatexName() const {
-               return LatexName_;
-       }
+       std::string const & latexName() const { return LatexName_; }
        ///
-       Uchar ucs(unsigned char c) const {
-               return encoding_table[c];
-       }
+       std::string const & iconvName() const { return iconvName_; }
 private:
        ///
-       string Name_;
+       std::string Name_;
        ///
-       string LatexName_;
+       std::string LatexName_;
        ///
-       Uchar encoding_table[256];
+       std::string iconvName_;
 };
 
 extern Encoding symbol_encoding;
@@ -56,17 +51,15 @@ extern Encoding symbol_encoding;
 class Encodings {
 public:
        ///
-       typedef std::map<string, Encoding> EncodingList;
+       typedef std::map<std::string, Encoding> EncodingList;
        ///
        Encodings();
        ///
-       void read(string const & filename);
+       void read(std::string const & filename);
        ///
-       Encoding const * getEncoding(string const & encoding) const;
+       Encoding const * getEncoding(std::string const & encoding) const;
        ///
-       Encoding const * symbol_encoding() {
-               return &symbol_encoding_;
-       }
+       Encoding const * symbol_encoding() { return &symbol_encoding_; }
 
        ///
        enum Letter_Form {
@@ -80,20 +73,15 @@ public:
                FORM_MEDIAL
        };
        ///
-       static
-       bool IsComposeChar_hebrew(unsigned char c);
+       static bool isComposeChar_hebrew(char_type c);
        ///
-       static
-       bool IsComposeChar_arabic(unsigned char c);
+       static bool isComposeChar_arabic(char_type c);
        ///
-       static
-       bool is_arabic_special(unsigned char c);
+       static bool is_arabic_special(char_type c);
        ///
-       static
-       bool is_arabic(unsigned char c);
+       static bool is_arabic(char_type c);
        ///
-       static
-       unsigned char TransformChar(unsigned char c, Letter_Form form);
+       static char_type transformChar(char_type c, Letter_Form form);
 
 private:
        ///
@@ -104,4 +92,7 @@ private:
 
 extern Encodings encodings;
 
+
+} // namespace lyx
+
 #endif