xcjk2uni (7apr19)

git-svn-id: svn://tug.org/texlive/trunk@50848 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 61 insertions, 61 deletions

diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def
index e3f1e53a982..0de7603fae4 100644
--- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def
+++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni-UBig5.def
@@ -7,7 +7,7 @@
 %% xCJK2uni.dtx  (with options: `def,Bg5')
 %% xCJK2uni-sfd.def  (with options: `Bg5')
 %% 
-%%     Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com>
+%%     Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com>
 %% --------------------------------------------------------------------------
 %% 
 %%     This work may be distributed and/or modified under the
@@ -26,10 +26,10 @@
 %% 
 %% --------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: xCJK2uni.dtx 87875c2 2018-01-28 19:09:50 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $
   {Convert CJK character to Unicode.}
 \ProvidesExplFile{xCJK2uni-UBig5.def}
-  {\ExplFileDate}{0.7}{\ExplFileDescription}
+  {\ExplFileDate}{0.8}{\ExplFileDescription}
 \cs_new_nopar:cpn { CJKtu_Bg5_sfd_map:nn } #1
   {
     \cs_if_exist_use:cF
@@ -38,7 +38,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_1:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       3000 \or: FF0C \or: 3001 \or: 3002 \or: FF0E \or: 2027 \or: FF1B \or: FF1A \or:
       FF1F \or: FF01 \or: FE30 \or: 2026 \or: 2025 \or: FE50 \or: FE51 \or: FE52 \or:
       00B7 \or: FE54 \or: FE55 \or: FE56 \or: FE57 \or: FF5C \or: 2013 \or: FE31 \or:
@@ -75,7 +75,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_2:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       3023 \or: 3024 \or: 3025 \or: 3026 \or: 3027 \or: 3028 \or: 3029 \or: 5341 \or:
       5344 \or: 5345 \or: FF21 \or: FF22 \or: FF23 \or: FF24 \or: FF25 \or: FF26 \or:
       FF27 \or: FF28 \or: FF29 \or: FF2A \or: FF2B \or: FF2C \or: FF2D \or: FF2E \or:
@@ -112,7 +112,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_3:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       5915 \or: 5927 \or: 5973 \or: 5B50 \or: 5B51 \or: 5B53 \or: 5BF8 \or: 5C0F \or:
       5C22 \or: 5C38 \or: 5C71 \or: 5DDD \or: 5DE5 \or: 5DF1 \or: 5DF2 \or: 5DF3 \or:
       5DFE \or: 5E72 \or: 5EFE \or: 5F0B \or: 5F13 \or: 624D \or: 4E11 \or: 4E10 \or:
@@ -149,7 +149,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_4:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       4F0D \or: 4F10 \or: 4F11 \or: 4F0F \or: 4EF2 \or: 4EF6 \or: 4EFB \or: 4EF0 \or:
       4EF3 \or: 4EFD \or: 4F01 \or: 4F0B \or: 5149 \or: 5147 \or: 5146 \or: 5148 \or:
       5168 \or: 5171 \or: 518D \or: 51B0 \or: 5217 \or: 5211 \or: 5212 \or: 520E \or:
@@ -186,7 +186,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_5:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       59A5 \or: 5B5D \or: 5B5C \or: 5B5A \or: 5B5B \or: 5B8C \or: 5B8B \or: 5B8F \or:
       5C2C \or: 5C40 \or: 5C41 \or: 5C3F \or: 5C3E \or: 5C90 \or: 5C91 \or: 5C94 \or:
       5C8C \or: 5DEB \or: 5E0C \or: 5E8F \or: 5E87 \or: 5E8A \or: 5EF7 \or: 5F04 \or:
@@ -223,7 +223,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_6:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       5769 \or: 5761 \or: 5766 \or: 5764 \or: 577C \or: 591C \or: 5949 \or: 5947 \or:
       5948 \or: 5944 \or: 5954 \or: 59BE \or: 59BB \or: 59D4 \or: 59B9 \or: 59AE \or:
       59D1 \or: 59C6 \or: 59D0 \or: 59CD \or: 59CB \or: 59D3 \or: 59CA \or: 59AF \or:
@@ -260,7 +260,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_7:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       82AD \or: 82BD \or: 829F \or: 82B9 \or: 82B1 \or: 82AC \or: 82A5 \or: 82AF \or:
       82B8 \or: 82A3 \or: 82B0 \or: 82BE \or: 82B7 \or: 864E \or: 8671 \or: 521D \or:
       8868 \or: 8ECB \or: 8FCE \or: 8FD4 \or: 8FD1 \or: 90B5 \or: 90B8 \or: 90B1 \or:
@@ -297,7 +297,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_8:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6D3E \or: 6D36 \or: 6D1B \or: 6CF5 \or: 6D39 \or: 6D27 \or: 6D38 \or: 6D29 \or:
       6D2E \or: 6D35 \or: 6D0E \or: 6D2B \or: 70AB \or: 70BA \or: 70B3 \or: 70AC \or:
       70AF \or: 70AD \or: 70B8 \or: 70AE \or: 70A4 \or: 7230 \or: 7272 \or: 726F \or:
@@ -334,7 +334,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_9:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       57C2 \or: 57D4 \or: 57CB \or: 57C3 \or: 5809 \or: 590F \or: 5957 \or: 5958 \or:
       595A \or: 5A11 \or: 5A18 \or: 5A1C \or: 5A1F \or: 5A1B \or: 5A13 \or: 59EC \or:
       5A20 \or: 5A23 \or: 5A29 \or: 5A25 \or: 5A0C \or: 5A09 \or: 5B6B \or: 5C58 \or:
@@ -371,7 +371,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_10:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       7F94 \or: 7FC5 \or: 7FC1 \or: 8006 \or: 8018 \or: 8015 \or: 8019 \or: 8017 \or:
       803D \or: 803F \or: 80F1 \or: 8102 \or: 80F0 \or: 8105 \or: 80ED \or: 80F4 \or:
       8106 \or: 80F8 \or: 80F3 \or: 8108 \or: 80FD \or: 810A \or: 80FC \or: 80EF \or:
@@ -408,7 +408,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_11:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       5F99 \or: 5F9E \or: 5F98 \or: 5FA1 \or: 5FA0 \or: 5F9C \or: 607F \or: 60A3 \or:
       6089 \or: 60A0 \or: 60A8 \or: 60CB \or: 60B4 \or: 60E6 \or: 60BD \or: 60C5 \or:
       60BB \or: 60B5 \or: 60DC \or: 60BC \or: 60D8 \or: 60D5 \or: 60C6 \or: 60DF \or:
@@ -445,7 +445,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_12:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       83BD \or: 83AB \or: 8392 \or: 838A \or: 8393 \or: 8389 \or: 83A0 \or: 8377 \or:
       837B \or: 837C \or: 8386 \or: 83A7 \or: 8655 \or: 5F6A \or: 86C7 \or: 86C0 \or:
       86B6 \or: 86C4 \or: 86B5 \or: 86C6 \or: 86CB \or: 86B1 \or: 86AF \or: 86C9 \or:
@@ -482,7 +482,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_13:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6691 \or: 667A \or: 667E \or: 6677 \or: 66FE \or: 66FF \or: 671F \or: 671D \or:
       68FA \or: 68D5 \or: 68E0 \or: 68D8 \or: 68D7 \or: 6905 \or: 68DF \or: 68F5 \or:
       68EE \or: 68E7 \or: 68F9 \or: 68D2 \or: 68F2 \or: 68E3 \or: 68CB \or: 68CD \or:
@@ -519,7 +519,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_14:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       8DDB \or: 8DC6 \or: 8EFB \or: 8EF8 \or: 8EFC \or: 8F9C \or: 902E \or: 9035 \or:
       9031 \or: 9038 \or: 9032 \or: 9036 \or: 9102 \or: 90F5 \or: 9109 \or: 90FE \or:
       9163 \or: 9165 \or: 91CF \or: 9214 \or: 9215 \or: 9223 \or: 9209 \or: 921E \or:
@@ -556,7 +556,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_15:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       745A \or: 7455 \or: 745F \or: 745E \or: 7441 \or: 743F \or: 7459 \or: 745B \or:
       745C \or: 7576 \or: 7578 \or: 7600 \or: 75F0 \or: 7601 \or: 75F2 \or: 75F1 \or:
       75FA \or: 75FF \or: 75F4 \or: 75F3 \or: 76DE \or: 76DF \or: 775B \or: 776B \or:
@@ -593,7 +593,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_16:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       9F13 \or: 9F20 \or: 50E7 \or: 50EE \or: 50E5 \or: 50D6 \or: 50ED \or: 50DA \or:
       50D5 \or: 50CF \or: 50D1 \or: 50F1 \or: 50CE \or: 50E9 \or: 5162 \or: 51F3 \or:
       5283 \or: 5282 \or: 5331 \or: 53AD \or: 55FE \or: 5600 \or: 561B \or: 5617 \or:
@@ -630,7 +630,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_17:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       81E7 \or: 81FA \or: 8207 \or: 8214 \or: 821E \or: 824B \or: 84C9 \or: 84BF \or:
       84C6 \or: 84C4 \or: 8499 \or: 849E \or: 84B2 \or: 849C \or: 84CB \or: 84B8 \or:
       84C0 \or: 84D3 \or: 8490 \or: 84BC \or: 84D1 \or: 84CA \or: 873F \or: 871C \or:
@@ -667,7 +667,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_18:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6A13 \or: 6A0A \or: 69F3 \or: 6A02 \or: 6A05 \or: 69ED \or: 6A11 \or: 6B50 \or:
       6B4E \or: 6BA4 \or: 6BC5 \or: 6BC6 \or: 6F3F \or: 6F7C \or: 6F84 \or: 6F51 \or:
       6F66 \or: 6F54 \or: 6F86 \or: 6F6D \or: 6F5B \or: 6F78 \or: 6F6E \or: 6F8E \or:
@@ -704,7 +704,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_19:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       9AEF \or: 9B27 \or: 9B45 \or: 9B44 \or: 9B77 \or: 9B6F \or: 9D06 \or: 9D09 \or:
       9D03 \or: 9EA9 \or: 9EBE \or: 9ECE \or: 58A8 \or: 9F52 \or: 5112 \or: 5118 \or:
       5114 \or: 5110 \or: 5115 \or: 5180 \or: 51AA \or: 51DD \or: 5291 \or: 5293 \or:
@@ -741,7 +741,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_20:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       932B \or: 9304 \or: 931A \or: 9310 \or: 9326 \or: 9321 \or: 9315 \or: 932E \or:
       9319 \or: 95BB \or: 96A7 \or: 96A8 \or: 96AA \or: 96D5 \or: 970E \or: 9711 \or:
       9716 \or: 970D \or: 9713 \or: 970F \or: 975B \or: 975C \or: 9766 \or: 9798 \or:
@@ -778,7 +778,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_21:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       8B1D \or: 8B04 \or: 8B10 \or: 8C41 \or: 8C3F \or: 8C73 \or: 8CFA \or: 8CFD \or:
       8CFC \or: 8CF8 \or: 8CFB \or: 8DA8 \or: 8E49 \or: 8E4B \or: 8E48 \or: 8E4A \or:
       8F44 \or: 8F3E \or: 8F42 \or: 8F45 \or: 8F3F \or: 907F \or: 907D \or: 9084 \or:
@@ -815,7 +815,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_22:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       5EEC \or: 61F2 \or: 61F7 \or: 61F6 \or: 61F5 \or: 6500 \or: 650F \or: 66E0 \or:
       66DD \or: 6AE5 \or: 6ADD \or: 6ADA \or: 6AD3 \or: 701B \or: 701F \or: 7028 \or:
       701A \or: 701D \or: 7015 \or: 7018 \or: 7206 \or: 720D \or: 7258 \or: 72A2 \or:
@@ -852,7 +852,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_23:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       72A7 \or: 74D6 \or: 74D4 \or: 7669 \or: 77D3 \or: 7C50 \or: 7E8F \or: 7E8C \or:
       7FBC \or: 8617 \or: 862D \or: 861A \or: 8823 \or: 8822 \or: 8821 \or: 881F \or:
       896A \or: 896C \or: 89BD \or: 8B74 \or: 8B77 \or: 8B7D \or: 8D13 \or: 8E8A \or:
@@ -889,7 +889,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_24:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       304D \or: 304E \or: 304F \or: 3050 \or: 3051 \or: 3052 \or: 3053 \or: 3054 \or:
       3055 \or: 3056 \or: 3057 \or: 3058 \or: 3059 \or: 305A \or: 305B \or: 305C \or:
       305D \or: 305E \or: 305F \or: 3060 \or: 3061 \or: 3062 \or: 3063 \or: 3064 \or:
@@ -926,7 +926,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_25:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
@@ -963,7 +963,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_26:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       5DDF \or: 5E75 \or: 5E84 \or: 5F02 \or: 5F1A \or: 5F74 \or: 5FD5 \or: 5FD4 \or:
       5FCF \or: 625C \or: 625E \or: 6264 \or: 6261 \or: 6266 \or: 6262 \or: 6259 \or:
       6260 \or: 625A \or: 6265 \or: 65EF \or: 65EE \or: 673E \or: 6739 \or: 6738 \or:
@@ -1000,7 +1000,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_27:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       8293 \or: 828A \or: 8283 \or: 8284 \or: 8C78 \or: 8FC9 \or: 8FBF \or: 909F \or:
       90A1 \or: 90A5 \or: 909E \or: 90A7 \or: 90A0 \or: 9630 \or: 9628 \or: 962F \or:
       962D \or: 4E33 \or: 4F98 \or: 4F7C \or: 4F85 \or: 4F7D \or: 4F80 \or: 4F87 \or:
@@ -1037,7 +1037,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_28:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6C9D \or: 6C80 \or: 6CDE \or: 6CC0 \or: 6D30 \or: 6CCD \or: 6CC7 \or: 6CB0 \or:
       6CF9 \or: 6CCF \or: 6CE9 \or: 6CD1 \or: 7094 \or: 7098 \or: 7085 \or: 7093 \or:
       7086 \or: 7084 \or: 7091 \or: 7096 \or: 7082 \or: 709A \or: 7083 \or: 726A \or:
@@ -1074,7 +1074,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_29:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       604C \or: 6040 \or: 6042 \or: 605F \or: 6024 \or: 6044 \or: 6058 \or: 6066 \or:
       606E \or: 6242 \or: 6243 \or: 62CF \or: 630D \or: 630B \or: 62F5 \or: 630E \or:
       6303 \or: 62EB \or: 62F9 \or: 630F \or: 630C \or: 62F8 \or: 62F6 \or: 6300 \or:
@@ -1111,7 +1111,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_30:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       82F9 \or: 8307 \or: 82E8 \or: 8300 \or: 82D5 \or: 833A \or: 82EB \or: 82D6 \or:
       82F4 \or: 82EC \or: 82E1 \or: 82F2 \or: 82F5 \or: 830C \or: 82FB \or: 82F6 \or:
       82F0 \or: 82EA \or: 82E4 \or: 82E0 \or: 82FA \or: 82F3 \or: 82ED \or: 8677 \or:
@@ -1148,7 +1148,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_31:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       683A \or: 6825 \or: 6820 \or: 6B2C \or: 6B2F \or: 6B2D \or: 6B31 \or: 6B34 \or:
       6B6D \or: 8082 \or: 6B88 \or: 6BE6 \or: 6BE4 \or: 6BE8 \or: 6BE3 \or: 6BE2 \or:
       6BE7 \or: 6C25 \or: 6D7A \or: 6D63 \or: 6D64 \or: 6D76 \or: 6D0D \or: 6D61 \or:
@@ -1185,7 +1185,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_32:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       8652 \or: 86A2 \or: 86A8 \or: 8696 \or: 868D \or: 8691 \or: 869E \or: 8687 \or:
       8697 \or: 8686 \or: 868B \or: 869A \or: 8685 \or: 86A5 \or: 8699 \or: 86A1 \or:
       86A7 \or: 8695 \or: 8698 \or: 868E \or: 869D \or: 8690 \or: 8694 \or: 8843 \or:
@@ -1222,7 +1222,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_33:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       60DD \or: 60C8 \or: 60B1 \or: 60DB \or: 60B7 \or: 60CA \or: 60BF \or: 60C3 \or:
       60CD \or: 60C0 \or: 6332 \or: 6365 \or: 638A \or: 6382 \or: 637D \or: 63BD \or:
       639E \or: 63AD \or: 639D \or: 6397 \or: 63AB \or: 638E \or: 636F \or: 6387 \or:
@@ -1259,7 +1259,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_34:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       7CA3 \or: 7D35 \or: 7D3D \or: 7D38 \or: 7D36 \or: 7D3A \or: 7D45 \or: 7D2C \or:
       7D29 \or: 7D41 \or: 7D47 \or: 7D3E \or: 7D3F \or: 7D4A \or: 7D3B \or: 7D28 \or:
       7F63 \or: 7F95 \or: 7F9C \or: 7F9D \or: 7F9B \or: 7FCA \or: 7FCB \or: 7FCD \or:
@@ -1296,7 +1296,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_35:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       5848 \or: 5825 \or: 581C \or: 581B \or: 5833 \or: 583F \or: 5836 \or: 582E \or:
       5839 \or: 5838 \or: 582D \or: 582C \or: 583B \or: 5961 \or: 5AAF \or: 5A94 \or:
       5A9F \or: 5A7A \or: 5AA2 \or: 5A9E \or: 5A78 \or: 5AA6 \or: 5A7C \or: 5AA5 \or:
@@ -1333,7 +1333,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_36:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6E53 \or: 6E65 \or: 6E27 \or: 6E78 \or: 6E64 \or: 6E77 \or: 6E55 \or: 6E79 \or:
       6E52 \or: 6E66 \or: 6E35 \or: 6E36 \or: 6E5A \or: 7120 \or: 711E \or: 712F \or:
       70FB \or: 712E \or: 7131 \or: 7123 \or: 7125 \or: 7122 \or: 7132 \or: 711F \or:
@@ -1370,7 +1370,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_37:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       8995 \or: 8998 \or: 8997 \or: 89DD \or: 89DA \or: 89DB \or: 8A4E \or: 8A4D \or:
       8A39 \or: 8A59 \or: 8A40 \or: 8A57 \or: 8A58 \or: 8A44 \or: 8A45 \or: 8A52 \or:
       8A48 \or: 8A51 \or: 8A4A \or: 8A4C \or: 8A4F \or: 8C5F \or: 8C81 \or: 8C80 \or:
@@ -1407,7 +1407,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_38:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6223 \or: 6225 \or: 6224 \or: 63C5 \or: 63F1 \or: 63EB \or: 6410 \or: 6412 \or:
       6409 \or: 6420 \or: 6424 \or: 6433 \or: 6443 \or: 641F \or: 6415 \or: 6418 \or:
       6439 \or: 6437 \or: 6422 \or: 6423 \or: 640C \or: 6426 \or: 6430 \or: 6428 \or:
@@ -1444,7 +1444,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_39:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       7A19 \or: 7A12 \or: 7A17 \or: 7A15 \or: 7A22 \or: 7A13 \or: 7A1B \or: 7A10 \or:
       7AA3 \or: 7AA2 \or: 7A9E \or: 7AEB \or: 7B66 \or: 7B64 \or: 7B6D \or: 7B74 \or:
       7B69 \or: 7B72 \or: 7B65 \or: 7B73 \or: 7B71 \or: 7B70 \or: 7B61 \or: 7B78 \or:
@@ -1481,7 +1481,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_40:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       926F \or: 9236 \or: 9261 \or: 9270 \or: 9231 \or: 9254 \or: 9263 \or: 9250 \or:
       9272 \or: 924E \or: 9253 \or: 924C \or: 9256 \or: 9232 \or: 959F \or: 959C \or:
       959E \or: 959B \or: 9692 \or: 9693 \or: 9691 \or: 9697 \or: 96CE \or: 96FA \or:
@@ -1518,7 +1518,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_41:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6B4A \or: 6B4D \or: 6B4B \or: 6B9E \or: 6B9F \or: 6BA0 \or: 6BC3 \or: 6BC4 \or:
       6BFE \or: 6ECE \or: 6EF5 \or: 6EF1 \or: 6F03 \or: 6F25 \or: 6EF8 \or: 6F37 \or:
       6EFB \or: 6F2E \or: 6F09 \or: 6F4E \or: 6F19 \or: 6F1A \or: 6F27 \or: 6F18 \or:
@@ -1555,7 +1555,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_42:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       873C \or: 8712 \or: 873A \or: 8731 \or: 8735 \or: 8742 \or: 8726 \or: 8727 \or:
       8738 \or: 8724 \or: 871A \or: 8730 \or: 8711 \or: 88F7 \or: 88E7 \or: 88F1 \or:
       88F2 \or: 88FA \or: 88FE \or: 88EE \or: 88FC \or: 88F6 \or: 88FB \or: 88F0 \or:
@@ -1592,7 +1592,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_43:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6470 \or: 6496 \or: 64A0 \or: 6485 \or: 6497 \or: 649C \or: 648F \or: 648B \or:
       648A \or: 648C \or: 64A3 \or: 649F \or: 6468 \or: 64B1 \or: 6498 \or: 6576 \or:
       657A \or: 6579 \or: 657B \or: 65B2 \or: 65B3 \or: 66B5 \or: 66B0 \or: 66A9 \or:
@@ -1629,7 +1629,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_44:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       8509 \or: 850D \or: 851F \or: 850A \or: 8527 \or: 851C \or: 84FB \or: 852B \or:
       84FA \or: 8508 \or: 850C \or: 84F4 \or: 852A \or: 84F2 \or: 8515 \or: 84F7 \or:
       84EB \or: 84F3 \or: 84FC \or: 8512 \or: 84EA \or: 84E9 \or: 8516 \or: 84FE \or:
@@ -1666,7 +1666,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_45:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       9AF1 \or: 9B46 \or: 9B43 \or: 9B67 \or: 9B74 \or: 9B71 \or: 9B66 \or: 9B76 \or:
       9B75 \or: 9B70 \or: 9B68 \or: 9B64 \or: 9B6C \or: 9CFC \or: 9CFA \or: 9CFD \or:
       9CFF \or: 9CF7 \or: 9D07 \or: 9D00 \or: 9CF9 \or: 9CFB \or: 9D08 \or: 9D05 \or:
@@ -1703,7 +1703,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_46:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       77A2 \or: 77A3 \or: 7795 \or: 7799 \or: 7797 \or: 78DD \or: 78E9 \or: 78E5 \or:
       78EA \or: 78DE \or: 78E3 \or: 78DB \or: 78E1 \or: 78E2 \or: 78ED \or: 78DF \or:
       78E0 \or: 79A4 \or: 7A44 \or: 7A48 \or: 7A47 \or: 7AB6 \or: 7AB8 \or: 7AB5 \or:
@@ -1740,7 +1740,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_47:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       92FE \or: 9309 \or: 9300 \or: 92FB \or: 9316 \or: 95BC \or: 95CD \or: 95BE \or:
       95B9 \or: 95BA \or: 95B6 \or: 95BF \or: 95B5 \or: 95BD \or: 96A9 \or: 96D4 \or:
       970B \or: 9712 \or: 9710 \or: 9799 \or: 9797 \or: 9794 \or: 97F0 \or: 97F8 \or:
@@ -1777,7 +1777,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_48:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       7C03 \or: 7C01 \or: 7BF8 \or: 7BFD \or: 7C06 \or: 7BF0 \or: 7BF1 \or: 7C10 \or:
       7C0A \or: 7CE8 \or: 7E2D \or: 7E3C \or: 7E42 \or: 7E33 \or: 9848 \or: 7E38 \or:
       7E2A \or: 7E49 \or: 7E40 \or: 7E47 \or: 7E29 \or: 7E4C \or: 7E30 \or: 7E3B \or:
@@ -1814,7 +1814,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_49:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       9B9A \or: 9BA8 \or: 9B9E \or: 9B9B \or: 9BA6 \or: 9BA1 \or: 9BA5 \or: 9BA4 \or:
       9B86 \or: 9BA2 \or: 9BA0 \or: 9BAF \or: 9D33 \or: 9D41 \or: 9D67 \or: 9D36 \or:
       9D2E \or: 9D2F \or: 9D31 \or: 9D38 \or: 9D30 \or: 9D45 \or: 9D42 \or: 9D43 \or:
@@ -1851,7 +1851,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_50:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       8C75 \or: 8C99 \or: 8C98 \or: 8C97 \or: 8CFE \or: 8D04 \or: 8D02 \or: 8D00 \or:
       8E5C \or: 8E62 \or: 8E60 \or: 8E57 \or: 8E56 \or: 8E5E \or: 8E65 \or: 8E67 \or:
       8E5B \or: 8E5A \or: 8E61 \or: 8E5D \or: 8E69 \or: 8E54 \or: 8F46 \or: 8F47 \or:
@@ -1888,7 +1888,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_51:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       7E7A \or: 7E72 \or: 7E74 \or: 7E68 \or: 7F4B \or: 7F4A \or: 7F83 \or: 7F86 \or:
       7FB7 \or: 7FFD \or: 7FFE \or: 8078 \or: 81D7 \or: 81D5 \or: 8264 \or: 8261 \or:
       8263 \or: 85EB \or: 85F1 \or: 85ED \or: 85D9 \or: 85E1 \or: 85E8 \or: 85DA \or:
@@ -1925,7 +1925,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_52:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       6AEE \or: 6AEF \or: 703C \or: 7035 \or: 702F \or: 7037 \or: 7034 \or: 7031 \or:
       7042 \or: 7038 \or: 703F \or: 703A \or: 7039 \or: 7040 \or: 703B \or: 7033 \or:
       7041 \or: 7213 \or: 7214 \or: 72A8 \or: 737D \or: 737C \or: 74BA \or: 76AB \or:
@@ -1962,7 +1962,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_53:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       7517 \or: 766A \or: 77D0 \or: 792D \or: 7931 \or: 792F \or: 7C54 \or: 7C53 \or:
       7CF2 \or: 7E8A \or: 7E87 \or: 7E88 \or: 7E8B \or: 7E86 \or: 7E8D \or: 7F4D \or:
       7FBB \or: 8030 \or: 81DD \or: 8618 \or: 862A \or: 8626 \or: 861F \or: 8623 \or:
@@ -1999,7 +1999,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_54:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       9AD0 \or: 9B19 \or: 9B2B \or: 9B3B \or: 9B56 \or: 9B55 \or: 9C46 \or: 9C48 \or:
       9C3F \or: 9C44 \or: 9C39 \or: 9C33 \or: 9C41 \or: 9C3C \or: 9C37 \or: 9C34 \or:
       9C32 \or: 9C3D \or: 9C36 \or: 9DDB \or: 9DD2 \or: 9DDE \or: 9DDA \or: 9DCB \or:
@@ -2036,7 +2036,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_55:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       8979 \or: 897A \or: 897C \or: 897B \or: 89FF \or: 8B98 \or: 8B99 \or: 8EA5 \or:
       8EA4 \or: 8EA3 \or: 946E \or: 946D \or: 946F \or: 9471 \or: 9473 \or: 9749 \or:
       9872 \or: 995F \or: 9C68 \or: 9C6E \or: 9C6D \or: 9E0B \or: 9E0D \or: 9E10 \or:
@@ -2073,7 +2073,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_56:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
@@ -2110,7 +2110,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_57:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
@@ -2147,7 +2147,7 @@
   }
 \cs_new_nopar:cpn { __CJKtu_Bg5_sfd_map_58:n } #1
   {
-    \if_case:w \etex_numexpr:D #1 \scan_stop:
+    \if_case:w \tex_numexpr:D #1 \scan_stop:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or:
       FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: FFFE \or: