summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-18 21:51:35 +0000
committerKarl Berry <karl@freefriends.org>2014-05-18 21:51:35 +0000
commitd64820a42321d65868c63bd49e657b88c58967bb (patch)
treeba840eb7c9cccac58db4b5c02b33b9e789bf95c2 /Master/texmf-dist/source
parent7e0c2c8912e1320987eca26917ad163b3405cba2 (diff)
xecjk (18may14)
git-svn-id: svn://tug.org/texlive/trunk@34111 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx77
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins4
2 files changed, 51 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index 6322a2bb99d..973717ab586 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
@@ -95,7 +95,7 @@ CJK scripts fonts (TrueType or OpenType).
\askforoverwritefalse
\preamble
-$Id: xeCJK.dtx 644 2014-04-29 09:45:49Z sobenlee $
+$Id: xeCJK.dtx 656 2014-05-13 03:14:47Z sobenlee $
$URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
-----------------------------------------------------------------
Author:
@@ -201,7 +201,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
%</!config&!xunextra>
-\GetIdInfo$Id: xeCJK.dtx 644 2014-04-29 09:45:49Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 656 2014-05-13 03:14:47Z sobenlee $
%<*driver|package>
{Typesetting CJK scripts with XeLaTeX}
%</driver|package>
@@ -223,7 +223,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%<fntef> {xeCJKfntef}
%<listings> {xeCJK-listings}
%<xunicode> {xunicode-addon}
- {\ExplFileDate}{3.2.11}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.12}{\ExplFileDescription}
%<xunextra>\ExplSyntaxOff
%<*driver>
\let\xeCJKrevnum\ExplFileVersion
@@ -351,7 +351,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \changes{v3.2.4}{2013/07/02}{遵循 \hologo{LaTeX3} 变量需要预先声明的原则。}
% \changes{v3.2.6}{2013/07/29}{\texttt{case} 类函数的用法与 \hologo{LaTeX3} 同步。}
%
-% \CheckSum{9005}
+% \CheckSum{9020}
% \GetFileInfo{\jobname.dtx}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -672,6 +672,14 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% 这一选项改变这一设置。
% \end{function}
%
+% \begin{function}[added=2014-05-13]{RubberPunctSkip}
+% \begin{syntax}
+% RubberPunctSkip = \meta{\TTF}
+% \end{syntax}
+% 缺省状态下,标点符号前/后的间距有一定的弹性。让本选项设置为 \texttt{false}
+% 可以禁用这一特性,从而使得前/后的间距为固定值。
+% \end{function}
+%
% \begin{function}[added=2012-12-02]{CheckFullRight}
% \begin{syntax}
% CheckFullRight = \meta{\TFF}
@@ -1407,6 +1415,20 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\xetex_if_engine:F { \msg_critical:nn { xeCJK } { Require-XeTeX } }
% \end{macrocode}
%
+% 应该使用较新版本的 \pkg{expl3} 宏包。
+% \begin{macrocode}
+\msg_new:nnn { xeCJK } { l3-too-old }
+ {
+ Support~package~`#1'~too~old. \\\\
+ Please~update~an~up~to~date~version~of~the~bundles\\\\
+ `l3kernel'~and~`l3packages'\\\\
+ using~your~TeX~package~manager~or~from~CTAN.\\
+ \str_if_eq:nnT {#1} { expl3 } { Loading~xeCJK~will~abort! }
+ }
+\@ifpackagelater { expl3 } { 2014/05/06 } { }
+ { \msg_critical:nnn { xeCJK } { l3-too-old } { expl3 } }
+% \end{macrocode}
+%
% \begin{macro}[pTF,internal]{\xeCJK_if_package_loaded:n}
% 判断宏包是否被引入,可用于文档正文中。
% \begin{macrocode}
@@ -1444,20 +1466,6 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
}
% \end{macrocode}
%
-% 应该使用较新版本的 \pkg{expl3} 宏包。
-% \begin{macrocode}
-\msg_new:nnn { xeCJK } { l3-too-old }
- {
- Support~package~`#1'~too~old. \\\\
- Please~update~an~up~to~date~version~of~the~bundles\\\\
- `l3kernel'~and~`l3packages'\\\\
- using~your~TeX~package~manager~or~from~CTAN.\\
- \str_if_eq:nnT {#1} { expl3 } { Loading~xeCJK~will~abort! }
- }
-\@ifpackagelater { expl3 } { 2014/01/01 } { }
- { \msg_critical:nnn { xeCJK } { l3-too-old } { expl3 } }
-% \end{macrocode}
-%
% 以下日期以前的 \pkg{xtemplate} 宏包关于 \cs{KeyValue} 的 Bug 会影响到后面
% 标点符号的处理。
% \begin{macrocode}
@@ -3198,15 +3206,17 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% 根据所选的标点处理方式在标点符号左/右增加的空白。
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_punct_glue:NN #1#2
+ { \@@_punct_hskip:n { \@@_punct_skip:nn {#1} {#2} } }
+\cs_new_eq:NN \@@_punct_hskip:n \skip_horizontal:n
+\cs_new_protected_nopar:Npn \@@_punct_rigid_skip:nn #1#2
+ { \@@_use_punct_dim:nnn { glue } {#1} {#2} }
+\cs_new_protected_nopar:Npn \@@_punct_rubber_skip:nn #1#2
{
- \@@_punct_hskip:n
- {
- \@@_use_punct_dim:nnn { glue } {#1} {#2}
- plus \@@_use_punct_dim:nnn { plus } {#1} {#2}
- minus \@@_use_punct_dim:nnn { minus } {#1} {#2}
- }
+ \@@_use_punct_dim:nnn { glue } {#1} {#2}
+ plus \@@_use_punct_dim:nnn { plus } {#1} {#2}
+ minus \@@_use_punct_dim:nnn { minus } {#1} {#2}
}
-\cs_new_eq:NN \@@_punct_hskip:n \skip_horizontal:n
+\cs_new_eq:NN \@@_punct_skip:nn \@@_punct_rubber_skip:nn
% \end{macrocode}
% \end{macro}
%
@@ -4163,9 +4173,11 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.2.12}{2014/05/12}{新增 \texttt{RubberPunctSkip} 选项。}
+%
% \begin{macro}
% {AllowBreakBetweenPuncts,KaiMingPunct,LongPunct,
-% MiddlePunct,PunctWidth,PunctBoundWidth}
+% MiddlePunct,PunctWidth,PunctBoundWidth,RubberPunctSkip}
% 相关选项声明。
% \begin{macrocode}
\keys_define:nn { xeCJK / options }
@@ -4194,7 +4206,13 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
PunctWidth .tl_gset:N = \g_@@_punct_width_tl ,
PunctBoundWidth .tl_gset:N = \g_@@_punct_bound_width_tl ,
PunctWidth .value_required: ,
- PunctBoundWidth .value_required:
+ PunctBoundWidth .value_required: ,
+ RubberPunctSkip .choice: ,
+ RubberPunctSkip .default:n = { true } ,
+ RubberPunctSkip / true .code:n =
+ { \cs_set_eq:NN \@@_punct_skip:nn \@@_punct_rubber_skip:nn } ,
+ RubberPunctSkip / false .code:n =
+ { \cs_set_eq:NN \@@_punct_skip:nn \@@_punct_rigid_skip:nn }
}
\bool_new:N \l_@@_punct_breakable_bool
% \end{macrocode}
@@ -4966,6 +4984,8 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
+% \changes{v3.2.12}{2014/05/12}{更新 \cs{int_to_Hex:n}。}
+%
% \begin{macro}[internal]{\xeCJK_fallback_loop:Nn}
% \changes{v3.1.0}{2012/11/19}{调整备用字体的循环方式。}
% \changes{v3.2.4}{2013/06/30}
@@ -4989,7 +5009,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
{
\@@_warning:nxxx { missing-glyph }
{ \l_xeCJK_family_tl } {#1}
- { \int_to_hexadecimal:n { `#1 } }
+ { \int_to_Hex:n { `#1 } }
\@@_fallback_save_CJKsymbol:N {#1}
}
{
@@ -6516,6 +6536,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
xeCJKactive = true ,
LocalConfig = true ,
LoadFandol = true ,
+ RubberPunctSkip = true ,
Verb = env ,
EmboldenFactor = 4 ,
SlantFactor = 0.167 ,
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
index e33c7b7ec8f..f8c9dfb341d 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `install')
%%
-%% $Id: xeCJK.dtx 644 2014-04-29 09:45:49Z sobenlee $
+%% $Id: xeCJK.dtx 656 2014-05-13 03:14:47Z sobenlee $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -37,7 +37,7 @@
\askforoverwritefalse
\preamble
-$Id: xeCJK.dtx 644 2014-04-29 09:45:49Z sobenlee $
+$Id: xeCJK.dtx 656 2014-05-13 03:14:47Z sobenlee $
$URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
-----------------------------------------------------------------
Author: