Allow user control on char-width of "ambiguous" characters

* src/character.c (syms_of_character) <ambiguous-width-chars>: New
char-table.

* lisp/international/characters.el (ambiguous-width-chars): Fill
the table.
(update-cjk-ambiguous-char-widths): New function.
(cjk-ambiguous-chars-are-wide): New defcustom, uses
'update-cjk-ambiguous-char-widths' as its :set function.
(use-cjk-char-width-table): Obey 'cjk-ambiguous-chars-are-wide' by
adding another child char-table for ambiguous-width characters,
where the width is set according to the option.

* lisp/language/chinese.el ("Chinese-GB", "Chinese-BIG5")
("Chinese-CNS", "Chinese-EUC-TW", "Chinese-GBK"):
* lisp/language/japanese.el ("Japanese"):
* lisp/language/korean.el ("Korean"): Add new language-info slot
'cjk-locale-symbol'.

Bug#64420

3 files changed, 7 insertions, 0 deletions

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index 26f1194aa4c..e35f3f179ad 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -111,6 +111,7 @@
 (set-language-info-alist
  "Chinese-GB" '((charset chinese-gb2312 chinese-sisheng)
                 (iso639-language . zh)
+                (cjk-locale-symbol . zh_CN)
                 (setup-function . (lambda ()
                                     (use-cjk-char-width-table 'zh_CN)))
                 (exit-function . use-default-char-width-table)
@@ -142,6 +143,7 @@
 (set-language-info-alist
  "Chinese-BIG5" '((charset chinese-big5-1 chinese-big5-2)
                   (iso639-language . zh)
+                  (cjk-locale-symbol . zh_HK)
                   (setup-function . (lambda ()
                                       (use-cjk-char-width-table 'zh_HK)))
                   (exit-function . use-default-char-width-table)
@@ -198,6 +200,7 @@
                           chinese-cns11643-5 chinese-cns11643-6
                           chinese-cns11643-7)
                  (iso639-language . zh)
+                 (cjk-locale-symbol . zh_TW)
                  (setup-function . (lambda ()
                                      (use-cjk-char-width-table 'zh_TW)))
                  (exit-function . use-default-char-width-table)
@@ -218,6 +221,7 @@ accepts Big5 for input also (which is then converted to CNS)."))
                              chinese-cns11643-5 chinese-cns11643-6
                              chinese-cns11643-7 chinese-big5-1 chinese-big5-2)
                     (iso639-language . zh)
+                    (cjk-locale-symbol . zh_TW)
                     (setup-function . (lambda ()
                                         (use-cjk-char-width-table 'zh_TW)))
                     (exit-function . use-default-char-width-table)
@@ -248,6 +252,7 @@ converted to CNS)."))
 (set-language-info-alist
  "Chinese-GBK" '((charset chinese-gbk)
                  (iso639-language . zh)
+                 (cjk-locale-symbol . zh_CN)
                  (setup-function . (lambda ()
                                      (use-cjk-char-width-table 'zh_CN)))
                  (exit-function . use-default-char-width-table)
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 681dc9d7b92..6042ebf4511 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -208,6 +208,7 @@ eucJP-ms is defined in <http://www.opengroup.or.jp/jvc/cde/appendix.html>."
  "Japanese" '((setup-function . setup-japanese-environment-internal)
               (exit-function . use-default-char-width-table)
               (iso639-language . ja)
+              (cjk-locale-symbol . ja_JP)
               (tutorial . "TUTORIAL.ja")
               (charset japanese-jisx0208
                        japanese-jisx0212 latin-jisx0201 katakana-jisx0201
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index fef5796bc4b..ede37d5d07c 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -68,6 +68,7 @@
 (set-language-info-alist
  "Korean" '((setup-function . setup-korean-environment-internal)
             (exit-function . exit-korean-environment)
+            (cjk-locale-symbol . ko_KR)
             (iso639-language . ko)
             (tutorial . "TUTORIAL.ko")
             (charset korean-ksc5601 cp949)