texlive[42354] Master/texmf-dist: xecjk (25oct16)
commits+karl at tug.org
commits+karl at tug.org
Tue Oct 25 22:40:25 CEST 2016
Revision: 42354
http://tug.org/svn/texlive?view=revision&revision=42354
Author: karl
Date: 2016-10-25 22:40:25 +0200 (Tue, 25 Oct 2016)
Log Message:
-----------
xecjk (25oct16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
Modified: trunk/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
===================================================================
--- trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2016-10-25 20:40:09 UTC (rev 42353)
+++ trunk/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx 2016-10-25 20:40:25 UTC (rev 42354)
@@ -194,7 +194,7 @@
%<*package|config|fntef|listings|xunicode|xunextra>
%<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
%<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx 10a8836 2016-08-27 11:02:24 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 7cdefd6 2016-10-25 17:38:55 +0800 Qing Lee <sobenlee at gmail.com> $
%<package> {Typesetting CJK scripts with XeLaTeX}
%<config> {Configuration file for xeCJK package}
%<fntef> {xeCJK font effect}
@@ -207,7 +207,7 @@
%<listings>\ProvidesExplPackage{xeCJK-listings}
%<xunicode>\ProvidesExplPackage{xunicode-addon}
%<xunextra>\ProvidesExplFile{xunicode-extra.def}
-%<!driver> {\ExplFileDate}{3.4.1}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{3.4.2}{\ExplFileDescription}
%</package|config|fntef|listings|xunicode|xunextra>
%<*driver>
\documentclass{ctxdoc}
@@ -275,7 +275,7 @@
% \changes{v3.3.2}{2015/05/15}{随 Unicode 7.0.0 更新简繁汉字映射。}
% \changes{v3.3.3}{2015/09/25}{更新 \hologo{LaTeX3} 代码。}
%
-% \CheckSum{10130}
+% \CheckSum{10138}
% \GetFileId{xeCJK.sty}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -2613,25 +2613,6 @@
%
% \subsection{字符类别处理}
%
-% \begin{macro}[internal,var]
-% {\g_@@_base_class_seq,\g_@@_non_CJK_class_seq,\g_@@_CJK_class_seq}
-% \begin{macrocode}
-\seq_new:N \g_@@_base_class_seq
-\seq_gset_eq:NN \g_@@_base_class_seq \g_@@_class_seq
-\seq_new:N \g_@@_non_CJK_class_seq
-\seq_gset_from_clist:Nn \g_@@_non_CJK_class_seq
- { Default , HalfLeft , HalfRight , NormalSpace , Boundary }
-\seq_new:N \g_@@_CJK_class_seq
-\cs_new_protected_nopar:Npn \@@_save_CJK_class:n #1
- {
- \seq_gput_right:Nn \g_@@_CJK_class_seq {#1}
- \tl_const:cn { \@@_CJK_class_tl:c { \@@_class_csname:n {#1} } } {#1}
- }
-\clist_map_function:nN
- { CJK , FullLeft , FullRight , CM , HangulJamo } \@@_save_CJK_class:n
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}[internal]{\xeCJK_class_num:n}
% |#1| 为字符类别名称，用于取得字符类别对应的编号。
% \begin{macrocode}
@@ -2889,15 +2870,45 @@
% \end{macro}
%
% \begin{macro}[internal]{\xeCJK_clear_Boundary_and_CJK_toks:}
+% \changes{v3.4.2}{2016/10/19}{提高效率，避免重复循环。}
% 清除边界与 CJK 文字、全角左右标点之间的内容。
% \begin{macrocode}
\cs_new_protected_nopar:Npn \xeCJK_clear_Boundary_and_CJK_toks:
- { \seq_map_function:NN \g_@@_CJK_class_seq \@@_clear_Boundary_and_CJK_toks:n }
-\cs_new_protected_nopar:Npn \@@_clear_Boundary_and_CJK_toks:n #1
- { \xeCJK_clear_inter_class_toks:nn { Boundary } {#1} }
+ { }
+\cs_new_protected_nopar:Npn \@@_update_clear_toks:n #1
+ {
+ \cs_gset_protected_nopar:Npx \xeCJK_clear_Boundary_and_CJK_toks:
+ {
+ \exp_not:o { \xeCJK_clear_Boundary_and_CJK_toks: }
+ \xetex_interchartoks:D
+ \xeCJK_class_num:n { Boundary } ~ \xeCJK_class_num:n {#1}
+ = { \exp_not:N \prg_do_nothing: }
+ }
+ }
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[internal,var]
+% {\g_@@_base_class_seq,\g_@@_non_CJK_class_seq,\g_@@_CJK_class_seq}
+% 保存宏包预先定义的字符类。
+% \begin{macrocode}
+\seq_new:N \g_@@_base_class_seq
+\seq_gset_eq:NN \g_@@_base_class_seq \g_@@_class_seq
+\seq_new:N \g_@@_non_CJK_class_seq
+\seq_gset_from_clist:Nn \g_@@_non_CJK_class_seq
+ { Default , HalfLeft , HalfRight , NormalSpace , Boundary }
+\seq_new:N \g_@@_CJK_class_seq
+\cs_new_protected_nopar:Npn \@@_save_CJK_class:n #1
+ {
+ \seq_gput_right:Nn \g_@@_CJK_class_seq {#1}
+ \tl_const:cn { \@@_CJK_class_tl:c { \@@_class_csname:n {#1} } } {#1}
+ \@@_update_clear_toks:n {#1}
+ }
+\clist_map_function:nN
+ { CJK , FullLeft , FullRight , CM , HangulJamo } \@@_save_CJK_class:n
+% \end{macrocode}
+% \end{macro}
+%
% \subsection{字符输出规则}
%
% \begin{center}
@@ -2999,7 +3010,10 @@
% \end{tabular}
% \end{center}
%
+% \changes{v3.4.2}{2016/10/19}{避免在破折号之间折行。}
+%
% \begin{macro}[internal]{\xeCJK_class_group_begin:,\xeCJK_class_group_end:}
+% 在 CJK 类开始时，设置 \tn{XeTeXdashbreakstate} 为零，避免破折号之间的折行。
% \begin{macrocode}
\cs_new_protected_nopar:Npn \xeCJK_class_group_begin:
{
@@ -3006,6 +3020,7 @@
\c_group_begin_token
\bool_set_true:N \l_@@_CJK_group_bool
\int_gset_eq:NN \g_@@_spacefactor_int \c_one_thousand
+ \int_zero:N \xetex_dashbreakstate:D
}
\bool_new:N \l_@@_CJK_group_bool
\cs_new_eq:NN \xeCJK_class_group_end: \c_group_end_token
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2016-10-25 20:40:09 UTC (rev 42353)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty 2016-10-25 20:40:25 UTC (rev 42354)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 10a8836 2016-08-27 11:02:24 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 7cdefd6 2016-10-25 17:38:55 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.4.1}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.2}{\ExplFileDescription}
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } }
\ProcessOptions \scan_stop:
\RequirePackage { xeCJK }
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2016-10-25 20:40:09 UTC (rev 42353)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg 2016-10-25 20:40:25 UTC (rev 42354)
@@ -6,10 +6,10 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx 10a8836 2016-08-27 11:02:24 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 7cdefd6 2016-10-25 17:38:55 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.4.1}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.2}{\ExplFileDescription}
%%
%%
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2016-10-25 20:40:09 UTC (rev 42353)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty 2016-10-25 20:40:25 UTC (rev 42354)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 10a8836 2016-08-27 11:02:24 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 7cdefd6 2016-10-25 17:38:55 +0800 Qing Lee <sobenlee at gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.4.1}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.2}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -534,19 +534,6 @@
"A960 -> "A97F ,
"D7B0 -> "D7FF
}
-\seq_new:N \g__xeCJK_base_class_seq
-\seq_gset_eq:NN \g__xeCJK_base_class_seq \g__xeCJK_class_seq
-\seq_new:N \g__xeCJK_non_CJK_class_seq
-\seq_gset_from_clist:Nn \g__xeCJK_non_CJK_class_seq
- { Default , HalfLeft , HalfRight , NormalSpace , Boundary }
-\seq_new:N \g__xeCJK_CJK_class_seq
-\cs_new_protected_nopar:Npn \__xeCJK_save_CJK_class:n #1
- {
- \seq_gput_right:Nn \g__xeCJK_CJK_class_seq {#1}
- \tl_const:cn { \__xeCJK_CJK_class_tl:c { \__xeCJK_class_csname:n {#1} } } {#1}
- }
-\clist_map_function:nN
- { CJK , FullLeft , FullRight , CM , HangulJamo } \__xeCJK_save_CJK_class:n
\cs_new_nopar:Npn \xeCJK_class_num:n #1 { \use:c { \__xeCJK_class_csname:n {#1} } }
\NewDocumentCommand \xeCJKDeclareCharClass { s > { \TrimSpaces } m m }
{
@@ -683,14 +670,37 @@
}
}
\cs_new_protected_nopar:Npn \xeCJK_clear_Boundary_and_CJK_toks:
- { \seq_map_function:NN \g__xeCJK_CJK_class_seq \__xeCJK_clear_Boundary_and_CJK_toks:n }
-\cs_new_protected_nopar:Npn \__xeCJK_clear_Boundary_and_CJK_toks:n #1
- { \xeCJK_clear_inter_class_toks:nn { Boundary } {#1} }
+ { }
+\cs_new_protected_nopar:Npn \__xeCJK_update_clear_toks:n #1
+ {
+ \cs_gset_protected_nopar:Npx \xeCJK_clear_Boundary_and_CJK_toks:
+ {
+ \exp_not:o { \xeCJK_clear_Boundary_and_CJK_toks: }
+ \xetex_interchartoks:D
+ \xeCJK_class_num:n { Boundary } ~ \xeCJK_class_num:n {#1}
+ = { \exp_not:N \prg_do_nothing: }
+ }
+ }
+\seq_new:N \g__xeCJK_base_class_seq
+\seq_gset_eq:NN \g__xeCJK_base_class_seq \g__xeCJK_class_seq
+\seq_new:N \g__xeCJK_non_CJK_class_seq
+\seq_gset_from_clist:Nn \g__xeCJK_non_CJK_class_seq
+ { Default , HalfLeft , HalfRight , NormalSpace , Boundary }
+\seq_new:N \g__xeCJK_CJK_class_seq
+\cs_new_protected_nopar:Npn \__xeCJK_save_CJK_class:n #1
+ {
+ \seq_gput_right:Nn \g__xeCJK_CJK_class_seq {#1}
+ \tl_const:cn { \__xeCJK_CJK_class_tl:c { \__xeCJK_class_csname:n {#1} } } {#1}
+ \__xeCJK_update_clear_toks:n {#1}
+ }
+\clist_map_function:nN
+ { CJK , FullLeft , FullRight , CM , HangulJamo } \__xeCJK_save_CJK_class:n
\cs_new_protected_nopar:Npn \xeCJK_class_group_begin:
{
\c_group_begin_token
\bool_set_true:N \l__xeCJK_CJK_group_bool
\int_gset_eq:NN \g__xeCJK_spacefactor_int \c_one_thousand
+ \int_zero:N \xetex_dashbreakstate:D
}
\bool_new:N \l__xeCJK_CJK_group_bool
\cs_new_eq:NN \xeCJK_class_group_end: \c_group_end_token
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2016-10-25 20:40:09 UTC (rev 42353)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty 2016-10-25 20:40:25 UTC (rev 42354)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 10a8836 2016-08-27 11:02:24 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 7cdefd6 2016-10-25 17:38:55 +0800 Qing Lee <sobenlee at gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.4.1}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.2}{\ExplFileDescription}
\PassOptionsToPackage { normalem } { ulem }
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } }
\ProcessOptions \scan_stop:
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2016-10-25 20:40:09 UTC (rev 42353)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty 2016-10-25 20:40:25 UTC (rev 42354)
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 10a8836 2016-08-27 11:02:24 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 7cdefd6 2016-10-25 17:38:55 +0800 Qing Lee <sobenlee at gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.4.1}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.2}{\ExplFileDescription}
\bool_if:nF
{
\sys_if_engine_xetex_p: ||
Modified: trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2016-10-25 20:40:09 UTC (rev 42353)
+++ trunk/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def 2016-10-25 20:40:25 UTC (rev 42354)
@@ -27,10 +27,10 @@
%%
%% ----------------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx 10a8836 2016-08-27 11:02:24 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 7cdefd6 2016-10-25 17:38:55 +0800 Qing Lee <sobenlee at gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.4.1}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.2}{\ExplFileDescription}
\DeclareUTFComposite\textsuperscript
\DeclareUTFComposite\textsubscript
\DeclareUTFEncodedAccent\textsbleftarrow{"20EE}{"20FF}
More information about the tex-live-commits
mailing list