X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fencoding.C;h=9d12136428ad2f54bc2efd852da2797cd5bb2442;hb=98c966c64594611e469313314abd1e59524adb4a;hp=f28aad4d84a4a16e652b42791acd46a6f41734cd;hpb=6396f9a204bfa7a154729dfaa17dc7abc619f7d0;p=lyx.git

diff --git a/src/encoding.C b/src/encoding.C
index f28aad4d84..9d12136428 100644
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -74,7 +74,7 @@ Uchar tab_symbol[256] = {
 
    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,
 
@@ -113,16 +113,16 @@ unsigned char arabic_table2[63][4] = {
 	{0x4e, 0xc0, 0xbe, 0xbf}, // 0xce = khaa
 	{0x4f, 0xa6, 0xa6, 0xa6}, // 0xcf = dal
 
-	{0x50, 0xa7, 0xa7, 0xa7}, // 0xd0 = thal 
-	{0x51, 0xa8, 0xa8, 0xa8}, // 0xd1 = ra   
-	{0x52, 0xa9, 0xa9, 0xa9}, // 0xd2 = zain 
-	{0x53, 0xc3, 0xc1, 0xc2}, // 0xd3 = seen 
+	{0x50, 0xa7, 0xa7, 0xa7}, // 0xd0 = thal
+	{0x51, 0xa8, 0xa8, 0xa8}, // 0xd1 = ra
+	{0x52, 0xa9, 0xa9, 0xa9}, // 0xd2 = zain
+	{0x53, 0xc3, 0xc1, 0xc2}, // 0xd3 = seen
 	{0x54, 0xc6, 0xc4, 0xc5}, // 0xd4 = sheen
-	{0x55, 0xc9, 0xc7, 0xc8}, // 0xd5 = sad  
-	{0x56, 0xcc, 0xca, 0xcb}, // 0xd6 = dad  
-	{0x57, 0xcf, 0xcd, 0xce}, // 0xd7 = tah  
-	{0x58, 0xd2, 0xd0, 0xd1}, // 0xd8 = zah  
-	{0x59, 0xd5, 0xd3, 0xd4}, // 0xd9 = ain  
+	{0x55, 0xc9, 0xc7, 0xc8}, // 0xd5 = sad
+	{0x56, 0xcc, 0xca, 0xcb}, // 0xd6 = dad
+	{0x57, 0xcf, 0xcd, 0xce}, // 0xd7 = tah
+	{0x58, 0xd2, 0xd0, 0xd1}, // 0xd8 = zah
+	{0x59, 0xd5, 0xd3, 0xd4}, // 0xd9 = ain
 	{0x5a, 0xd8, 0xd6, 0xd7}, // 0xda = ghain
 	{0,0,0,0}, // 0xdb
 	{0,0,0,0}, // 0xdc
@@ -130,17 +130,17 @@ unsigned char arabic_table2[63][4] = {
 	{0,0,0,0}, // 0xde
 	{0,0,0,0}, // 0xdf
 
-	{0,0,0,0}, // 0xe0               
-	{0x61, 0xdb, 0xd9, 0xda}, // 0xe1 = fa          
-	{0x62, 0xde, 0xdc, 0xdd}, // 0xe2 = qaf         
-	{0x63, 0xe1, 0xdf, 0xe0}, // 0xe3 = kaf         
-	{0x64, 0xe4, 0xe2, 0xe3}, // 0xe4 = lam         
-	{0x65, 0xe7, 0xe5, 0xe6}, // 0xe5 = meem        
-	{0x66, 0xea, 0xe8, 0xe9}, // 0xe6 = noon        
-	{0x67, 0xed, 0xeb, 0xec}, // 0xe7 = ha          
-	{0x68, 0xaa, 0xaa, 0xaa}, // 0xe8 = waw         
+	{0,0,0,0}, // 0xe0
+	{0x61, 0xdb, 0xd9, 0xda}, // 0xe1 = fa
+	{0x62, 0xde, 0xdc, 0xdd}, // 0xe2 = qaf
+	{0x63, 0xe1, 0xdf, 0xe0}, // 0xe3 = kaf
+	{0x64, 0xe4, 0xe2, 0xe3}, // 0xe4 = lam
+	{0x65, 0xe7, 0xe5, 0xe6}, // 0xe5 = meem
+	{0x66, 0xea, 0xe8, 0xe9}, // 0xe6 = noon
+	{0x67, 0xed, 0xeb, 0xec}, // 0xe7 = ha
+	{0x68, 0xaa, 0xaa, 0xaa}, // 0xe8 = waw
 	{0x69, 0xab, 0xab, 0xab}, // 0xe9 = alef maksura
-	{0x6a, 0xf0, 0xee, 0xef}, // 0xea = ya   
+	{0x6a, 0xf0, 0xee, 0xef}, // 0xea = ya
 	{0x6b, 0x6b, 0x6b, 0x6b}, // 0xeb = fathatan
 	{0x6c, 0x6c, 0x6c, 0x6c}, // 0xec = dammatan
 	{0x6d, 0x6d, 0x6d, 0x6d}, // 0xed = kasratan
@@ -266,7 +266,7 @@ unsigned char Encodings::TransformChar(unsigned char c,
 	if (!is_arabic(c))
 		return c;
 
-	if (lyxrc.font_norm == "iso10646-1")
+	if (lyxrc.font_norm_type == LyXRC::ISO_10646_1)
 		return arabic_table2[c-arabic_start][form];
 	else
 		return arabic_table[c-arabic_start][form >> 1];
@@ -275,7 +275,7 @@ unsigned char Encodings::TransformChar(unsigned char c,
 
 Encoding const * Encodings::getEncoding(string const & encoding) const
 {
-       	EncodingList::const_iterator it = encodinglist.find(encoding);
+	EncodingList::const_iterator it = encodinglist.find(encoding);
 	if (it != encodinglist.end())
 		return &it->second;
 	else
@@ -285,7 +285,7 @@ Encoding const * Encodings::getEncoding(string const & encoding) const
 Encodings::Encodings()
 {
 	encodinglist["iso8859-1"] = Encoding("iso8859-1", "latin1", tab_iso8859_1);
-	symbol_encoding_ = 
+	symbol_encoding_ =
 #ifdef USE_UNICODE_FOR_SYMBOLS
 		Encoding("symbol", "", tab_symbol);
 #else
@@ -308,19 +308,19 @@ void Encodings::read(string const & filename)
 
 	LyXLex lex(encodingtags, et_last - 1);
 	lex.setFile(filename);
-	while (lex.IsOK()) {
+	while (lex.isOK()) {
 		switch (lex.lex()) {
 		case et_encoding:
 		{
 			lex.next();
-			string name = lex.GetString();
+			string const name = lex.getString();
 			lex.next();
-			string latexname = lex.GetString();
+			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 tmp = lex.GetString();
+				string const tmp = lex.getString();
 				table[i] = ::strtol(tmp.c_str(), 0 , 16);
 			}
 			encodinglist[name] = Encoding(name, latexname, table);