X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fencoding.h;h=42ade25ab7be83616698c9eaa051cafced8d5aef;hb=15271fce0705ea5611647b5b3d1e993362ff5284;hp=d4c16709338776b8fcd4d60ac805e9f8af2f4b04;hpb=4b2a999762c83627476428e595d3c1e3704a3da0;p=lyx.git

diff --git a/src/encoding.h b/src/encoding.h
index d4c1670933..42ade25ab7 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -19,20 +19,24 @@
 #include "LString.h"
 #include "lyxrc.h"
 
+///
 typedef unsigned short int Uchar;
 
+///
 class Encoding {
 public:
 	///
-	enum Letter_Form {
-		FORM_ISOLATED,
-		FORM_FINAL,
-		FORM_INITIAL,
-		FORM_MEDIAL
-	};
+	Encoding() {}
 	///
-	Encoding(string const & l, Uchar const * e)
-		: LatexName_(l) , encoding_table(e) {}
+	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];
+	}
+	///
+	string const & Name() const {
+		return Name_;
+	}
 	///
 	string const & LatexName() const {
 		return LatexName_;
@@ -41,6 +45,43 @@ public:
 	Uchar ucs(unsigned char c) const {
 		return encoding_table[c];
 	}
+private:
+	///
+	string Name_;
+	///
+	string LatexName_;
+	///
+	Uchar encoding_table[256];
+};
+
+extern Encoding symbol_encoding;
+
+class Encodings {
+public:
+	///
+	typedef std::map<string, Encoding> EncodingList;
+	///
+	Encodings();
+	///
+	void read(string const & filename);
+	///
+	Encoding const * getEncoding(string const & encoding) const;
+	///
+	Encoding const * symbol_encoding() {
+		return &symbol_encoding_;
+	}
+
+	///
+	enum Letter_Form {
+		///
+		FORM_ISOLATED,
+		///
+		FORM_FINAL,
+		///
+		FORM_INITIAL,
+		///
+		FORM_MEDIAL
+	};
 	///
 	static
 	bool IsComposeChar_hebrew(unsigned char c);
@@ -53,63 +94,14 @@ public:
 	///
 	static
 	unsigned char TransformChar(unsigned char c, Letter_Form form);
+
 private:
 	///
-	string LatexName_;
+	EncodingList encodinglist;
 	///
-	Uchar const * encoding_table;
+	Encoding symbol_encoding_;
 };
 
-
-extern Encoding iso8859_1;
-extern Encoding iso8859_2;
-extern Encoding iso8859_3;
-extern Encoding iso8859_4;
-extern Encoding iso8859_6;
-extern Encoding iso8859_7;
-extern Encoding iso8859_9;
-extern Encoding cp1255;
-extern Encoding koi8;
-extern Encoding symbol_encoding;
-
-inline
-bool Encoding::IsComposeChar_hebrew(unsigned char c)
-{
-	return c <= 0xd2 && c >= 0xc0 &&
-		c != 0xce && c != 0xd0;
-}
-
-
-inline
-bool Encoding::IsComposeChar_arabic(unsigned char c)
-{
-	return c >= 0xeb && c <= 0xf2;
-}
-
-
-extern unsigned char arabic_table[][2];
-extern unsigned char arabic_table2[][4];
-unsigned char const arabic_start = 0xc1;
-
-
-inline
-bool Encoding::is_arabic(unsigned char c)
-{
-	return c >= arabic_start && arabic_table[c-arabic_start][0];
-}
-
-
-inline
-unsigned char Encoding::TransformChar(unsigned char c, Encoding::Letter_Form form)
-{
-	if (!is_arabic(c))
-		return c;
-
-	if (lyxrc.font_norm == "iso10646-1")
-		return arabic_table2[c-arabic_start][form];
-	else
-		return arabic_table[c-arabic_start][form >> 1];
-}
-
+extern Encodings encodings;
 
 #endif