summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/xelatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-05-29 20:49:44 +0000
committerKarl Berry <karl@freefriends.org>2019-05-29 20:49:44 +0000
commit1bfa36fb11c38e651b0dfb25c7fd31803b49d49d (patch)
tree36ae36afaa75440df1f54dbdc2558a69be56facd /Master/texmf-dist/source/xelatex
parent94b5972acb01d3c8f98c5c5b7d495aa030ef522f (diff)
xecjk (29may19)
git-svn-id: svn://tug.org/texlive/trunk@51260 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/xelatex')
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx34
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins160
2 files changed, 22 insertions, 172 deletions
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index af49e3b5d11..a8638028f31 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 8be031f 2019-04-07 23:30:14 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 0e3f9e8 2019-04-15 02:07:22 +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.7.2}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.7.3}{\ExplFileDescription}
%</package|config|fntef|listings|xunicode|xunextra>
%<*driver>
\documentclass{ctxdoc}
@@ -281,7 +281,7 @@ Copyright and Licence
% \changes{v3.6.1}{2018/02/27}{减少 \texttt{bool} 运算。}
% \changes{v3.7.2}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。}
%
-% \CheckSum{10855}
+% \CheckSum{10857}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -467,7 +467,7 @@ Copyright and Licence
% WidowPenalty = \Arg{penalty|(10000)}
% \end{syntax}
% 使用 \texttt{CheckSingle} 选项后,设置段末三个汉字之间的 penalty。
-% 初始值为 $10000$,即禁止在它们之间折行。
+% 初始值为 \num{10000},即禁止在它们之间折行。
% \end{function}
%
% \begin{function}[added=2012-12-06]{PlainEquation}
@@ -1697,8 +1697,8 @@ Copyright and Licence
\cs_new_protected_nopar:Npn \xeCJK_allow_break:
{ \tex_penalty:D \c_zero_int }
\cs_new_protected_nopar:Npn \xeCJK_no_break:
- { \tex_penalty:D \c_@@_ten_thousand_int }
-\int_const:Nn \c_@@_ten_thousand_int { 10 000 }
+ { \tex_penalty:D \c_@@_nobreak_penalty_int }
+\int_const:Nn \c_@@_nobreak_penalty_int { 10 000 }
% \end{macrocode}
% \end{macro}
%
@@ -2475,6 +2475,7 @@ Copyright and Licence
% \changes{v3.3.3}{2015/06/25}{补充 Ext-E。}
% \changes{v3.4.1}{2016/08/18}{补充 Unicode 9.0.0 的西夏文。}
% \changes{v3.5.0}{2017/07/22}{补充 Ext-F。}
+% \changes{v3.7.3}{2019/04/15}{补充日文假名扩展。}
%
% \begin{variable}{\c_@@_CJK_chars_clist}
% CJK 字符类,包括文字和标点符号。
@@ -2595,6 +2596,14 @@ Copyright and Licence
% \begin{macrocode}
"1B000 -> "1B0FF ,
% \end{macrocode}
+% \item Kana Extended-A (日文假名扩展 A)
+% \begin{macrocode}
+ "1B100 -> "1B12F ,
+% \end{macrocode}
+% \item Small Kana Extension (小型日文假名扩展)
+% \begin{macrocode}
+ "1B130 -> "1B16F ,
+% \end{macrocode}
% \item Enclosed Ideographic Supplement (带圈表意文字增补)
% \begin{macrocode}
"1F200 -> "1F2FF ,
@@ -4018,7 +4027,7 @@ Copyright and Licence
}
\cs_new_protected_nopar:Npn \@@_nobreak_zero_glue:
{
- \tex_penalty:D \c_@@_ten_thousand_int
+ \tex_penalty:D \c_@@_nobreak_penalty_int
\skip_horizontal:N \c_zero_skip
}
\cs_new_protected_nopar:Npn \@@_zero_glue:
@@ -4289,6 +4298,7 @@ Copyright and Licence
% \end{macro}
%
% \changes{v3.6.0}{2018/01/23}{解决标点中间被隔开的禁则与压缩问题。}
+% \changes{v3.7.3}{2019/04/15}{修复 penalty 数值错误。}
%
% \begin{macro}{\xeCJK_if_last_punct:TF}
% \changes{v3.6.1}{2018/02/25}{细化判断。}
@@ -4316,7 +4326,7 @@ Copyright and Licence
{
\skip_set_eq:NN \l_@@_last_skip \tex_lastskip:D
\tex_unskip:D
- \int_compare:nNnTF \tex_lastpenalty:D = { 1000 }
+ \int_compare:nNnTF \tex_lastpenalty:D = \c_@@_nobreak_penalty_int
{ \@@_if_last_punct_auxi:TF { \use_i:nn } }
{
\xeCJK_if_last_node:TF
@@ -4362,7 +4372,7 @@ Copyright and Licence
\bool_if:NF \l_@@_last_penalty_bool
{
\bool_set_true:N \l_@@_last_penalty_bool
- \int_set:Nn \l_@@_last_penalty_int { 1000 }
+ \int_set_eq:NN \l_@@_last_penalty_int \c_@@_nobreak_penalty_int
}
\xeCJK_if_last_node:TF
{ \@@_if_last_punct_auxii:TF { \use_i:nn } }
@@ -4706,12 +4716,12 @@ Copyright and Licence
% \changes{v3.3.1}{2015/04/08}{新选项 \texttt{WidowPenalty}。}
%
% \begin{macro}{WidowPenalty}
-% 设置段末汉字的 penalty,默认值是 $10000$。
+% 设置段末汉字的 penalty,默认值是 \num{10000}。
% \begin{macrocode}
\keys_define:nn { xeCJK / options }
{
WidowPenalty .int_set:N = \l_@@_widow_penalty_int ,
- WidowPenalty .default:n = { 1000 }
+ WidowPenalty .default:n = { 10 000 }
}
% \end{macrocode}
% \end{macro}
@@ -8005,7 +8015,7 @@ Copyright and Licence
PunctStyle = quanjiao ,
NewLineCS = { \par \[ } ,
EnvCS = { \begin \end } ,
- WidowPenalty = 1000 ,
+ WidowPenalty = { 10 000 } ,
NoBreakCS = { \footnote \footnotemark \nobreak } ,
KaiMingPunct = { ^^^^3002 ^^^^ff0e ^^^^ff1f ^^^^ff01 } ,
LongPunct = { ^^^^2014 ^^^^2e3a ^^^^2025 ^^^^2026 } ,
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
deleted file mode 100644
index cd7ad3d3740..00000000000
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
+++ /dev/null
@@ -1,160 +0,0 @@
-%%
-%% This is file `xeCJK.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% xeCJK.dtx (with options: `install')
-%%
-%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
-%% Copyright (C) 2009--2019 by Leo Liu <leoliu.pku@gmail.com>
-%% Copyright (C) 2012--2019 by Qing Lee <sobenlee@gmail.com>
-%% ----------------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%% http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainers of this work are Leo Liu and Qing Lee.
-%%
-%% ----------------------------------------------------------------------
-%%
-
-\input ctxdocstrip %
-
-\preamble
-
- Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
- Copyright (C) 2009--2019 by Leo Liu <leoliu.pku@gmail.com>
- Copyright (C) 2012--2019 by Qing Lee <sobenlee@gmail.com>
-----------------------------------------------------------------------
-
- This work may be distributed and/or modified under the
- conditions of the LaTeX Project Public License, either
- version 1.3c of this license or (at your option) any later
- version. This version of this license is in
- http://www.latex-project.org/lppl/lppl-1-3c.txt
- and the latest version of this license is in
- http://www.latex-project.org/lppl.txt
- and version 1.3 or later is part of all distributions of
- LaTeX version 2005/12/01 or later.
-
- This work has the LPPL maintenance status `maintained'.
-
- The Current Maintainers of this work are Leo Liu and Qing Lee.
-
-----------------------------------------------------------------------
-
-\endpreamble
-\postamble
-
- This package consists of the files xeCJK.dtx,
- full-stop.map,
- fullwidth-stop.map,
- han-simp.map,
- han-trad.map,
- and the derived files xeCJK.pdf,
- xeCJK.sty,
- xeCJK.cfg,
- xeCJK.ins,
- xeCJKfntef.sty,
- xeCJK-listings.sty,
- xunicode-addon.sty,
- xunicode-extra.def,
- xeCJK-example-autofake.tex,
- xeCJK-example-fallback.tex,
- xeCJK-example-subCJKblock.tex,
- xeCJK-example-CJKecglue.tex,
- xeCJK-example-checksingle.tex,
- xeCJK-example-CJKfntef.tex,
- xeCJK-example-punctstyle.tex,
- xeCJK-example-verbatim.tex,
- xeCJK-example-CM.tex,
- xeCJK-example-listings.tex,
- xeCJK-example-mathblock.tex,
- xunicode-symbols.tex,
- xunicode-commands.tex,
- xunicode-combine-marks.tex,
- xunicode-symbols.pdf,
- full-stop.tec,
- fullwidth-stop.tec,
- han-simp.tec,
- han-trad.tec, and
- README.md.
-\endpostamble
-
-\generate
- {
- \usedir{tex/xelatex/xecjk}
- \file{xeCJK.sty} {\from{\jobname.dtx}{package}}
- \file{xeCJKfntef.sty} {\from{\jobname.dtx}{fntef}}
- \file{xeCJK-listings.sty} {\from{\jobname.dtx}{listings}}
- \file{xunicode-addon.sty} {\from{\jobname.dtx}{xunicode}}
- \file{xunicode-extra.def} {\from{\jobname.dtx}{xunextra}}
- \usepreamble\emptypreamble
- \usepostamble\emptypostamble
- \usedir{tex/xelatex/xecjk/config}
- \file{xeCJK.cfg} {\from{\jobname.dtx}{config}}
- \usedir{doc/xelatex/xecjk/example}
- \file{xeCJK-example-autofake.tex} {\from{\jobname.dtx}{ex-autofake}}
- \file{xeCJK-example-fallback.tex} {\from{\jobname.dtx}{ex-fallback}}
- \file{xeCJK-example-subCJKblock.tex} {\from{\jobname.dtx}{ex-block}}
- \file{xeCJK-example-CJKecglue.tex} {\from{\jobname.dtx}{ex-ecglue}}
- \file{xeCJK-example-checksingle.tex} {\from{\jobname.dtx}{ex-single}}
- \file{xeCJK-example-CJKfntef.tex} {\from{\jobname.dtx}{ex-fntef}}
- \file{xeCJK-example-punctstyle.tex} {\from{\jobname.dtx}{ex-punctstyle}}
- \file{xeCJK-example-verbatim.tex} {\from{\jobname.dtx}{ex-verb}}
- \file{xeCJK-example-CM.tex} {\from{\jobname.dtx}{ex-cm}}
- \file{xeCJK-example-listings.tex} {\from{\jobname.dtx}{ex-listings}}
- \file{xeCJK-example-mathblock.tex} {\from{\jobname.dtx}{ex-mathblock}}
- \file{xunicode-symbols.tex} {\from{\jobname.dtx}{xunicode-symbols}}
- \nopreamble\nopostamble
- \usedir{doc/xelatex/xecjk}
- \file{README.md} {\from{\jobname.dtx}{readme}}
- }
-
-\endbatchfile
-%%
-%% This package consists of the files xeCJK.dtx,
-%% full-stop.map,
-%% fullwidth-stop.map,
-%% han-simp.map,
-%% han-trad.map,
-%% and the derived files xeCJK.pdf,
-%% xeCJK.sty,
-%% xeCJK.cfg,
-%% xeCJK.ins,
-%% xeCJKfntef.sty,
-%% xeCJK-listings.sty,
-%% xunicode-addon.sty,
-%% xunicode-extra.def,
-%% xeCJK-example-autofake.tex,
-%% xeCJK-example-fallback.tex,
-%% xeCJK-example-subCJKblock.tex,
-%% xeCJK-example-CJKecglue.tex,
-%% xeCJK-example-checksingle.tex,
-%% xeCJK-example-CJKfntef.tex,
-%% xeCJK-example-punctstyle.tex,
-%% xeCJK-example-verbatim.tex,
-%% xeCJK-example-CM.tex,
-%% xeCJK-example-listings.tex,
-%% xeCJK-example-mathblock.tex,
-%% xunicode-symbols.tex,
-%% xunicode-commands.tex,
-%% xunicode-combine-marks.tex,
-%% xunicode-symbols.pdf,
-%% full-stop.tec,
-%% fullwidth-stop.tec,
-%% han-simp.tec,
-%% han-trad.tec, and
-%% README.md.
-%%
-%% End of file `xeCJK.ins'.