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

diff --git a/src/encoding.h b/src/encoding.h
index d8059d68ec..830a05c3c4 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -1,42 +1,85 @@
 // -*- 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
 
-#include "LString.h"
-#include "lyxrc.h"
+#include <map>
+#include <string>
+
 
+///
 typedef unsigned short int Uchar;
 
+///
 class Encoding {
 public:
 	///
-	enum Letter_Form {
-		FORM_ISOLATED,
-		FORM_FINAL,
-		FORM_INITIAL,
-		FORM_MEDIAL
-	};
+	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];
+	}
 	///
-	Encoding(string const & l, Uchar const * e)
-		: LatexName_(l) , encoding_table(e) {}
+	std::string const & Name() const {
+		return Name_;
+	}
 	///
-	string const & LatexName() const {
+	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 {
+		///
+		FORM_ISOLATED,
+		///
+		FORM_FINAL,
+		///
+		FORM_INITIAL,
+		///
+		FORM_MEDIAL
+	};
 	///
 	static
 	bool IsComposeChar_hebrew(unsigned char c);
@@ -45,67 +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;
-
-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