X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fencoding.h;h=830a05c3c491f11cd24430441a9761d41b9644ae;hb=d1f2a9c0000f0ad038425900b001c16a56c72afa;hp=eb37f642ade3cae1c14029b2dec0cac0477cf0c6;hpb=797d87b4513088a66b17c7ac653b84e36ea80458;p=lyx.git

diff --git a/src/encoding.h b/src/encoding.h
index eb37f642ad..830a05c3c4 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -1,23 +1,21 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file encoding.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef ENCODING_H
 #define ENCODING_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include <map>
+#include <string>
 
-#include "LString.h"
-#include "lyxrc.h"
 
 ///
 typedef unsigned short int Uchar;
@@ -25,6 +23,52 @@ typedef unsigned short int Uchar;
 ///
 class Encoding {
 public:
+	///
+	Encoding() {}
+	///
+	Encoding(std::string const & n, std::string const & l, Uchar const * e)
+		: Name_(n), LatexName_(l) {
+		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_;
+	}
+	///
+	Uchar ucs(unsigned char c) const {
+		return encoding_table[c];
+	}
+private:
+	///
+	std::string Name_;
+	///
+	std::string LatexName_;
+	///
+	Uchar encoding_table[256];
+};
+
+extern Encoding symbol_encoding;
+
+class Encodings {
+public:
+	///
+	typedef std::map<std::string, Encoding> EncodingList;
+	///
+	Encodings();
+	///
+	void read(std::string const & filename);
+	///
+	Encoding const * getEncoding(std::string const & encoding) const;
+	///
+	Encoding const * symbol_encoding() {
+		return &symbol_encoding_;
+	}
+
 	///
 	enum Letter_Form {
 		///
@@ -37,17 +81,6 @@ public:
 		FORM_MEDIAL
 	};
 	///
-	Encoding(string const & l, Uchar const * e)
-		: LatexName_(l) , encoding_table(e) {}
-	///
-	string const & LatexName() const {
-		return LatexName_;
-	}
-	///
-	Uchar ucs(unsigned char c) const {
-		return encoding_table[c];
-	}
-	///
 	static
 	bool IsComposeChar_hebrew(unsigned char c);
 	///
@@ -55,36 +88,21 @@ public:
 	bool IsComposeChar_arabic(unsigned char c);
 	///
 	static
+	bool is_arabic_special(unsigned char c);
+	///
+	static
 	bool is_arabic(unsigned char c);
 	///
 	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;
+extern Encodings encodings;
 
 #endif