hopefully fix tex2lyx linking.

[lyx.git] / src / encoding.h

diff --git a/src/encoding.h b/src/encoding.h
index 85f96147574e01a8587144da24741cc52db60d75..cce42157aa27003685985de4d6c0c1f354cd1f0a 100644 (file)
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -1,26 +1,24 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 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"
+#include "support/types.h"
 
-///
-typedef unsigned short int Uchar;
+namespace lyx {
 
 ///
 class Encoding {
@@ -28,48 +26,38 @@ 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;
-
 class Encodings {
 public:
        ///
-       typedef std::map<string, Encoding> EncodingList;
+       typedef std::map<std::string, Encoding> EncodingList;
        ///
        Encodings();
        ///
-       void read(string const & filename);
-       ///
-       Encoding const * getEncoding(string const & encoding) const;
-       ///
-       Encoding const * symbol_encoding() {
-               return &symbol_encoding_;
-       }
+       void read(std::string const & filename);
+       /// 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 {
@@ -83,25 +71,24 @@ public:
                FORM_MEDIAL
        };
        ///
-       static
-       bool IsComposeChar_hebrew(unsigned char c);
+       static bool isComposeChar_hebrew(char_type c);
+       ///
+       static bool isComposeChar_arabic(char_type c);
        ///
-       static
-       bool IsComposeChar_arabic(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:
        ///
        EncodingList encodinglist;
-       ///
-       Encoding symbol_encoding_;
 };
 
 extern Encodings encodings;
 
+
+} // namespace lyx
+
 #endif