ctex: expand arguments in \xeCJKsetup etc.

Fix #474.
CTeX-org · Jan 21, 2020 · 662439e · 662439e
1 parent c4b5a75
commit 662439e
Show file tree

Hide file tree

Showing 3 changed files with 725 additions and 389 deletions.
diff --git a/ctex/CHANGELOG.md b/ctex/CHANGELOG.md
@@ -27,6 +27,7 @@
 ### Fixed
 
 - 兼容 `titletoc`，防止目录中章节名和标题现重合 - [#472](https://github.com/CTeX-org/ctex-kit/issues/472)
+- 修复 `punct=plain` 在 XeLaTeX 编译时报错 - [#474](https://github.com/CTeX-org/ctex-kit/issues/474)
 
 ### Deprecated
 

diff --git a/ctex/ctex-code-engine.dtx b/ctex/ctex-code-engine.dtx
@@ -452,8 +452,8 @@
 \RequirePackage { xeCJK }
 \exp_args:Nx \xeCJKsetup
   {
-    LoadFandol   = false ,
-    PunctStyle   = \l_@@_punct_tl
+    LoadFandol = false ,
+    PunctStyle = \l_@@_punct_tl
   }
 %    \end{macrocode}
 %
@@ -2610,8 +2610,8 @@
     punct .code:n =
       {
         \tl_set:Nx \l_@@_punct_tl {#1}
-%<pdftex>        \punctstyle { \l_@@_punct_tl }
-%<xetex>        \xeCJKsetup { PunctStyle = \l_@@_punct_tl }
+%<pdftex>        \exp_args:Nx \punctstyle { \l_@@_punct_tl }
+%<xetex>        \exp_args:Nx \xeCJKsetup { PunctStyle = \l_@@_punct_tl }
 %<luatex>        \ctex_mono_jfm:o { \l_@@_punct_tl }
 %<uptex|aptex>        \msg_warning:nn { ctex } { invalid-option }
       } ,