From 3fd00999f0cbc7595139122b0379f23c7ad0b1b9 Mon Sep 17 00:00:00 2001 From: Qing Lee Date: Mon, 10 Feb 2020 18:37:03 +0800 Subject: [PATCH] =?UTF-8?q?xeCJK:=20=E5=BA=94=E7=94=A8=20\fp=5Fif=5Fnan:nT?= =?UTF-8?q?F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xeCJK/xeCJK.dtx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xeCJK/xeCJK.dtx b/xeCJK/xeCJK.dtx index c62bef4a..42e7d061 100644 --- a/xeCJK/xeCJK.dtx +++ b/xeCJK/xeCJK.dtx @@ -283,7 +283,7 @@ Copyright and Licence % \changes{v3.8.0}{2020/02/09}{兼容 \LaTeXe\ 2020/02/02 对 \pkg{NFSS} 的修改。} % \changes{v3.8.0}{2020/02/09}{清理过时的兼容性补丁代码。} % -% \CheckSum{10754} +% \CheckSum{10751} % \GetFileId{xeCJK.sty} % % \title{\bfseries\pkg{xeCJK} 宏包} @@ -1612,7 +1612,7 @@ Copyright and Licence using~your~TeX~package~manager~or~from~CTAN.\\ \str_if_eq:nnT {#1} { expl3 } { Loading~xeCJK~will~abort! } } -\@ifpackagelater { expl3 } { 2019/03/05 } { } +\@ifpackagelater { expl3 } { 2020/02/08 } { } { \msg_critical:nnn { xeCJK } { l3-too-old } { expl3 } } % \end{macrocode} % @@ -5674,6 +5674,7 @@ Copyright and Licence % \end{macro} % % \changes{v3.2.7}{2013/08/25}{标点宽度设置禁用比例选项的值改为 \texttt{nan}。} +% \changes{v3.8.0}{2020/02/10}{应用 \cs{fp_if_nan:nTF}。} % % \begin{macro}{\@@_punct_width_or_ratio:nN} % \begin{macrocode} @@ -5682,7 +5683,7 @@ Copyright and Licence \dim_compare:nNnTF { \use:c { l_@@_#1_punct_width_dim } } < \c_max_dim { \use:c { l_@@_#1_punct_width_dim } } { - \fp_compare:nNnTF { \use:c { l_@@_#1_punct_ratio_fp } } ? \c_zero_fp + \fp_if_nan:nTF { \use:c { l_@@_#1_punct_ratio_fp } } { \c_max_dim } { \fp_use:c { l_@@_#1_punct_ratio_fp } @@ -5825,7 +5826,7 @@ Copyright and Licence \dim_compare:nNnTF \l_@@_kerning_total_width_dim < \c_max_dim { \@@_calc_kerning_margin:nNN \l_@@_kerning_total_width_dim } { - \fp_compare:nNnTF \l_@@_kerning_total_ratio_fp ? \c_zero_fp + \fp_if_nan:nTF { \l_@@_kerning_total_ratio_fp } { \xeCJK_if_same_class:NNTF #1 #2 { \@@_kerning_width_or_ratio:nNN { same } } @@ -5854,7 +5855,7 @@ Copyright and Licence \dim_compare:nNnTF { \use:c { l_@@_#1_align_margin_dim } } < \c_max_dim { \use:c { l_@@_#1_align_margin_dim } } { - \fp_compare:nNnTF { \use:c { l_@@_#1_align_ratio_fp } } ? \c_zero_fp + \fp_if_nan:nTF { \use:c { l_@@_#1_align_ratio_fp } } { \dim_compare:nNnTF \l_@@_kerning_margin_width_dim < \c_max_dim { \l_@@_kerning_margin_width_dim \use_none:n } @@ -7991,7 +7992,7 @@ Copyright and Licence % 执行宏包选项,并载入 \pkg{fontspec} 宏包。 % \begin{macrocode} \ProcessKeysOptions { xeCJK / options } -\RequirePackage { fontspec } [ 2019/03/15 ] +\RequirePackage { fontspec } [ 2020/02/03 ] % \end{macrocode} % % \begin{variable}{\c_@@_encoding_tl}