Encode {} as ≤≥.

Enhance koi7 to unicode table.

Author: sergev

encoding.cpp

@@ -63,13 +63,6 @@ static const unsigned short gost_to_unicode_lat[256] = {
     /* 130-137 */ 0x7c,   0x2015, 0x5f,   0x21,   0x22,   0x042a, 0xb0,   0x2032,
 };
 
-static const char *koi7_to_utf8[32] = {
-    /* 0140 */ "Ю", "А", "Б", "Ц", "Д", "Е", "Ф", "Г",
-    /* 0150 */ "Х", "И", "Й", "К", "Л", "М", "Н", "О",
-    /* 0160 */ "П", "Я", "Р", "С", "Т", "У", "Ж", "В",
-    /* 0170 */ "Ь", "Ы", "З", "Ш", "Э", "Щ", "Ч", "Ъ",
-};
-
 //
 // Convert character in GOST-10859 encoding to Unicode.
 //
@@ -172,21 +165,7 @@ unsigned utf8_to_unicode(const char **p)
 //
 void iso_putc(unsigned ch, std::ostream &out)
 {
-    if (ch >= ' ' && ch < 0140) {
-        // Latin
-        out << (char)ch;
-    } else if (ch >= 0140 && ch < 0200) {
-        // Cyrillic
-        out << koi7_to_utf8[ch - 0140];
-    } else if (ch == '\5') {
-        out << "Ъ";
-    } else if (ch == '\1') {
-        // Special
-        out << "\n•";
-    } else {
-        // Non-text
-        out << '`';
-    }
+    utf8_putc(koi7_to_unicode[ch], out);
 }
 
 //
@@ -213,7 +192,7 @@ unsigned char unicode_to_koi7(unsigned short val)
         /* `abcdefg */ 0,    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, //  ABCDEFG
         /* hijklmno */ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, // HIJKLMNO
         /* pqrstuvw */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, // PQRSTUVW
-        /* xyz{|}~  */ 0x58, 0x59, 0x5a, 0x5b, 0x5e, 0x5d, 0x1f, 0,    // XYZ[|]¬
+        /* xyz{|}~  */ 0x58, 0x59, 0x5a, 0x0e, 0x5e, 0x0f, 0x1f, 0,    // XYZ≤|≥¬
         /* 80 - 87 */  0,    0,    0,    0,    0,    0,    0,    0,
         /* 88 - 8f */  0,    0,    0,    0,    0,    0,    0,    0,
         /* 90 - 97 */  0,    0,    0,    0,    0,    0,    0,    0,
@@ -692,21 +671,24 @@ const unsigned char text_to_gost[64] = {
 };
 
 const unsigned short koi7_to_unicode[128] = {
-    0x00,   0x01,   0x02,   0x03,   0x04,   0x042a, 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,
-
-    0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, 0x0425, 0x0418, 0x0419,
-    0x041a, 0x041b, 0x041c, 0x041d, 0x041e, 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423,
-    0x0416, 0x0412, 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x7f,
+    // clang-format off
+    /*      Ъ×  */ 0,      0x01,   0x02,   0x03,   0x04,   0x042a, 0x06,   0xd7,
+    /*       ≤≥ */ 0x08,   0x09,   0x0a,   0x0b,   0x0c,   0x0d,   0x2264, 0x2265,
+    /* ‘    ―↑⏨ */ 0x2018, 0x11,   0x12,   0x13,   0x14,   0x2015, 0x2191, 0x23E8,
+    /* ≠°÷’⊃≡∨¬ */ 0x2260, 0xb0,   0xf7,   0x2019, 0x2283, 0x2261, 0x2228, 0xac,
+    /*  !"#$%&' */ 0x20,   0x21,   0x22,   0x23,   0x24,   0x25,   0x26,   0x27,
+    /* ()*+,-./ */ 0x28,   0x29,   0x2a,   0x2b,   0x2c,   0x2d,   0x2e,   0x2f,
+    /* 01234567 */ 0x30,   0x31,   0x32,   0x33,   0x34,   0x35,   0x36,   0x37,
+    /* 89:;<=>? */ 0x38,   0x39,   0x3a,   0x3b,   0x3c,   0x3d,   0x3e,   0x3f,
+    /* @ABCDEFG */ 0x40,   0x41,   0x42,   0x43,   0x44,   0x45,   0x46,   0x47,
+    /* HIJKLMNO */ 0x48,   0x49,   0x4a,   0x4b,   0x4c,   0x4d,   0x4e,   0x4f,
+    /* PQRSTUVW */ 0x50,   0x51,   0x52,   0x53,   0x54,   0x55,   0x56,   0x57,
+    /* XYZ[\]^_ */ 0x58,   0x59,   0x5a,   0x5b,   0x5c,   0x5d,   0x5e,   0x5f,
+    /* ЮAБЦДEФГ */ 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
+    /* XИЙKЛMHO */ 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e,
+    /* ПЯPCTYЖB */ 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
+    /* ЬЫЗШЭЩЧ  */ 0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x7f,
+    // clang-format on
 };
 
 //