summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-30 23:24:42 +0000
committerKarl Berry <karl@freefriends.org>2013-12-30 23:24:42 +0000
commita735192b8064a28473fe52270470ac57a555aedb (patch)
treeb3519a6a6c0d1d267668a69ce1d4f09f64accc4a /Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
parent9e20deb048808f134469ae0d4a3e5bd3ddbc62b0 (diff)
xecjk (30dec13)
git-svn-id: svn://tug.org/texlive/trunk@32510 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty')
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty81
1 files changed, 69 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
index b253fe395e9..31b275dbe42 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `package')
%%
-%% $Id: xeCJK.dtx 533 2013-12-05 10:52:12Z sobenlee $
+%% $Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -33,11 +33,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 533 2013-12-05 10:52:12Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage
{\ExplFileName}
- {\ExplFileDate}{3.2.8}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.9}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -3669,25 +3669,77 @@
{
\textellipsis \textemdash \textperiodcentered \textcentereddot
\textquoteleft \textquoteright \textquotedblleft \textquotedblright
+ \textcdot \textgrq \textgrqq
}
{
\AtBeginUTFCommand [#1] { \__xeCJK_group_begin: \makexeCJKinactive }
\AtEndUTFCommand [#1] { \__xeCJK_group_end: }
}
-\__xeCJK_after_preamble:n
+\__xeCJK_after_end_preamble:n { \l__xeCJK_patch_Bxii_tl }
+\tl_new:N \l__xeCJK_patch_Bxii_tl
+\cs_new_protected_nopar:Npn \__xeCJK_patch_Bxii:nN #1#2
+ {
+ \tl_put_right:Nx \l__xeCJK_patch_Bxii_tl
+ { \__xeCJK_patch_Bxii:n { #1 \token_to_str:N #2 } }
+ }
+\group_begin:
+\cs_set:Npn \__xeCJK_tmp:w #1
{
- \tl_put_left:Nn \tipaencoding { \makexeCJKinactive }
- \cs_new_eq:NN \__xeCJK_aux_r:n \r
- \cs_set_nopar:Npn \r #1
+ \group_end:
+ \cs_new_protected_nopar:Npn \__xeCJK_patch_Bxii:nNN ##1##2##3
{
- \bool_if:nTF
+ \tl_put_right:Nx \l__xeCJK_patch_Bxii_tl
{
- \str_if_eq_x_p:nn { \f@encoding } { T1 } &&
- \str_if_eq_x_p:nn {#1} { u }
+ \__xeCJK_patch_Bxii:Nnn
+ #1 { ##1 \token_to_str:N ##2 } { \token_to_str:N ##3 }
}
- { { \makexeCJKinactive \__xeCJK_aux_r:n {#1} } }
- { \__xeCJK_aux_r:n {#1} }
}
+ }
+\use:n
+ {
+ \char_set_catcode_other:N \\
+ \__xeCJK_tmp:w
+ }
+ { \ }
+\cs_new_protected_nopar:Npn \__xeCJK_patch_Bxii:n #1
+ { \cs_if_free:cF {#1} { \cs_gset_eq:cN {#1} \__xeCJK_Default_Bxii: } }
+\cs_new_protected_nopar:Npn \__xeCJK_patch_Bxii:Nnn #1#2#3
+ { \cs_if_free:cF {#2} { \cs_gset_eq:cN { #1#2 - #3 } \__xeCJK_Default_Bxii: } }
+\group_begin:
+\char_set_catcode_other:n { 183 }
+\cs_new_protected_nopar:Npn \__xeCJK_Default_Bxii:
+ {
+ \int_compare:nNnTF \XeTeXinterchartokenstate > \c_zero
+ { \__xeCJK_group_begin: \makexeCJKinactive ^^b7 \__xeCJK_group_end: }
+ { ^^b7 }
+ }
+\group_end:
+\clist_map_inline:nn
+ {
+ { T3 } \textvibyy ,
+ { T2A } \cyrchvcrs ,
+ { T2B } \cyrchldsc ,
+ { T2C } \cyrabhha ,
+ { X2 } \cyrchldsc ,
+ { TS1 } \textperiodcentered ,
+ { LY1 } \textperiodcentered
+ }
+ { \__xeCJK_patch_Bxii:nN #1 }
+\clist_map_inline:nn
+ {
+ { T1 } \r u ,
+ { T4 } \B t ,
+ { T5 } \` \ecircumflex ,
+ { LGR } \accpsilivaria w
+ }
+ { \__xeCJK_patch_Bxii:nNN #1 }
+\tl_put_right:Nx \l__xeCJK_patch_Bxii_tl
+ {
+ \__xeCJK_patch_Bxii:n
+ { \token_to_str:N \T 5 \token_to_str:N \` - \token_to_str:N \^ - e }
+ }
+\__xeCJK_after_end_preamble:n
+ {
\xeCJK_if_package_loaded:nT { pifont }
{
\RenewDocumentCommand \Pifont { m }
@@ -3791,6 +3843,7 @@
%% xeCJKfntef.sty,
%% xeCJK-listings.sty,
%% xunicode-addon.sty,
+%% xunicode-extra.def,
%% xeCJK-example-autofake.tex,
%% xeCJK-example-fallback.tex,
%% xeCJK-example-subCJKblock.tex,
@@ -3801,6 +3854,10 @@
%% xeCJK-example-verbatim.tex,
%% xeCJK-example-IVS.tex,
%% xeCJK-example-listings.tex,
+%% xunicode-symbols.tex,
+%% xunicode-commands.tex,
+%% xunicode-combine-marks.tex,
+%% xunicode-symbols.pdf,
%% full-stop.tec,
%% fullwidth-stop.tec,
%% han-simp.tec,