xecjk (19oct20)

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

6 files changed, 54 insertions, 38 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
index 9742f0f48a3..c31fd581761 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
@@ -29,10 +29,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {xeCJK patch file for listings}
 \ProvidesExplPackage{xeCJK-listings}
-  {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.8.6}{\ExplFileDescription}
 \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } }
 \ProcessOptions \scan_stop:
 \RequirePackage { xeCJK }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
index f9ecbd90008..d26c3b5dce9 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
@@ -6,10 +6,10 @@
 %%
 %% xeCJK.dtx  (with options: `config')
 %% 
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Configuration file for xeCJK package}
 \ProvidesExplFile{\ExplFileName.cfg}
-  {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.8.6}{\ExplFileDescription}
 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
index 6bb521e33d4..25623ab698d 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
@@ -29,10 +29,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Typesetting CJK scripts with XeLaTeX}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.8.6}{\ExplFileDescription}
 \msg_new:nnn { xeCJK } { Require-XeTeX }
   {
     The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -1614,7 +1614,13 @@
     \int_compare:nNnTF \tex_lastnodetype:D = { 11 }
       { \__xeCJK_if_last_punct_glue:TF { \use_i:nn } }
       { \use:n }
-      { \tex_penalty:D \l__xeCJK_last_penalty_int \use_ii:nn }
+      { \__xeCJK_last_punct_penalty_false:nn }
+  }
+\cs_new_protected:Npn \__xeCJK_last_punct_penalty_false:nn #1#2
+  {
+    \bool_set_false:N \l__xeCJK_last_penalty_bool
+    \tex_penalty:D \l__xeCJK_last_penalty_int
+    #2
   }
 \cs_new_protected:Npn \__xeCJK_if_last_punct_auxi:TF
   {
@@ -4626,39 +4632,49 @@
     \__xeCJK_math_robust:N \endmath
   }
 \__xeCJK_math_robust:N \ensuremath
-\cs_if_exist:NTF \@rmfamilyhook
+\@ifl@t@r \fmtversion { 2020/10/01 }
   {
     \cs_set_eq:NN \xeCJK@family \xeCJK_switch_family:x
-    \g@addto@macro \@rmfamilyhook { \xeCJK@family { \CJKrmdefault } }
-    \g@addto@macro \@sffamilyhook { \xeCJK@family { \CJKsfdefault } }
-    \g@addto@macro \@ttfamilyhook { \xeCJK@family { \CJKttdefault } }
-    \exp_args:Nc \g@addto@macro
-      {
-        \cs_if_exist:NTF \@defaultfamilyhook
-          { @defaultfamilyhook } { normalfont ~ }
-      }
-      { \xeCJK@family { \CJKfamilydefault } }
+    \AddToHook { rmfamily }   { \xeCJK@family { \CJKrmdefault } }
+    \AddToHook { sffamily }   { \xeCJK@family { \CJKsfdefault } }
+    \AddToHook { ttfamily }   { \xeCJK@family { \CJKttdefault } }
+    \AddToHook { normalfont } { \xeCJK@family { \CJKfamilydefault } }
   }
   {
-    \RenewDocumentCommand \fontfamily { m }
-      {
-        \tl_set:Nx \f@family {#1}
-        \xeCJK@fontfamily {#1}
-      }
-    \cs_new_protected:Npn \xeCJK@fontfamily #1
+    \cs_if_exist:NTF \@rmfamilyhook
       {
-        \str_if_eq:nnTF {#1} { \familydefault }
-          { \xeCJK_switch_family:x { \CJKfamilydefault } }
-          { \__xeCJK_update_family_aux: }
+        \cs_set_eq:NN \xeCJK@family \xeCJK_switch_family:x
+        \g@addto@macro \@rmfamilyhook { \xeCJK@family { \CJKrmdefault } }
+        \g@addto@macro \@sffamilyhook { \xeCJK@family { \CJKsfdefault } }
+        \g@addto@macro \@ttfamilyhook { \xeCJK@family { \CJKttdefault } }
+        \exp_args:Nc \g@addto@macro
+          {
+            \cs_if_exist:NTF \@defaultfamilyhook
+              { @defaultfamilyhook } { normalfont ~ }
+          }
+          { \xeCJK@family { \CJKfamilydefault } }
       }
-    \cs_new_protected:Npn \__xeCJK_update_family_aux:
       {
-        \str_case_e:nn { \f@family }
+        \RenewDocumentCommand \fontfamily { m }
+          {
+            \tl_set:Nx \f@family {#1}
+            \xeCJK@fontfamily {#1}
+          }
+        \cs_new_protected:Npn \xeCJK@fontfamily #1
+          {
+            \str_if_eq:nnTF {#1} { \familydefault }
+              { \xeCJK_switch_family:x { \CJKfamilydefault } }
+              { \__xeCJK_update_family_aux: }
+          }
+        \cs_new_protected:Npn \__xeCJK_update_family_aux:
           {
-            { \rmdefault }     { \xeCJK_switch_family:x { \CJKrmdefault } }
-            { \sfdefault }     { \xeCJK_switch_family:x { \CJKsfdefault } }
-            { \ttdefault }     { \xeCJK_switch_family:x { \CJKttdefault } }
-            { \familydefault } { \xeCJK_switch_family:x { \CJKfamilydefault } }
+            \str_case_e:nn { \f@family }
+              {
+                { \rmdefault }     { \xeCJK_switch_family:x { \CJKrmdefault } }
+                { \sfdefault }     { \xeCJK_switch_family:x { \CJKsfdefault } }
+                { \ttdefault }     { \xeCJK_switch_family:x { \CJKttdefault } }
+                { \familydefault } { \xeCJK_switch_family:x { \CJKfamilydefault } }
+              }
           }
       }
   }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
index 2ba36ebc832..57e3071bc89 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
@@ -29,10 +29,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {xeCJK font effect}
 \ProvidesExplPackage{xeCJKfntef}
-  {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.8.6}{\ExplFileDescription}
 \PassOptionsToPackage { normalem } { ulem }
 \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } }
 \ProcessOptions \scan_stop:
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
index f882bf810e7..e693fd232ce 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
@@ -29,10 +29,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {addon file for xunicode}
 \ProvidesExplPackage{xunicode-addon}
-  {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.8.6}{\ExplFileDescription}
 \bool_lazy_or:nnF
   { \sys_if_engine_xetex_p: }
   { \sys_if_engine_luatex_p: }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
index efddf0397ee..17a4c4dbc8f 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
@@ -27,10 +27,10 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: xeCJK.dtx 6405ee1 2020-08-23 21:58:40 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx f475abb 2020-10-19 20:24:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {extra definition for xunicode}
 \ProvidesExplFile{xunicode-extra.def}
-  {\ExplFileDate}{3.8.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.8.6}{\ExplFileDescription}
 \DeclareUTFSymbol\texthyphenationpoint{"2027}
 \DeclareUTFSymbol\texttwoemdash{"2E3A}
 \DeclareUTFComposite\textsuperscript