X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fencoding.C;h=982d4d2c386d33550da957d07c5f08d949a5bd21;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=3760f859636a50ddedb45a982b8617c39361c43d;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git diff --git a/src/encoding.C b/src/encoding.C index 3760f85963..982d4d2c38 100644 --- a/src/encoding.C +++ b/src/encoding.C @@ -13,93 +13,27 @@ #include #include "encoding.h" -#include "lyxlex.h" + #include "debug.h" +#include "lyxlex.h" +#include "lyxrc.h" + + +namespace lyx { #ifndef CXX_GLOBAL_CSTD using std::strtol; #endif using std::endl; +using std::string; + Encodings encodings; namespace { -Uchar tab_iso8859_1[256] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, - 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, - 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, - 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, - 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, - 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, - 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, - 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, - 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, - 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, - 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, - 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff -}; - -#ifdef USE_UNICODE_FOR_SYMBOLS -Uchar tab_symbol[256] = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, - - 0x0020, 0x0021, 0x2200, 0x0023, 0x2203, 0x0025, 0x0026, 0x220b, - 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, - - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - -// 0x2245, 0x0391, 0x0392, 0x03a7, 0x0394, 0x0395, 0x03a6, 0x0393, -// 0x0397, 0x0399, 0x03d1, 0x039a, 0x039b, 0x039c, 0x039d, 0x039f, - -// 0x03a0, 0x0398, 0x03a1, 0x03a3, 0x03a4, 0x03a5, 0x03c2, 0x03a9, -// 0x039e, 0x03a8, 0x0396, 0x005b, 0x2234, 0x005d, 0x22a5, 0xffff, - 0x2245, 0x0041, 0x0042, 0x0058, 0x0394, 0x0045, 0x03c2, 0x03a9, - 0x0048, 0x0049, 0x03d1, 0x004b, 0x039b, 0x004d, 0x004e, 0x004f, - - 0x03a0, 0x0398, 0x0050, 0x03a3, 0x0054, 0x0059, 0x03c2, 0x03a9, - 0x039e, 0x03a8, 0x005a, 0x005b, 0x2234, 0x005d, 0x22a5, 0xffff, - - 0xffff, 0x03b1, 0x03b2, 0x03c7, 0x03b4, 0x03b5, 0x03d5, 0x03b3, - 0x03b7, 0x03b9, 0x03c6, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03bf, - - 0x03c0, 0x03b8, 0x03c1, 0x03c3, 0x03c4, 0x03c5, 0x03d6, 0x03c9, - 0x03be, 0x03c8, 0x03b6, 0x007b, 0x007c, 0x007d, 0x007e, 0xffff, - - 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, - 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, - - 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, - 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, - - 0xffff, 0x03d2, 0x2032, 0x2264, 0x2215, 0x221e, 0xffff, 0x2663, - 0x2666, 0x2665, 0x2660, 0x2194, 0x2190, 0x2191, 0x2192, 0x2193, - - 0x00b0, 0x00b1, 0x2033, 0x2265, 0x00d7, 0x221d, 0x2202, 0x2022, - 0x00f7, 0x2260, 0x2261, 0x2248, 0x22ef, 0xffff, 0xffff, 0x21b5, - - 0x2135, 0x2111, 0x211c, 0x2118, 0x2297, 0x2295, 0x2205, 0x2229, - 0x222a, 0x2283, 0x2287, 0x2284, 0x2282, 0x2286, 0x2208, 0x2209, - - 0x2220, 0x2207, 0x00ae, 0x00a9, 0x2122, 0x220f, 0x221a, 0x22c5, - 0x00ac, 0x2227, 0x2228, 0x21d4, 0x21d0, 0x21d1, 0x21d2, 0x21d3, - - 0x2662, 0x2329, 0x00ae, 0x00a9, 0x2122, 0x2211, 0xffff, 0xffff, - 0xffff, 0x2308, 0xffff, 0x230a, 0xffff, 0xffff, 0xffff, 0xffff, - - 0xffff, 0x232a, 0x222b, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, - 0xffff, 0x2309, 0xffff, 0x230b, 0xffff, 0xffff, 0xffff, 0xffff -}; -#endif - - -unsigned char arabic_table2[63][4] = { +char_type arabic_table2[63][4] = { {0x41, 0x41, 0x41, 0x41}, // 0xc1 = hamza {0x42, 0xa1, 0x42, 0xa1}, // 0xc2 = ligature madda on alef {0x43, 0xa2, 0x43, 0xa2}, // 0xc3 = ligature hamza on alef @@ -169,7 +103,7 @@ unsigned char arabic_table2[63][4] = { }; -unsigned char arabic_table[63][2] = { +char_type arabic_table[63][2] = { {0xc1, 0xc1}, // 0xc1 = hamza {0xc2, 0xc2}, // 0xc2 = ligature madda on alef {0xc3, 0xc3}, // 0xc3 = ligature hamza on alef @@ -239,12 +173,13 @@ unsigned char arabic_table[63][2] = { }; -unsigned char const arabic_start = 0xc1; +char_type const arabic_start = 0xc1; } // namespace anon -bool Encodings::IsComposeChar_hebrew(unsigned char c) + +bool Encodings::isComposeChar_hebrew(char_type c) { return c <= 0xd2 && c >= 0xc0 && c != 0xce && c != 0xd0; @@ -255,7 +190,7 @@ bool Encodings::IsComposeChar_hebrew(unsigned char c) // they are hamza, alef_madda, alef_hamza, waw_hamza, alef_hamza_under, // alef, tah_marbota, dal, thal, rah, zai, wow, alef_maksoura -bool Encodings::is_arabic_special(unsigned char c) +bool Encodings::is_arabic_special(char_type c) { return (c >= 0xc1 && c <= 0xc5) || c == 0xc7 || c == 0xc9 || @@ -264,19 +199,19 @@ bool Encodings::is_arabic_special(unsigned char c) c == 0xe9; } -bool Encodings::IsComposeChar_arabic(unsigned char c) +bool Encodings::isComposeChar_arabic(char_type c) { return c >= 0xeb && c <= 0xf2; } -bool Encodings::is_arabic(unsigned char c) +bool Encodings::is_arabic(char_type c) { return c >= arabic_start && arabic_table[c-arabic_start][0]; } -unsigned char Encodings::TransformChar(unsigned char c, +char_type Encodings::transformChar(char_type c, Encodings::Letter_Form form) { if (!is_arabic(c)) @@ -289,24 +224,47 @@ unsigned char Encodings::TransformChar(unsigned char c, } -Encoding const * Encodings::getEncoding(string const & encoding) const +Encoding const * Encodings::getFromLyXName(string const & name) const { - EncodingList::const_iterator it = encodinglist.find(encoding); + EncodingList::const_iterator it = encodinglist.find(name); if (it != encodinglist.end()) return &it->second; else return 0; } + +namespace { + +class LaTeXNamesEqual : public std::unary_function, bool> { + public: + LaTeXNamesEqual(string const & LaTeXName) + : LaTeXName_(LaTeXName) {} + bool operator()(std::pair const & encoding) const + { + return encoding.second.latexName() == LaTeXName_; + } + private: + string LaTeXName_; +}; + +} // namespace anon + + +Encoding const * Encodings::getFromLaTeXName(string const & name) const +{ + EncodingList::const_iterator const it = + std::find_if(encodinglist.begin(), encodinglist.end(), + LaTeXNamesEqual(name)); + if (it != encodinglist.end()) + return &it->second; + else + return 0; +} + + Encodings::Encodings() { - encodinglist["iso8859-1"] = Encoding("iso8859-1", "latin1", tab_iso8859_1); - symbol_encoding_ = -#ifdef USE_UNICODE_FOR_SYMBOLS - Encoding("symbol", "", tab_symbol); -#else - Encoding("symbol", "", tab_iso8859_1); -#endif } void Encodings::read(string const & filename) @@ -332,14 +290,10 @@ void Encodings::read(string const & filename) string const name = lex.getString(); lex.next(); string const latexname = lex.getString(); - lyxerr[Debug::INIT] << "Reading encoding " << name << endl; - Uchar table[256]; - for (unsigned int i = 0; i < 256; ++i) { - lex.next(); - string const tmp = lex.getString(); - table[i] = ::strtol(tmp.c_str(), 0 , 16); - } - encodinglist[name] = Encoding(name, latexname, table); + lex.next(); + string const iconvname = lex.getString(); + lyxerr[Debug::INFO] << "Reading encoding " << name << endl; + encodinglist[name] = Encoding(name, latexname, iconvname); if (lex.lex() != et_end) lex.printError("Encodings::read: " "missing end"); @@ -357,3 +311,6 @@ void Encodings::read(string const & filename) } } } + + +} // namespace lyx