Improve results of 'upcase' for characters with title-case

* lisp/international/characters.el (standard-case-table): Swap the
order of some lines, to have 'upcase' return the upper-case
variant, not the title-case, for some characters whose lower-case
map to the same codepoints.  (Bug#23833)

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 371f6987bf2bec68d47ab2f1366c3a95e915e8cd..ad9432c5cc67ee0566c4f7ea5176a1e090bfb098 100644 (file)
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -623,16 +623,21 @@ with L, LRE, or LRO Unicode bidi character type.")
   (set-case-syntax-pair ?Ʊ ?ʊ tbl)
   (set-case-syntax-pair ?Ʋ ?ʋ tbl)
   (set-case-syntax-pair ?Ʒ ?ʒ tbl)
-  (set-case-syntax-pair ?DŽ ?dž tbl)
+  ;; The order of the next 6 lines is important, since we want
+  ;; upcase of dž return DŽ, not Dž, and the same for the rest.
   (set-case-syntax-pair ?Dž ?dž tbl)
-  (set-case-syntax-pair ?Ç\87 ?Ç\89 tbl)
+  (set-case-syntax-pair ?Ç\84 ?Ç\86 tbl)
   (set-case-syntax-pair ?Lj ?lj tbl)
-  (set-case-syntax-pair ?Ç\8a ?Ç\8c tbl)
+  (set-case-syntax-pair ?Ç\87 ?Ç\89 tbl)
   (set-case-syntax-pair ?Nj ?nj tbl)
+  (set-case-syntax-pair ?NJ ?nj tbl)
 
   ;; 01F0; F; 006A 030C; # LATIN SMALL LETTER J WITH CARON
-  (set-case-syntax-pair ?DZ ?dz tbl)
+
+  ;; The order of the next two lines is important, since we want
+  ;; upcase of dz return DZ, not Dz.
   (set-case-syntax-pair ?Dz ?dz tbl)
+  (set-case-syntax-pair ?DZ ?dz tbl)
   (set-case-syntax-pair ?Ƕ ?ƕ tbl)
   (set-case-syntax-pair ?Ƿ ?ƿ tbl)
   (set-case-syntax-pair ?Ⱥ ?ⱥ tbl)