tweak availability of DEC Cyrillic character set (VT520, xterm 363)

nshopik · Dec 31, 2020 · 7cc88fa · 7cc88fa
1 parent dbdff9d
commit 7cc88fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/term.h b/src/term.h
@@ -309,7 +309,7 @@ typedef enum {
   CSET_DEC_Greek_Supp		= '?' + 0x80,
   CSET_DEC_Hebrew_Supp		= '4' + 0x80,
   CSET_DEC_Turkish_Supp		= '0' + 0x80,
-  CSET_NRCS_Cyrillic		= '&' + 0x80,
+  CSET_DEC_Cyrillic		= '&' + 0x80,
   CSET_NRCS_Greek		= '>' + 0x80,
   CSET_NRCS_Hebrew		= '=' + 0x80,
   CSET_NRCS_Turkish		= '2' + 0x80,

diff --git a/src/termout.c b/src/termout.c
@@ -1461,8 +1461,8 @@ lookup_cset(ushort nrc_code, uchar csmask, bool enabled)
     {'0', 1, 1, CSET_LINEDRW},	// DEC Special Line Drawing
     {'>', 1, 1, CSET_TECH},		// DEC Technical
     {'U', 1, 1, CSET_OEM},		// OEM Codepage 437
-    {'<', 1, 1, CSET_DECSUPP},	// DEC Supplementary (VT200)
-    {CPAIR('%', '5'), 1, 1, CSET_DECSPGR},	// DEC Supplementary Graphics (VT300)
+    {'<', 1, 1, CSET_DECSUPP},	// DEC User-preferred Supplemental (VT200)
+    {CPAIR('%', '5'), 1, 1, CSET_DECSPGR},	// DEC Supplementary (VT300)
     // definitions for NRC support:
     {'4', 1, 0, CSET_NL},	// Dutch
     {'C', 1, 0, CSET_FI},	// Finnish
@@ -1489,7 +1489,7 @@ lookup_cset(ushort nrc_code, uchar csmask, bool enabled)
     {CPAIR('"', '?'), 1, 1, CSET_DEC_Greek_Supp},
     {CPAIR('"', '4'), 1, 1, CSET_DEC_Hebrew_Supp},
     {CPAIR('%', '0'), 1, 1, CSET_DEC_Turkish_Supp},
-    {CPAIR('&', '4'), 1, 0, CSET_NRCS_Cyrillic},
+    {CPAIR('&', '4'), 1, 1, CSET_DEC_Cyrillic},
     {CPAIR('"', '>'), 1, 0, CSET_NRCS_Greek},
     {CPAIR('%', '='), 1, 0, CSET_NRCS_Hebrew},
     {CPAIR('%', '2'), 1, 0, CSET_NRCS_Turkish},
@@ -4447,7 +4447,7 @@ term_do_write(const char *buf, uint len)
               wc = W(" ¡¢£¥§¨©ª«İ°±²³µ¶·¹º»¼½ı¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏĞÑÒÓÔÕÖŒØÙÚÛÜŸŞßàáâãäåæçèéêëìíîïğñòóôõöœøùúûüÿş")
                    [c - ' '];
             }
-          when CSET_NRCS_Cyrillic:
+          when CSET_DEC_Cyrillic:
             if (c >= ' ' && c <= 0x7F) {
               wc = W(" юабцдефгхийклмнопярстужвьызшэщчъЮАБЦДЕФГХИЙКЛМНОПЯРСТУЖВЬЫЗШЭЩЧЪ")
                    [c - ' '];

diff --git a/wiki/Changelog.md b/wiki/Changelog.md
@@ -2,6 +2,7 @@ Terminal features
   * Fixed width handling when selecting a non-text font (~#777).
   * Auto-narrowing: glyph double-width detection for double-letter characters (like Dz, #777).
   * Support fractional percentage for progress detection (#1074).
+  * Tweaked availability of DEC Cyrillic character set (VT520, xterm 363).
 
 ### 3.4.4 (19 December 2020) ###