Use symbols ⩽ ⩾ for GOST 0116, 0117.

Author: sergev

encoding.cpp

@@ -43,7 +43,7 @@ static const unsigned short gost_to_unicode_cyr[256] = {
     /* 060-067 */ 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
     /* 070-077 */ 0x0428, 0x0429, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, 0x44,
     /* 100-107 */ 0x46,   0x47,   0x49,   0x4a,   0x4c,   0x4e,   0x51,   0x52,
-    /* 110-117 */ 0x53,   0x55,   0x56,   0x57,   0x5a,   0x203e, 0x2264, 0x2265,
+    /* 110-117 */ 0x53,   0x55,   0x56,   0x57,   0x5a,   0x203e, 0x2a7d, 0x2a7e,
     /* 120-127 */ 0x2228, 0x2227, 0x2283, 0xac,   0xf7,   0x2261, 0x25,   0x25c7,
     /* 130-137 */ 0x7c,   0x2015, 0x5f,   0x21,   0x22,   0x042a, 0xb0,   0x2032,
 };
@@ -58,7 +58,7 @@ static const unsigned short gost_to_unicode_lat[256] = {
     /* 060-067 */ 0x50,   0x43,   0x54,   0x59,   0x0424, 0x58,   0x0426, 0x0427,
     /* 070-077 */ 0x0428, 0x0429, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f, 0x44,
     /* 100-107 */ 0x46,   0x47,   0x49,   0x4a,   0x4c,   0x4e,   0x51,   0x52,
-    /* 110-117 */ 0x53,   0x55,   0x56,   0x57,   0x5a,   0x203e, 0x2264, 0x2265,
+    /* 110-117 */ 0x53,   0x55,   0x56,   0x57,   0x5a,   0x203e, 0x2a7d, 0x2a7e,
     /* 120-127 */ 0x2228, 0x2227, 0x2283, 0xac,   0xf7,   0x2261, 0x25,   0x25c7,
     /* 130-137 */ 0x7c,   0x2015, 0x5f,   0x21,   0x22,   0x042a, 0xb0,   0x2032,
 };
@@ -192,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, 0x0e, 0x5e, 0x0f, 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,
@@ -420,6 +420,14 @@ unsigned char unicode_to_koi7(unsigned short val)
             return '$';
         }
         break;
+    case 0x2a:
+        switch ((unsigned char)val) {
+        case 0x7d:
+            return '\16'; // ⩽
+        case 0x7e:
+            return '\17'; // ⩾
+        }
+        break;
     }
     return 0;
 }
@@ -673,7 +681,7 @@ const unsigned char text_to_gost[64] = {
 const unsigned short koi7_to_unicode[128] = {
     // clang-format off
     /*      Ъ×  */ 0,      0x01,   0x02,   0x03,   0x04,   0x042a, 0x06,   0xd7,
-    /*       ≤≥ */ 0x08,   0x09,   0x0a,   0x0b,   0x0c,   0x0d,   0x2264, 0x2265,
+    /*       ⩽⩾ */ 0x08,   0x09,   0x0a,   0x0b,   0x0c,   0x0d,   0x2a7d, 0x2a7e,
     /* ‘    ―↑⏨ */ 0x2018, 0x11,   0x12,   0x13,   0x14,   0x2015, 0x2191, 0x23e8,
     /* ≠°÷’⊃≡∨¬ */ 0x2260, 0xb0,   0xf7,   0x2019, 0x2283, 0x2261, 0x2228, 0xac,
     /*  !"#$%&' */ 0x20,   0x21,   0x22,   0x23,   0x24,   0x25,   0x26,   0x27,

gost10859.h

@@ -100,8 +100,8 @@
 #define GOST_W                     0113 // W
 #define GOST_Z                     0114 // Z
 #define GOST_OVERLINE              0115 // ^
-#define GOST_LESS_THAN_OR_EQUAL    0116 // ≤
-#define GOST_GREATER_THAN_OR_EQUAL 0117 // ≥
+#define GOST_LESS_THAN_OR_EQUAL    0116 // ⩽
+#define GOST_GREATER_THAN_OR_EQUAL 0117 // ⩾
 #define GOST_LOGICAL_OR            0120 // v
 #define GOST_LOGICAL_AND           0121 // &
 #define GOST_IMPLICATION           0122 // ?

tests/cosy_test.cpp

@@ -158,6 +158,8 @@ TEST(unit, utf8_to_koi7)
     EXPECT_EQ(utf8_to_koi7("×", 1), "\6");
     EXPECT_EQ(utf8_to_koi7("≤", 1), "\16");
     EXPECT_EQ(utf8_to_koi7("≥", 1), "\17");
+    EXPECT_EQ(utf8_to_koi7("⩽", 1), "\16");
+    EXPECT_EQ(utf8_to_koi7("⩾", 1), "\17");
     EXPECT_EQ(utf8_to_koi7("‘", 1), "\20");
     EXPECT_EQ(utf8_to_koi7("―", 1), "\25");
     EXPECT_EQ(utf8_to_koi7("↑", 1), "\26"); // was @

tests/session_test.cpp

@@ -938,7 +938,7 @@ _).
 *end file
 )");
     const std::string expect = R"(*EXECUTE
- Ъ×≤≥
+ Ъ×⩽⩾
  ‘―↑⏨
  ≠°÷’
  ⊃≡∨¬