summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdfbin1245650 -> 1247697 bytes
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdfbin298080 -> 298082 bytes
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx29
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty4
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg4
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty24
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty4
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty4
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def4
9 files changed, 46 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index c50a8b707c2..e83434123e6 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
index 5d99143bab4..63dbc734fe4 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index 41df67d7c94..0c03b340466 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
@@ -194,7 +194,7 @@ Copyright and Licence
%<*package|config|fntef|listings|xunicode|xunextra>
%<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
%<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx f0c9d10 2016-11-20 23:00:07 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
%<package> {Typesetting CJK scripts with XeLaTeX}
%<config> {Configuration file for xeCJK package}
%<fntef> {xeCJK font effect}
@@ -207,7 +207,7 @@ Copyright and Licence
%<listings>\ProvidesExplPackage{xeCJK-listings}
%<xunicode>\ProvidesExplPackage{xunicode-addon}
%<xunextra>\ProvidesExplFile{xunicode-extra.def}
-%<!driver> {\ExplFileDate}{3.4.3}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.4.4}{\ExplFileDescription}
%</package|config|fntef|listings|xunicode|xunextra>
%<*driver>
\documentclass{ctxdoc}
@@ -275,7 +275,7 @@ Copyright and Licence
% \changes{v3.3.2}{2015/05/15}{随 Unicode 7.0.0 更新简繁汉字映射。}
% \changes{v3.3.3}{2015/09/25}{更新 \hologo{LaTeX3} 代码。}
%
-% \CheckSum{10153}
+% \CheckSum{10164}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -3643,8 +3643,9 @@ Copyright and Licence
{ \@@_punct_kern:n { - \@@_use_punct_dim:nnn { offset } {#1} {#2} } }
\cs_new_protected_nopar:Npn \@@_punct_kern:n #1
{
- \dim_compare:nNnF {#1} = \c_zero_dim
- { \tex_kern:D #1 \exp_stop_f: }
+ \dim_set:Nn \l_@@_tmp_dim {#1}
+ \dim_compare:nNnF \l_@@_tmp_dim = \c_zero_dim
+ { \tex_kern:D \l_@@_tmp_dim }
}
% \end{macrocode}
% \end{macro}
@@ -5132,7 +5133,10 @@ Copyright and Licence
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.4.4}{2016/11/30}{不压缩长标点与其他标点的间距。}
+%
% \begin{macro}[internal]{\xeCJK_punct_kerning_process:NN}
+% 当标点之一为长标点时，不必进行压缩。
% \begin{macrocode}
\cs_new_protected_nopar:Npn \xeCJK_punct_kerning_process:NN #1#2
{
@@ -5140,14 +5144,21 @@ Copyright and Licence
{ \@@_original_kerning_margin:NN {#1} {#2} }
\dim_set:Nn \l_@@_minimum_bound_dim
{ \@@_punct_min_bound:NN {#1} {#2} }
+ \@@_punct_if_long:NTF {#1}
+ { \bool_set_false:N \l_@@_enabled_kerning_bool }
+ {
+ \@@_punct_if_long:NT {#2}
+ { \bool_set_false:N \l_@@_enabled_kerning_bool }
+ }
\dim_set:Nn \l_@@_kerning_margin_dim
{
- \bool_if:nTF
+ \bool_if:NTF \l_@@_enabled_global_setting_bool
{
- \l_@@_enabled_global_setting_bool &&
- \tl_if_exist_p:c { g_@@_punct/kern/#1/#2/tl }
+ \cs_if_exist_use:cTF { g_@@_punct/kern/#1/#2/tl }
+ { \use_none:n }
+ { \use:n }
}
- { \use:c { g_@@_punct/kern/#1/#2/tl } }
+ { \use:n }
{
\bool_if:NTF \l_@@_enabled_kerning_bool
{ \@@_calc_kerning_margin:NN {#1} {#2} }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
index b721ddcffa5..911d5c8dc27 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 f0c9d10 2016-11-20 23:00:07 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.4.3}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.4}{\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 04b494ac7fd..434d3d136a6 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 f0c9d10 2016-11-20 23:00:07 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.4.3}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.4}{\ExplFileDescription}
%%
%%
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
index 0cd56e3f91f..e36f03c91eb 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 f0c9d10 2016-11-20 23:00:07 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.4.3}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.4}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -1138,8 +1138,9 @@
{ \__xeCJK_punct_kern:n { - \__xeCJK_use_punct_dim:nnn { offset } {#1} {#2} } }
\cs_new_protected_nopar:Npn \__xeCJK_punct_kern:n #1
{
- \dim_compare:nNnF {#1} = \c_zero_dim
- { \tex_kern:D #1 \exp_stop_f: }
+ \dim_set:Nn \l__xeCJK_tmp_dim {#1}
+ \dim_compare:nNnF \l__xeCJK_tmp_dim = \c_zero_dim
+ { \tex_kern:D \l__xeCJK_tmp_dim }
}
\cs_new_protected_nopar:Npn \__xeCJK_punct_glue:NN #1#2
{
@@ -2216,14 +2217,21 @@
{ \__xeCJK_original_kerning_margin:NN {#1} {#2} }
\dim_set:Nn \l__xeCJK_minimum_bound_dim
{ \__xeCJK_punct_min_bound:NN {#1} {#2} }
+ \__xeCJK_punct_if_long:NTF {#1}
+ { \bool_set_false:N \l__xeCJK_enabled_kerning_bool }
+ {
+ \__xeCJK_punct_if_long:NT {#2}
+ { \bool_set_false:N \l__xeCJK_enabled_kerning_bool }
+ }
\dim_set:Nn \l__xeCJK_kerning_margin_dim
{
- \bool_if:nTF
+ \bool_if:NTF \l__xeCJK_enabled_global_setting_bool
{
- \l__xeCJK_enabled_global_setting_bool &&
- \tl_if_exist_p:c { g__xeCJK_punct/kern/#1/#2/tl }
+ \cs_if_exist_use:cTF { g__xeCJK_punct/kern/#1/#2/tl }
+ { \use_none:n }
+ { \use:n }
}
- { \use:c { g__xeCJK_punct/kern/#1/#2/tl } }
+ { \use:n }
{
\bool_if:NTF \l__xeCJK_enabled_kerning_bool
{ \__xeCJK_calc_kerning_margin:NN {#1} {#2} }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
index 4cedf054de8..dcc3b7e8c3f 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 f0c9d10 2016-11-20 23:00:07 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.4.3}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.4}{\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 d1caf5ab98f..04ac2a33317 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 f0c9d10 2016-11-20 23:00:07 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.4.3}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.4}{\ExplFileDescription}
\bool_if:nF
{
\sys_if_engine_xetex_p: ||
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
index ebeece2ffb4..d0fddf70c4a 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 f0c9d10 2016-11-20 23:00:07 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.4.3}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.4}{\ExplFileDescription}
\DeclareUTFComposite\textsuperscript
\DeclareUTFComposite\textsubscript
\DeclareUTFEncodedAccent\textsbleftarrow{"20EE}{"20FF}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 07:49:01 +0000