summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2014-03-02 13:46:23 +0000
committerNorbert Preining <preining@logic.at>2014-03-02 13:46:23 +0000
commit766d9bbc3ad2de6c916ce68496922fe993550974 (patch)
tree2732239b79863ad65484ae346fb1ac3e545bdf91 /Master/texmf-dist
parent68cf9481abafda214fbf946c6c46f444b8a81c5a (diff)
xdcjk 3.2.10 (28Feb)
git-svn-id: svn://tug.org/texlive/trunk@33074 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-commands.tex62
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-symbols.tex9
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdfbin1187714 -> 1204452 bytes
-rw-r--r--Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdfbin344984 -> 345752 bytes
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx283
-rw-r--r--Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins16
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/config/xeCJK.cfg4
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty12
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty56
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty12
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty119
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def67
12 files changed, 498 insertions, 142 deletions
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-commands.tex b/Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-commands.tex
index 3200be42413..8688f11ff18 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-commands.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-commands.tex
@@ -547,15 +547,15 @@
\UnicodeTextSymbol{"02AB}{\textlzlig}{LATIN SMALL LETTER LZ DIGRAPH}
\UnicodeTextSymbol{"02AE}{\textlhtlongy}{LATIN SMALL LETTER TURNED H WITH FISHHOOK}
\UnicodeTextSymbol{"02AF}{\textvibyy}{LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL}
-\UnicodeTextSymbol{"02B0}{\textsuph}{MODIFIER LETTER SMALL H}
-\UnicodeTextSymbol{"02B1}{\textsuphth}{MODIFIER LETTER SMALL H WITH HOOK}
-\UnicodeTextSymbol{"02B2}{\textsupj}{MODIFIER LETTER SMALL J}
-\UnicodeTextSymbol{"02B3}{\textsupr}{MODIFIER LETTER SMALL R}
-\UnicodeTextSymbol{"02B4}{\textsupturnr}{MODIFIER LETTER SMALL TURNED R}
-\UnicodeTextSymbol{"02B5}{\textsupturnrrtail}{MODIFIER LETTER SMALL TURNED R WITH HOOK}
-\UnicodeTextSymbol{"02B6}{\textsupinvscr}{MODIFIER LETTER SMALL CAPITAL INVERTED R}
-\UnicodeTextSymbol{"02B7}{\textsupw}{MODIFIER LETTER SMALL W}
-\UnicodeTextSymbol{"02B8}{\textsupy}{MODIFIER LETTER SMALL Y}
+\UnicodeTextSymbol{"02B0}{\textsuph,\textsuperscript{h}}{MODIFIER LETTER SMALL H}
+\UnicodeTextSymbol{"02B1}{\textsuphth,\textsuperscript{\texthth}}{MODIFIER LETTER SMALL H WITH HOOK}
+\UnicodeTextSymbol{"02B2}{\textsupj,\textsuperscript{j}}{MODIFIER LETTER SMALL J}
+\UnicodeTextSymbol{"02B3}{\textsupr,\textsuperscript{r}}{MODIFIER LETTER SMALL R}
+\UnicodeTextSymbol{"02B4}{\textsupturnr,\textsuperscript{\textturnr}}{MODIFIER LETTER SMALL TURNED R}
+\UnicodeTextSymbol{"02B5}{\textsupturnrrtail,\textsuperscript{\textturnrrtail}}{MODIFIER LETTER SMALL TURNED R WITH HOOK}
+\UnicodeTextSymbol{"02B6}{\textsupinvscr,\textsuperscript{\textinvscr}}{MODIFIER LETTER SMALL CAPITAL INVERTED R}
+\UnicodeTextSymbol{"02B7}{\textsupw,\textsuperscript{w}}{MODIFIER LETTER SMALL W}
+\UnicodeTextSymbol{"02B8}{\textsupy,\textsuperscript{y}}{MODIFIER LETTER SMALL Y}
\UnicodeTextSymbol{"02B9}{\cprime,\textceltpal}{MODIFIER LETTER PRIME}
\UnicodeTextSymbol{"02BA}{\cdprime}{MODIFIER LETTER DOUBLE PRIME}
\UnicodeTextSymbol{"02BB}{\textturncomma}{MODIFIER LETTER TURNED COMMA}
@@ -595,11 +595,11 @@
\UnicodeTextSymbol{"02DD}{\textacutedbl,\textdoubleacute,\texthungarumlaut}{DOUBLE ACUTE ACCENT}
\UnicodeTextSymbol{"02DE}{\textrhoticity}{MODIFIER LETTER RHOTIC HOOK}
\UnicodeTextSymbol{"02DF}{\ipacrossaccent}{MODIFIER LETTER CROSS ACCENT}
-\UnicodeTextSymbol{"02E0}{\ipasupgamma}{MODIFIER LETTER SMALL GAMMA}
-\UnicodeTextSymbol{"02E1}{\ipasupl}{MODIFIER LETTER SMALL L}
-\UnicodeTextSymbol{"02E2}{\ipasups}{MODIFIER LETTER SMALL S}
-\UnicodeTextSymbol{"02E3}{\ipasupx}{MODIFIER LETTER SMALL X}
-\UnicodeTextSymbol{"02E4}{\ipasuprerglotstpp}{MODIFIER LETTER SMALL REVERSED GLOTTAL STOP}
+\UnicodeTextSymbol{"02E0}{\ipasupgamma,\textsuperscript{\textbabygamma},\textsuperscript{\textgammalatinsmall}}{MODIFIER LETTER SMALL GAMMA}
+\UnicodeTextSymbol{"02E1}{\ipasupl,\textsuperscript{l}}{MODIFIER LETTER SMALL L}
+\UnicodeTextSymbol{"02E2}{\ipasups,\textsuperscript{s}}{MODIFIER LETTER SMALL S}
+\UnicodeTextSymbol{"02E3}{\ipasupx,\textsuperscript{x}}{MODIFIER LETTER SMALL X}
+\UnicodeTextSymbol{"02E4}{\ipasuprerglotstpp,\textsuperscript{\textrevglotstop}}{MODIFIER LETTER SMALL REVERSED GLOTTAL STOP}
\UnicodeTextSymbol{"02E5}{\tonebarextrahigh,\stonebar{5},\tonebar{5}}{MODIFIER LETTER EXTRA-HIGH TONE BAR}
\UnicodeTextSymbol{"02E6}{\tonebarhigh,\stonebar{4},\tonebar{4}}{MODIFIER LETTER HIGH TONE BAR}
\UnicodeTextSymbol{"02E7}{\tonebarmiddle,\tonebarmid,\stonebar{3},\tonebar{3}}{MODIFIER LETTER MID TONE BAR}
@@ -1020,6 +1020,7 @@
\UnicodeTextSymbol{"1D49}{\textsuperscript{e}}{MODIFIER LETTER SMALL E}
\UnicodeTextSymbol{"1D4A}{\textsuperscript{\textreve}}{MODIFIER LETTER SMALL SCHWA}
\UnicodeTextSymbol{"1D4B}{\textsuperscript{\textepsilon},\textsuperscript{\epsilon}}{MODIFIER LETTER SMALL OPEN E}
+\UnicodeTextSymbol{"1D4C}{\textsuperscript{\textrevepsilon}}{MODIFIER LETTER SMALL TURNED OPEN E}
\UnicodeTextSymbol{"1D4D}{\textsuperscript{g}}{MODIFIER LETTER SMALL G}
\UnicodeTextSymbol{"1D4E}{\textsuperscript{!}}{MODIFIER LETTER SMALL TURNED I}
\UnicodeTextSymbol{"1D4F}{\textsuperscript{k}}{MODIFIER LETTER SMALL K}
@@ -1047,6 +1048,7 @@
\UnicodeTextSymbol{"1D68}{\textsubscript{\rho},\textrhoinferior}{GREEK SUBSCRIPT SMALL LETTER RHO}
\UnicodeTextSymbol{"1D69}{\textsubscript{\textvarphi},\textsubscript{\phi},\textphiinferior}{GREEK SUBSCRIPT SMALL LETTER PHI}
\UnicodeTextSymbol{"1D6A}{\textsubscript{\textchi},\textsubscript{\chi},\textchiinferior}{GREEK SUBSCRIPT SMALL LETTER CHI}
+\UnicodeTextSymbol{"1D78}{\textsuperscript{\cyrn}}{MODIFIER LETTER CYRILLIC EN}
\UnicodeTextSymbol{"1D7B}{\textbarsci}{LATIN SMALL CAPITAL LETTER I WITH STROKE}
\UnicodeTextSymbol{"1D7D}{\textbarp}{LATIN SMALL LETTER P WITH STROKE}
\UnicodeTextSymbol{"1D7E}{\textbarscu}{LATIN SMALL CAPITAL LETTER U WITH STROKE}
@@ -1089,6 +1091,7 @@
\UnicodeTextSymbol{"1DA4}{\textsuperscript{\textbari}}{MODIFIER LETTER SMALL I WITH STROKE}
\UnicodeTextSymbol{"1DA5}{\textsuperscript{\textiota}}{MODIFIER LETTER SMALL IOTA}
\UnicodeTextSymbol{"1DA6}{\textsuperscript{\textsci}}{MODIFIER LETTER SMALL CAPITAL I}
+\UnicodeTextSymbol{"1DA7}{\textsuperscript{\textbarsci}}{MODIFIER LETTER SMALL CAPITAL I WITH STROKE}
\UnicodeTextSymbol{"1DA8}{\textsuperscript{\textctj}}{MODIFIER LETTER SMALL J WITH CROSSED-TAIL}
\UnicodeTextSymbol{"1DA9}{\textsuperscript{\textrtaill}}{MODIFIER LETTER SMALL L WITH RETROFLEX HOOK}
\UnicodeTextSymbol{"1DAA}{\textsuperscript{\textlhookl}}{MODIFIER LETTER SMALL L WITH PALATAL HOOK}
@@ -1430,14 +1433,14 @@
\UnicodeTextSymbol{"2092}{\textsubscript{o},\textoinferior}{LATIN SUBSCRIPT SMALL LETTER O}
\UnicodeTextSymbol{"2093}{\textsubscript{x},\textxinferior}{LATIN SUBSCRIPT SMALL LETTER X}
\UnicodeTextSymbol{"2094}{\textsubscript{\schwa},\textsubscript{\textschwa},\textschwainferior}{LATIN SUBSCRIPT SMALL LETTER SCHWA}
-\UnicodeTextSymbol{"2095}{\texthinferior}{LATIN SUBSCRIPT SMALL LETTER H}
-\UnicodeTextSymbol{"2096}{\textkinferior}{LATIN SUBSCRIPT SMALL LETTER K}
-\UnicodeTextSymbol{"2097}{\textlinferior}{LATIN SUBSCRIPT SMALL LETTER L}
-\UnicodeTextSymbol{"2098}{\textminferior}{LATIN SUBSCRIPT SMALL LETTER M}
-\UnicodeTextSymbol{"2099}{\textninferior}{LATIN SUBSCRIPT SMALL LETTER N}
-\UnicodeTextSymbol{"209A}{\textpinferior}{LATIN SUBSCRIPT SMALL LETTER P}
-\UnicodeTextSymbol{"209B}{\textsinferior}{LATIN SUBSCRIPT SMALL LETTER S}
-\UnicodeTextSymbol{"209C}{\texttinferior}{LATIN SUBSCRIPT SMALL LETTER T}
+\UnicodeTextSymbol{"2095}{\textsubscript{h},\texthinferior}{LATIN SUBSCRIPT SMALL LETTER H}
+\UnicodeTextSymbol{"2096}{\textsubscript{k},\textkinferior}{LATIN SUBSCRIPT SMALL LETTER K}
+\UnicodeTextSymbol{"2097}{\textsubscript{l},\textlinferior}{LATIN SUBSCRIPT SMALL LETTER L}
+\UnicodeTextSymbol{"2098}{\textsubscript{m},\textminferior}{LATIN SUBSCRIPT SMALL LETTER M}
+\UnicodeTextSymbol{"2099}{\textsubscript{n},\textninferior}{LATIN SUBSCRIPT SMALL LETTER N}
+\UnicodeTextSymbol{"209A}{\textsubscript{p},\textpinferior}{LATIN SUBSCRIPT SMALL LETTER P}
+\UnicodeTextSymbol{"209B}{\textsubscript{s},\textsinferior}{LATIN SUBSCRIPT SMALL LETTER S}
+\UnicodeTextSymbol{"209C}{\textsubscript{t},\texttinferior}{LATIN SUBSCRIPT SMALL LETTER T}
\UnicodeTextSymbol{"20A1}{\textcolonmonetary}{COLON SIGN}
\UnicodeTextSymbol{"20A4}{\textlira}{LIRA SIGN}
\UnicodeTextSymbol{"20A6}{\textnaira}{NAIRA SIGN}
@@ -1464,13 +1467,13 @@
\UnicodeTextSymbol{"2129}{\textriota}{TURNED GREEK SMALL LETTER IOTA}
\UnicodeTextSymbol{"212B}{\textangstrom}{ANGSTROM SIGN}
\UnicodeTextSymbol{"212E}{\textestimated}{ESTIMATED SYMBOL}
-\UnicodeTextSymbol{"2132}{\textFinv,\textFinv}{TURNED CAPITAL F}
-\UnicodeTextSymbol{"2135}{\textaleph,\textaleph}{ALEF SYMBOL}
-\UnicodeTextSymbol{"2136}{\textbeth,\textbeth}{BET SYMBOL}
+\UnicodeTextSymbol{"2132}{\textFinv}{TURNED CAPITAL F}
+\UnicodeTextSymbol{"2135}{\textaleph}{ALEF SYMBOL}
+\UnicodeTextSymbol{"2136}{\textbeth}{BET SYMBOL}
\UnicodeTextSymbol{"2137}{\textgimel}{GIMEL SYMBOL}
-\UnicodeTextSymbol{"2138}{\textdaleth,\textdaleth}{DALET SYMBOL}
+\UnicodeTextSymbol{"2138}{\textdaleth}{DALET SYMBOL}
\UnicodeTextSymbol{"213B}{\textfax}{FACSIMILE SIGN}
-\UnicodeTextSymbol{"2141}{\textGame,\textGame}{TURNED SANS-SERIF CAPITAL G}
+\UnicodeTextSymbol{"2141}{\textGame}{TURNED SANS-SERIF CAPITAL G}
\UnicodeTextSymbol{"214B}{\textinvamp}{TURNED AMPERSAND}
\UnicodeTextSymbol{"2150}{\textoneseventh}{VULGAR FRACTION ONE SEVENTH}
\UnicodeTextSymbol{"2151}{\textoneninth}{VULGAR FRACTION ONE NINTH}
@@ -1888,7 +1891,7 @@
\UnicodeTextSymbol{"25D7}{\textRIGHTCIRCLE}{RIGHT HALF BLACK CIRCLE}
\UnicodeTextSymbol{"25E6}{\textopenbullet}{WHITE BULLET}
\UnicodeTextSymbol{"25EB}{\textboxbar}{WHITE SQUARE WITH VERTICAL BISECTING LINE}
-\UnicodeTextSymbol{"25EF}{\textbigcircle,\textbigcircle}{LARGE CIRCLE}
+\UnicodeTextSymbol{"25EF}{\textbigcircle}{LARGE CIRCLE}
\UnicodeTextSymbol{"2601}{\textCloud}{CLOUD}
\UnicodeTextSymbol{"2605}{\textFiveStar}{BLACK STAR}
\UnicodeTextSymbol{"2606}{\textFiveStarOpen}{WHITE STAR}
@@ -2173,6 +2176,7 @@
\UnicodeTextSymbol{"2B20}{\textpentagon}{WHITE PENTAGON}
\UnicodeTextSymbol{"2B21}{\textvarhexagon}{WHITE HEXAGON}
\UnicodeTextSymbol{"2C7C}{\textsubscript{j},\textjinferior}{LATIN SUBSCRIPT SMALL LETTER J}
+\UnicodeTextSymbol{"2C7D}{\textsuperscript{V}}{MODIFIER LETTER CAPITAL V}
\UnicodeTextSymbol{"2E13}{\textslashdiv}{DOTTED OBELOS}
\UnicodeTextSymbol{"2E18}{\textinterrobangdown}{INVERTED INTERROBANG}
\UnicodeTextSymbol{"2E2D}{\textfivedots}{FIVE DOT MARK}
@@ -2253,6 +2257,8 @@
\UnicodeTextSymbol{"A788}{\textcircumlow}{MODIFIER LETTER LOW CIRCUMFLEX ACCENT}
\UnicodeTextSymbol{"A78B}{\textcapitalsaltillo}{LATIN CAPITAL LETTER SALTILLO}
\UnicodeTextSymbol{"A78C}{\textsaltillo}{LATIN SMALL LETTER SALTILLO}
+\UnicodeTextSymbol{"A7F8}{\textsuperscript{\textHbar},\textsuperscript{\textHslash}}{MODIFIER LETTER CAPITAL H WITH STROKE}
+\UnicodeTextSymbol{"A7F9}{\textsuperscript{\oe}}{MODIFIER LETTER SMALL LIGATURE OE}
\UnicodeTextSymbol{"FB01}{\textfi}{LATIN SMALL LIGATURE FI}
\UnicodeTextSymbol{"FB02}{\textfl}{LATIN SMALL LIGATURE FL}
\UnicodeTextSymbol{"1D13B}{\textGaPa}{MUSICAL SYMBOL WHOLE REST}
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-symbols.tex b/Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-symbols.tex
index 646b27f2489..afc5f10b1a9 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-symbols.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example/xunicode-symbols.tex
@@ -39,7 +39,10 @@
^^@ \cs_set_eq:NN \DeclareTextAccent \use_none:nnn
^^@ \cs_set_eq:NN \DeclareUTFComposite \use_none:n
^^@ \cs_set_eq:NN \DeclareUTFEncodedAccent \use_none:nnn
+^^@ \cs_set_eq:NN \DeclareUTFDoubleEncodedAccent \use_none:nnn
+^^@ \cs_set_eq:NN \DeclareUTFDoubleEncodedSymbol \use_none:nnn
^^@ \cs_set_eq:NN \DeclareUTFCommand \use_none:nn
+^^@ \cs_set_eq:NN \DeclareUTFTIPACommand \use_none:n
^^@ \cs_set_eq:NN \DeclareUTFCompositeCommand \use_none:nnn
^^@ \cs_set_eq:NN \DeclareUTFSymbol \__xunsym_save_UTF_command:Nn
^^@ \cs_set_eq:NN \DeclareUTFCompositeSymbol \__xunsym_save_UTF_command:Nnn
@@ -130,8 +133,7 @@
\reverse_if:N \etex_iffontchar:D \tex_font:D #1 \exp_stop_f: \falllbackfont \fi:
\tex_char:D #1 \exp_stop_f: &
\tl_set:Nn \l_tmpa_clist {#2}
- \clist_use:Nnnn \l_tmpa_clist
- { \par } { \par } { \par }
+ \clist_use:Nn \l_tmpa_clist { \par }
\strut
& #3 \\
}
@@ -142,8 +144,7 @@
\use_none:n #1 ~ \use_none:n #2 &
\tex_char:D #1 \exp_stop_f: \tex_char:D #2 \exp_stop_f: &
\tl_set:Nn \l_tmpa_clist {#3}
- \clist_use:Nnnn \l_tmpa_clist
- { \par } { \par } { \par }
+ \clist_use:Nn \l_tmpa_clist { \par }
\strut \\
}
\DeclareDocumentCommand \UTFTABLE { m m }
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index 85018456fcf..eece64dc08e 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 3fe2d7784fe..6dbf3c151e7 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 a6eda0639d1..8aca28134f8 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 537 2013-12-08 13:01:40Z sobenlee $
+$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
$URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
-----------------------------------------------------------------
Author:
@@ -104,9 +104,9 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
Leo Liu <leoliu.pku@gmail.com>
Qing Lee <sobenlee@gmail.com>
- Copyright (C) 2007--2013 Wenchang Sun
- (C) 2009--2013 Leo Liu
- (C) 2012--2013 Qing Lee
+ Copyright (C) 2007--2014 Wenchang Sun
+ (C) 2009--2014 Leo Liu
+ (C) 2012--2014 Qing Lee
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -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 537 2013-12-08 13:01:40Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z 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.9}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.10}{\ExplFileDescription}
%<xunextra>\ExplSyntaxOff
%<*driver>
\let\xeCJKrevnum\ExplFileVersion
@@ -355,7 +355,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{8827}
+% \CheckSum{9023}
% \GetFileInfo{\jobname.dtx}
%
% \title{\bfseries\pkg{xeCJK} 宏包}
@@ -715,6 +715,14 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% 处理。以上选项的值除 \texttt{false} 外,都禁止在汉字之间和汉字与西文之间自动换行。
% \end{function}
%
+% \begin{function}[rEXP,added=2014-03-01]{LoadFandol}
+% \begin{syntax}
+% LoadFandol = \meta{\TTF}
+% \end{syntax}
+% 当没有在导言区设置 CJK 字体时,是否使用 Fandol 字体。如果启用这个选项,需要
+% 安装 \package{Fandol} 字体系列。
+% \end{function}
+%
% \subsection{字体设置与选择}
% \label{subsec:fontset}
%
@@ -5844,6 +5852,21 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{LoadFandol}
+% \changes{v3.2.10}{2014/03/01}{当没有设置字体时,使用 Fandol 字体系列。}
+% \begin{macrocode}
+\keys_define:nn { xeCJK / options }
+ { LoadFandol .bool_gset:N = \g_@@_fandol_bool }
+\cs_new_protected_nopar:Npn \@@_load_fandol:
+ {
+ \setCJKmainfont
+ [ BoldFont = FandolSong-Bold , ItalicFont = FandolKai ] { FandolSong-Regular }
+ \setCJKsansfont [ BoldFont = FandolHei-Bold ] { FandolHei-Regular }
+ \setCJKmonofont { FandolFang }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v3.1.2}{2013/01/01}{修正重定义 \cs{CJKfamilydefault} 无效的问题,恢复容错能力。}
%
% 在导言区结束的时候,若没有声明 CJK 字体,则给出一个警告。如果 \cs{CJKfamilydefault}
@@ -5870,7 +5893,19 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
}
\cs_undefine:N \@@_family_default_wrap:n
\prop_if_empty:NTF \g_@@_family_font_name_prop
- { \@@_warning:nx { no-CJKfamily } { \CJKfamilydefault } }
+ {
+ \bool_if:NTF \g_@@_fandol_bool
+ {
+ \@@_warning:n { fandol }
+ \@@_load_fandol:
+ \use:n
+ }
+ {
+ \@@_warning:nx { no-CJKfamily } { \CJKfamilydefault }
+ \use_none:n
+ }
+ }
+ { \use:n }
{
\xeCJK_family_if_exist:xF { \CJKfamilydefault }
{
@@ -5908,6 +5943,11 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
has~been~replaced~by~`\@@_msg_family_map:n {#2}'.\\\\
Try~to~use~`\@@_msg_def_family_map:n {#1}'~to~define~it.
}
+\@@_msg_new:nn { fandol }
+ {
+ Fandol~is~being~set~as~the~default~font~for~CJK~text.\\
+ Please~make~sure~it~has~been~properly~installed.
+ }
% \end{macrocode}
%
% \subsection{数学字体设置}
@@ -6465,6 +6505,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
xeCJKactive = true ,
LocalConfig = true ,
indentfirst = true ,
+ LoadFandol = true ,
Verb = env ,
EmboldenFactor = 4 ,
SlantFactor = 0.167 ,
@@ -7155,19 +7196,23 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \begin{macro}[internal]{\CJKaddEncHook}
% 为使用 \pkg{CJKnumb} 宏包而作一些处理。另外 \pkg{CJKnumb} 使用的是传统汉字“萬”
% 和“億”,我们在这里把它们修正为简体字。
+% \changes{v3.2.10}{2014/03/01}{使用 \pkg{CJKnumb} 时,让 \cs{Unicode} 有定义。}
% \begin{macrocode}
\cs_new_protected:Npn \CJKaddEncHook #1#2
{
\str_if_eq:nnT {#1} { \CJK@UnicodeEnc }
{
\group_begin:
- \cs_set_nopar:Npn \Unicode ##1##2
- { (##1) * \c_two_hundred_fifty_six + (##2) }
- \cs_set_eq:NN \def \xeCJK_char_from_charcode:Nn
- #2
+ \cs_set_eq:NN \Unicode \@@_calc_unicode:nn
+ \cs_set_eq:NN \def \xeCJK_char_from_charcode:Nn
+ #2
\group_end:
\tl_gset:Nn \CJK@tenthousand { ^^^^4e07 }
\tl_gset:Nn \CJK@hundredmillion { ^^^^4ebf }
+ \tl_if_exist:NF \CJK@UnicodeEnc
+ { \tl_const:Nn \CJK@UnicodeEnc { UTF8 } }
+ \cs_if_exist:NF \Unicode
+ { \cs_new_eq:NN \Unicode \xeCJK_unicode_char:nn }
}
}
\cs_new_protected_nopar:Npn \xeCJK_char_from_charcode:Nn #1#2
@@ -7180,6 +7225,10 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\tl_const:Nn #1 { ^^^^4e00 }
}
}
+\cs_new_nopar:Npn \@@_calc_unicode:nn #1#2
+ { (#1) * \c_two_hundred_fifty_six + (#2) }
+\cs_new_protected_nopar:Npn \xeCJK_unicode_char:nn #1#2
+ { \tex_char:D \etex_numexpr:D \@@_calc_unicode:nn {#1} {#2} \scan_stop: }
\bool_if:NT \g_@@_number_bool { \RequirePackage { CJKnumb } }
% \end{macrocode}
% \end{macro}
@@ -8741,6 +8790,22 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[internal]{\DeclareUTFDoubleEncodedAccent}
+% \changes{v3.2.10}{2014/02/20}{改进 \cs{t} 等的定义方式。}
+% \begin{macrocode}
+\NewDocumentCommand \DeclareUTFDoubleEncodedAccent { m O { \UTFencname } m m }
+ { \@@_declare_encoded:NNnnn \@@_combine_double_accent:nnNNn #1 {#2} {#3} {#4} }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{\DeclareUTFDoubleEncodedSymbol}
+% \changes{v3.2.10}{2014/02/21}{改进 \cs{sliding} 等的定义方式。}
+% \begin{macrocode}
+\NewDocumentCommand \DeclareUTFDoubleEncodedSymbol { m O { \UTFencname } m m }
+ { \@@_declare_encoded:NNnnn \@@_combine_double_symbol:nnNNn #1 {#2} {#3} {#4} }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[internal]{\@@_declare_composite:Nnn}
% 通过 \texttt{lowercase} 技巧,直接由重音符号的 Unicode 得到实际字符。
% \begin{macrocode}
@@ -8824,8 +8889,8 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%
% \begin{macro}[internal]{\@@_combine_symbol:nnNNn}
% \begin{macrocode}
-\cs_new_protected:Npn \@@_combine_symbol:nnNNn #1#2#3#4#5
- { \@@_text_combine:NnnNNn \@@_add_symbol:nnNN {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \@@_combine_symbol:nnNNn
+ { \@@_text_combine:NnnNNn \@@_add_symbol:nnNN }
\cs_new_protected:Npn \@@_add_symbol:nnNN #1#2#3#4
{
\tl_if_blank:nTF {#1}
@@ -8852,8 +8917,8 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \cs{XeTeXinputnormalization} 似乎是无效的,怀疑是使用 HarfBuzz 库替代 ICU 进行
% 字体排版的缘故\footnote{\url{http://tug.org/pipermail/xetex/2013-July/024579.html}}。
% \begin{macrocode}
-\cs_new_protected:Npn \@@_combine_accent:nnNNn #1#2#3#4#5
- { \@@_text_combine:NnnNNn \@@_add_accent:nnNN {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \@@_combine_accent:nnNNn
+ { \@@_text_combine:NnnNNn \@@_add_accent:nnNN }
\cs_new_protected:Npn \@@_add_accent:nnNN #1#2#3#4
{
\tl_if_blank:nTF {#1}
@@ -8877,8 +8942,8 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%
% \begin{macro}[internal]{\@@_combine_accents:nnNNn,\@@_add_accents:nnNN}
% \begin{macrocode}
-\cs_new_protected:Npn \@@_combine_accents:nnNNn #1#2#3#4#5
- { \@@_text_combine:NnnNNn \@@_add_accents:nnNN {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \@@_combine_accents:nnNNn
+ { \@@_text_combine:NnnNNn \@@_add_accents:nnNN }
\cs_new_protected:Npn \@@_add_accents:nnNN #1#2#3#4
{
\tl_if_blank:nTF {#1}
@@ -8896,12 +8961,12 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[internal]{\@@_combine_circle:nnNNn,\@@_add_circle:nnNN,\@@_add_circle:Nn}
+% \begin{macro}[internal]{\@@_combine_circle:nnNNn,\@@_add_circle:nnNN,\@@_add_circle:nN}
% 对圆圈中的数字或者字母适当缩小,以适合圆圈的大小。只有字体中存在
% \texttt{U+25EF} 时,才使用这里的设置,否则还还是 \LaTeX\ 中的设置。
% \begin{macrocode}
-\cs_new_protected:Npn \@@_combine_circle:nnNNn #1#2#3#4#5
- { \@@_text_combine:NnnNNn \@@_add_circle:nnNN {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \@@_combine_circle:nnNNn
+ { \@@_text_combine:NnnNNn \@@_add_circle:nnNN }
\cs_new_protected:Npn \@@_add_circle:nnNN #1#2#3#4
{
\tl_if_blank:nTF {#1}
@@ -8912,14 +8977,14 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
}
{
\@@_glyph_if_exist:nTF { `#4 }
- { \@@_add_circle:Nn #4 {#1} }
+ { \@@_add_circle:nN {#1} #4 }
{ \cs_if_exist_use:cTF { ? #2 } { {#1} } {#1} }
}
}
-\cs_new_protected:Npn \@@_add_circle:Nn #1#2
+\cs_new_protected:Npn \@@_add_circle:nN #1#2
{
- \hcoffin_set:Nn \l_@@_circle_coffin {#1}
- \hcoffin_set:Nn \l_@@_tmp_coffin {#2}
+ \hcoffin_set:Nn \l_@@_tmp_coffin {#1}
+ \hcoffin_set:Nn \l_@@_circle_coffin {#2}
\dim_set:Nn \l_@@_circle_width_dim
{ \fp_use:N \l_@@_circle_ratio_fp \coffin_wd:N \l_@@_circle_coffin }
\coffin_resize:Nnn \l_@@_tmp_coffin
@@ -8952,6 +9017,82 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[internal]{\@@_combine_double_accent:nnNNn}
+% 使 \cs{t} 等组合重音符号放在参数的第一个字母的右边。
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_combine_double_accent:nnNNn
+ { \@@_text_combine:NnnNNn \@@_add_double_accent:nnNN }
+\cs_new_protected:Npn \@@_add_double_accent:nnNN #1#2#3#4
+ {
+ \tl_if_blank:nTF {#1}
+ {
+ \@@_glyph_if_exist:nTF { `#4 }
+ {#4}
+ { \cs_if_exist_use:cTF { ? #2 } { {#1} } {#4} }
+ }
+ {
+ \@@_glyph_if_exist:nTF { `#3 }
+ { \@@_add_double_symbol:nN {#1} #3 }
+ {
+ \@@_glyph_if_exist:nTF { `#4 }
+ { \add@accent { `#4 } {#1} }
+ { \cs_if_exist_use:cTF { ? #2 } { {#1} } { #1#3 } }
+ }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{\@@_combine_double_symbol:nnNNn}
+% 使 \cs{sliding} 等组合重音符号放在参数的第一个字母的右边。
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_combine_double_symbol:nnNNn
+ { \@@_text_combine:NnnNNn \@@_add_double_symbol:nnNN }
+\cs_new_protected:Npn \@@_add_double_symbol:nnNN #1#2#3#4
+ {
+ \tl_if_blank:nTF {#1}
+ {
+ \@@_glyph_if_exist:nTF { `#4 }
+ {#4}
+ { \cs_if_exist_use:cTF { ? #2 } { {#1} } {#4} }
+ }
+ {
+ \@@_glyph_if_exist:nTF { `#3 }
+ { \@@_add_double_symbol:nN {#1} #3 }
+ { \cs_if_exist_use:cTF { ? #2 } { {#1} } { #1#3 } }
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{\@@_add_double_symbol:nN}
+% 如果参数的第一个记号是字母类、其它符号类或者由 \cs{chardef} 定义,则将组合符号
+% 放在它的右边,否则不作处理。
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_add_double_symbol:nN #1#2
+ {
+ \tl_if_head_is_N_type:nTF {#1}
+ {
+ \exp_after:wN \exp_after:wN \exp_after:wN
+ \@@_add_double_symbol_aux:NnN \exp_after:wN \exp_after:wN
+ \tl_head:w #1 \q_stop \exp_after:wN { \use_none:n #1 } #2
+ }
+ { #1#2 }
+ }
+\cs_new_protected:Npn \@@_add_double_symbol_aux:NnN #1#2#3
+ {
+ \bool_if:nTF
+ {
+ \token_if_letter_p:N #1 ||
+ \token_if_other_p:N #1 ||
+ \token_if_chardef_p:N #1
+ }
+ { #1#3#2 }
+ { #1#2#3 }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}[internal]{\AtBeginUTFCommand,\AtEndUTFCommand}
% 设置在符号命令前后使用的钩子,可选参数用于指定单个符号命名。可以用 |#1|
% 引用带参数的组合符号命令的参数或者符号命令对应的符号。
@@ -9020,6 +9161,34 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[internal]{\DeclareUTFTIPACommand}
+% \changes{v3.2.10}{2014/02/20}{检查 \cs{t} 和 \cs{sliding} 的参数是否以 \cs{textipa} 开头。}
+% \begin{macrocode}
+\NewDocumentCommand \DeclareUTFTIPACommand { O { \UTFencname } m }
+ { \use:x { \@@_text_tipa_command:Nnn \exp_not:N #2 { \token_to_str:N #2 } {#1} } }
+\cs_new_protected:Npn \@@_text_tipa_command:Nnn #1#2#3
+ {
+ \cs_set_eq:cc { UTF/#3#2 } { #3#2 }
+ \DeclareTextCommand #1 {#3} { \@@_text_tipa_command:nnn {#3} {#2} }
+ }
+\cs_new_protected:Npn \@@_text_tipa_command:nnn #1#2#3
+ {
+ \exp_after:wN \@@_check_for_tipa:NNn
+ \cs:w \use_none:n #2 \exp_after:wN \cs_end:
+ \cs:w UTF/#1#2 \cs_end: {#3}
+ }
+\cs_new_protected:Npn \@@_check_for_tipa:NNn #1#2#3
+ {
+ \tl_if_head_eq_meaning:nNTF {#3} \textipa
+ {
+ \exp_after:wN \tipacatchonechar \exp_after:wN
+ { \exp_after:wN #1 \use_none:n #3 }
+ }
+ { #2 {#3} }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v3.2.8}{2013/12/05}{启用 \pkg{xunicode} 中的带圈数字和字母设置。}
%
% \begin{macrocode}
@@ -9076,12 +9245,19 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\DeclareUTFEncodedAccent\textrightarrowhead{"0350}{"02C3}
\DeclareUTFEncodedAccent\textlefthalfring{"0351}{"02D3}
\DeclareUTFEncodedAccent\textrighthalfring{"0357}{"02D2}
-\DeclareUTFEncodedAccent\textdoubletilde{"0360}{"0360}
-\DeclareUTFEncodedAccent\t{"0361}{"0361}
-\DeclareUTFEncodedAccent\textdoublebreve{"035D}{"035D}
-\DeclareUTFEncodedAccent\textdoublemacron{"035E}{"035E}
-\DeclareUTFEncodedAccent\capitaltie{"0361}{"0361}
-\DeclareUTFEncodedAccent\texttoptiebar{"0361}{"0361}
+\DeclareUTFDoubleEncodedSymbol\textdoublebrevebelow{"035C}{"035C}
+\DeclareUTFDoubleEncodedAccent\textdoublebreve{"035D}{"035D}
+\DeclareUTFDoubleEncodedAccent\textdoublemacron{"035E}{"035E}
+\DeclareUTFDoubleEncodedSymbol\textdoublemacronbelow{"035F}{"035F}
+\DeclareUTFDoubleEncodedAccent\textdoubletilde{"0360}{"0360}
+\DeclareUTFDoubleEncodedAccent\t{"0361}{"0361}
+\DeclareUTFDoubleEncodedAccent\capitaltie{"0361}{"0361}
+\DeclareUTFDoubleEncodedAccent\texttoptiebar{"0361}{"0361}
+\DeclareUTFDoubleEncodedSymbol\sliding{"0362}{"0362}
+\DeclareUTFTIPACommand\t
+\DeclareUTFTIPACommand\capitaltie
+\DeclareUTFTIPACommand\texttoptiebar
+\DeclareUTFTIPACommand\sliding
\DeclareUTFEncodedAccent\texthighrise{"1DC4}{"1DC4}
\DeclareUTFEncodedAccent\textlowrise{"1DC5}{"1DC5}
\DeclareUTFEncodedAccent\textrisefall{"1DC8}{"1DC8}
@@ -9203,6 +9379,36 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\DeclareUTFCompositeSymbol\textcircled{x}{"24E7}
\DeclareUTFCompositeSymbol\textcircled{y}{"24E8}
\DeclareUTFCompositeSymbol\textcircled{z}{"24E9}
+\DeclareUTFCompositeSymbol\textsuperscript{h}{"02B0}
+\DeclareUTFCompositeSymbol\textsuperscript{\texthth}{"02B1}
+\DeclareUTFCompositeSymbol\textsuperscript{j}{"02B2}
+\DeclareUTFCompositeSymbol\textsuperscript{r}{"02B3}
+\DeclareUTFCompositeSymbol\textsuperscript{\textturnr}{"02B4}
+\DeclareUTFCompositeSymbol\textsuperscript{\textturnrrtail}{"02B5}
+\DeclareUTFCompositeSymbol\textsuperscript{\textinvscr}{"02B6}
+\DeclareUTFCompositeSymbol\textsuperscript{w}{"02B7}
+\DeclareUTFCompositeSymbol\textsuperscript{y}{"02B8}
+\DeclareUTFCompositeSymbol\textsuperscript{\textbabygamma}{"02E0}
+\DeclareUTFCompositeSymbol\textsuperscript{\textgammalatinsmall}{"02E0}
+\DeclareUTFCompositeSymbol\textsuperscript{l}{"02E1}
+\DeclareUTFCompositeSymbol\textsuperscript{s}{"02E2}
+\DeclareUTFCompositeSymbol\textsuperscript{x}{"02E3}
+\DeclareUTFCompositeSymbol\textsuperscript{\textrevglotstop}{"02E4}
+\DeclareUTFCompositeSymbol\textsuperscript{\textrevepsilon}{"1D4C}
+\DeclareUTFCompositeSymbol\textsuperscript{\cyrn}{"1D78}
+\DeclareUTFCompositeSymbol\textsuperscript{\textbarsci}{"1DA7}
+\DeclareUTFCompositeSymbol\textsuperscript{V}{"2C7D}
+\DeclareUTFCompositeSymbol\textsuperscript{\textHbar}{"A7F8}
+\DeclareUTFCompositeSymbol\textsuperscript{\textHslash}{"A7F8}
+\DeclareUTFCompositeSymbol\textsuperscript{\oe}{"A7F9}
+\DeclareUTFCompositeSymbol\textsubscript{h}{"2095}
+\DeclareUTFCompositeSymbol\textsubscript{k}{"2096}
+\DeclareUTFCompositeSymbol\textsubscript{l}{"2097}
+\DeclareUTFCompositeSymbol\textsubscript{m}{"2098}
+\DeclareUTFCompositeSymbol\textsubscript{n}{"2099}
+\DeclareUTFCompositeSymbol\textsubscript{p}{"209A}
+\DeclareUTFCompositeSymbol\textsubscript{s}{"209B}
+\DeclareUTFCompositeSymbol\textsubscript{t}{"209C}
% \end{macrocode}
%
% \changes{v3.2.9}{2013/12/07}
@@ -9692,12 +9898,7 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\DeclareUTFSymbol\textRe{"211C}
\DeclareUTFSymbol\textriota{"2129}
\DeclareUTFSymbol\textangstrom{"212B}
-\DeclareUTFSymbol\textFinv{"2132}
-\DeclareUTFSymbol\textaleph{"2135}
-\DeclareUTFSymbol\textbeth{"2136}
-\DeclareUTFSymbol\textdaleth{"2138}
\DeclareUTFSymbol\textfax{"213B}
-\DeclareUTFSymbol\textGame{"2141}
\DeclareUTFSymbol\textinvamp{"214B}
\DeclareUTFSymbol\textoneseventh{"2150}
\DeclareUTFSymbol\textoneninth{"2151}
@@ -10073,7 +10274,6 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
\DeclareUTFSymbol\textLEFTCIRCLE{"25D6}
\DeclareUTFSymbol\textRIGHTCIRCLE{"25D7}
\DeclareUTFSymbol\textboxbar{"25EB}
-\DeclareUTFSymbol\textbigcircle{"25EF}
\DeclareUTFSymbol\textCloud{"2601}
\DeclareUTFSymbol\textFiveStar{"2605}
\DeclareUTFSymbol\textFiveStarOpen{"2606}
@@ -11093,7 +11293,10 @@ int main()
^^@ \cs_set_eq:NN \DeclareTextAccent \use_none:nnn
^^@ \cs_set_eq:NN \DeclareUTFComposite \use_none:n
^^@ \cs_set_eq:NN \DeclareUTFEncodedAccent \use_none:nnn
+^^@ \cs_set_eq:NN \DeclareUTFDoubleEncodedAccent \use_none:nnn
+^^@ \cs_set_eq:NN \DeclareUTFDoubleEncodedSymbol \use_none:nnn
^^@ \cs_set_eq:NN \DeclareUTFCommand \use_none:nn
+^^@ \cs_set_eq:NN \DeclareUTFTIPACommand \use_none:n
^^@ \cs_set_eq:NN \DeclareUTFCompositeCommand \use_none:nnn
^^@ \cs_set_eq:NN \DeclareUTFSymbol \@@_save_UTF_command:Nn
^^@ \cs_set_eq:NN \DeclareUTFCompositeSymbol \@@_save_UTF_command:Nnn
@@ -11184,8 +11387,7 @@ int main()
\reverse_if:N \etex_iffontchar:D \tex_font:D #1 \exp_stop_f: \falllbackfont \fi:
\tex_char:D #1 \exp_stop_f: &
\tl_set:Nn \l_tmpa_clist {#2}
- \clist_use:Nnnn \l_tmpa_clist
- { \par } { \par } { \par }
+ \clist_use:Nn \l_tmpa_clist { \par }
\strut
& #3 \\
}
@@ -11196,8 +11398,7 @@ int main()
\use_none:n #1 ~ \use_none:n #2 &
\tex_char:D #1 \exp_stop_f: \tex_char:D #2 \exp_stop_f: &
\tl_set:Nn \l_tmpa_clist {#3}
- \clist_use:Nnnn \l_tmpa_clist
- { \par } { \par } { \par }
+ \clist_use:Nn \l_tmpa_clist { \par }
\strut \\
}
\DeclareDocumentCommand \UTFTABLE { m m }
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
index 2fd389f304e..b8ab2e55ecc 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 537 2013-12-08 13:01:40Z sobenlee $
+%% $Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -15,9 +15,9 @@
%% Leo Liu <leoliu.pku@gmail.com>
%% Qing Lee <sobenlee@gmail.com>
%%
-%% Copyright (C) 2007--2013 Wenchang Sun
-%% (C) 2009--2013 Leo Liu
-%% (C) 2012--2013 Qing Lee
+%% Copyright (C) 2007--2014 Wenchang Sun
+%% (C) 2009--2014 Leo Liu
+%% (C) 2012--2014 Qing Lee
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -37,7 +37,7 @@
\askforoverwritefalse
\preamble
-$Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
$URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
-----------------------------------------------------------------
Author:
@@ -46,9 +46,9 @@ $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
Leo Liu <leoliu.pku@gmail.com>
Qing Lee <sobenlee@gmail.com>
- Copyright (C) 2007--2013 Wenchang Sun
- (C) 2009--2013 Leo Liu
- (C) 2012--2013 Qing Lee
+ Copyright (C) 2007--2014 Wenchang Sun
+ (C) 2009--2014 Leo Liu
+ (C) 2012--2014 Qing Lee
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/config/xeCJK.cfg b/Master/texmf-dist/tex/xelatex/xecjk/config/xeCJK.cfg
index 3df443662dd..0fff3a187b1 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/config/xeCJK.cfg
+++ b/Master/texmf-dist/tex/xelatex/xecjk/config/xeCJK.cfg
@@ -6,11 +6,11 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
{Configuration file for xeCJK package}
\ProvidesExplFile
{\ExplFileName.cfg}
- {\ExplFileDate}{3.2.9}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.10}{\ExplFileDescription}
%%
%%
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
index 14976a9a2c7..e9624519555 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `listings')
%%
-%% $Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+%% $Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -15,9 +15,9 @@
%% Leo Liu <leoliu.pku@gmail.com>
%% Qing Lee <sobenlee@gmail.com>
%%
-%% Copyright (C) 2007--2013 Wenchang Sun
-%% (C) 2009--2013 Leo Liu
-%% (C) 2012--2013 Qing Lee
+%% Copyright (C) 2007--2014 Wenchang Sun
+%% (C) 2009--2014 Leo Liu
+%% (C) 2012--2014 Qing Lee
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -33,11 +33,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
{xeCJK patch file for listings}
\ProvidesExplPackage
{xeCJK-listings}
- {\ExplFileDate}{3.2.9}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.10}{\ExplFileDescription}
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } }
\ProcessOptions \scan_stop:
\RequirePackage { xeCJK }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
index 31b275dbe42..5f586a2ffcb 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 537 2013-12-08 13:01:40Z sobenlee $
+%% $Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -15,9 +15,9 @@
%% Leo Liu <leoliu.pku@gmail.com>
%% Qing Lee <sobenlee@gmail.com>
%%
-%% Copyright (C) 2007--2013 Wenchang Sun
-%% (C) 2009--2013 Leo Liu
-%% (C) 2012--2013 Qing Lee
+%% Copyright (C) 2007--2014 Wenchang Sun
+%% (C) 2009--2014 Leo Liu
+%% (C) 2012--2014 Qing Lee
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -33,11 +33,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage
{\ExplFileName}
- {\ExplFileDate}{3.2.9}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.10}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -2926,6 +2926,15 @@
}
\cs_generate_variant:Nn \prop_get:NnN { Nx }
\cs_generate_variant:Nn \prop_get:NnNTF { Nx }
+\keys_define:nn { xeCJK / options }
+ { LoadFandol .bool_gset:N = \g__xeCJK_fandol_bool }
+\cs_new_protected_nopar:Npn \__xeCJK_load_fandol:
+ {
+ \setCJKmainfont
+ [ BoldFont = FandolSong-Bold , ItalicFont = FandolKai ] { FandolSong-Regular }
+ \setCJKsansfont [ BoldFont = FandolHei-Bold ] { FandolHei-Regular }
+ \setCJKmonofont { FandolFang }
+ }
\__xeCJK_at_end_preamble:n
{
\cs_set_eq:NN \__xeCJK_family_default_wrap:n \exp_not:n
@@ -2944,7 +2953,19 @@
}
\cs_undefine:N \__xeCJK_family_default_wrap:n
\prop_if_empty:NTF \g__xeCJK_family_font_name_prop
- { \__xeCJK_warning:nx { no-CJKfamily } { \CJKfamilydefault } }
+ {
+ \bool_if:NTF \g__xeCJK_fandol_bool
+ {
+ \__xeCJK_warning:n { fandol }
+ \__xeCJK_load_fandol:
+ \use:n
+ }
+ {
+ \__xeCJK_warning:nx { no-CJKfamily } { \CJKfamilydefault }
+ \use_none:n
+ }
+ }
+ { \use:n }
{
\xeCJK_family_if_exist:xF { \CJKfamilydefault }
{
@@ -2982,6 +3003,11 @@
has~been~replaced~by~`\__xeCJK_msg_family_map:n {#2}'.\\\\
Try~to~use~`\__xeCJK_msg_def_family_map:n {#1}'~to~define~it.
}
+\__xeCJK_msg_new:nn { fandol }
+ {
+ Fandol~is~being~set~as~the~default~font~for~CJK~text.\\
+ Please~make~sure~it~has~been~properly~installed.
+ }
\keys_define:nn { xeCJK / options } { CJKmath .bool_gset:N = \g__xeCJK_math_bool }
\NewDocumentCommand \setCJKmathfont { O { } m }
{ \xeCJK_set_family:xxx { \c__xeCJK_math_tl } {#1} {#2} }
@@ -3386,6 +3412,7 @@
xeCJKactive = true ,
LocalConfig = true ,
indentfirst = true ,
+ LoadFandol = true ,
Verb = env ,
EmboldenFactor = 4 ,
SlantFactor = 0.167 ,
@@ -3804,13 +3831,16 @@
\str_if_eq:nnT {#1} { \CJK@UnicodeEnc }
{
\group_begin:
- \cs_set_nopar:Npn \Unicode ##1##2
- { (##1) * \c_two_hundred_fifty_six + (##2) }
- \cs_set_eq:NN \def \xeCJK_char_from_charcode:Nn
- #2
+ \cs_set_eq:NN \Unicode \__xeCJK_calc_unicode:nn
+ \cs_set_eq:NN \def \xeCJK_char_from_charcode:Nn
+ #2
\group_end:
\tl_gset:Nn \CJK@tenthousand { ^^^^4e07 }
\tl_gset:Nn \CJK@hundredmillion { ^^^^4ebf }
+ \tl_if_exist:NF \CJK@UnicodeEnc
+ { \tl_const:Nn \CJK@UnicodeEnc { UTF8 } }
+ \cs_if_exist:NF \Unicode
+ { \cs_new_eq:NN \Unicode \xeCJK_unicode_char:nn }
}
}
\cs_new_protected_nopar:Npn \xeCJK_char_from_charcode:Nn #1#2
@@ -3823,6 +3853,10 @@
\tl_const:Nn #1 { ^^^^4e00 }
}
}
+\cs_new_nopar:Npn \__xeCJK_calc_unicode:nn #1#2
+ { (#1) * \c_two_hundred_fifty_six + (#2) }
+\cs_new_protected_nopar:Npn \xeCJK_unicode_char:nn #1#2
+ { \tex_char:D \etex_numexpr:D \__xeCJK_calc_unicode:nn {#1} {#2} \scan_stop: }
\bool_if:NT \g__xeCJK_number_bool { \RequirePackage { CJKnumb } }
\bool_if:NT \g__xeCJK_config_bool
{
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
index c2f242c849f..98abe872794 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `fntef')
%%
-%% $Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+%% $Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -15,9 +15,9 @@
%% Leo Liu <leoliu.pku@gmail.com>
%% Qing Lee <sobenlee@gmail.com>
%%
-%% Copyright (C) 2007--2013 Wenchang Sun
-%% (C) 2009--2013 Leo Liu
-%% (C) 2012--2013 Qing Lee
+%% Copyright (C) 2007--2014 Wenchang Sun
+%% (C) 2009--2014 Leo Liu
+%% (C) 2012--2014 Qing Lee
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -33,11 +33,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
{xeCJK patch file for ulem/CJKfntef}
\ProvidesExplPackage
{xeCJKfntef}
- {\ExplFileDate}{3.2.9}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.10}{\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 08077672bc6..83a3b0f01e3 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `xunicode')
%%
-%% $Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+%% $Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -15,9 +15,9 @@
%% Leo Liu <leoliu.pku@gmail.com>
%% Qing Lee <sobenlee@gmail.com>
%%
-%% Copyright (C) 2007--2013 Wenchang Sun
-%% (C) 2009--2013 Leo Liu
-%% (C) 2012--2013 Qing Lee
+%% Copyright (C) 2007--2014 Wenchang Sun
+%% (C) 2009--2014 Leo Liu
+%% (C) 2012--2014 Qing Lee
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -33,11 +33,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
{addon file for xunicode}
\ProvidesExplPackage
{xunicode-addon}
- {\ExplFileDate}{3.2.9}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.10}{\ExplFileDescription}
\pdftex_if_engine:T
{
\msg_new:nnnn { xunicode-addon } { cannot-use-pdftex }
@@ -303,6 +303,10 @@
{ \DeclareUTFEncodedSymbol #2 [#1] { "#3 } { "0#4 } }
\RenewDocumentCommand \DeclareEncodedCompositeAccents { m m m m }
{ \DeclareUTFEncodedAccents #2 [#1] { "#4 } { "#3 } }
+\NewDocumentCommand \DeclareUTFDoubleEncodedAccent { m O { \UTFencname } m m }
+ { \__xunadd_declare_encoded:NNnnn \__xunadd_combine_double_accent:nnNNn #1 {#2} {#3} {#4} }
+\NewDocumentCommand \DeclareUTFDoubleEncodedSymbol { m O { \UTFencname } m m }
+ { \__xunadd_declare_encoded:NNnnn \__xunadd_combine_double_symbol:nnNNn #1 {#2} {#3} {#4} }
\cs_new_protected:Npn \__xunadd_declare_composite:Nnn #1#2#3
{ \DeclareTextCommand #1 {#3} { \__xunadd_text_composite:nnn {#2} {#3} } }
\cs_new_protected:Npn \__xunadd_text_composite:nnn #1#2#3
@@ -360,8 +364,8 @@
{#1}
}
\cs_generate_variant:Nn \__xunadd_text_combine:NNnNNn { c }
-\cs_new_protected:Npn \__xunadd_combine_symbol:nnNNn #1#2#3#4#5
- { \__xunadd_text_combine:NnnNNn \__xunadd_add_symbol:nnNN {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \__xunadd_combine_symbol:nnNNn
+ { \__xunadd_text_combine:NnnNNn \__xunadd_add_symbol:nnNN }
\cs_new_protected:Npn \__xunadd_add_symbol:nnNN #1#2#3#4
{
\tl_if_blank:nTF {#1}
@@ -376,8 +380,8 @@
{ \cs_if_exist_use:cTF { ? #2 } { {#1} } { #1#3 } }
}
}
-\cs_new_protected:Npn \__xunadd_combine_accent:nnNNn #1#2#3#4#5
- { \__xunadd_text_combine:NnnNNn \__xunadd_add_accent:nnNN {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \__xunadd_combine_accent:nnNNn
+ { \__xunadd_text_combine:NnnNNn \__xunadd_add_accent:nnNN }
\cs_new_protected:Npn \__xunadd_add_accent:nnNN #1#2#3#4
{
\tl_if_blank:nTF {#1}
@@ -396,8 +400,8 @@
}
}
}
-\cs_new_protected:Npn \__xunadd_combine_accents:nnNNn #1#2#3#4#5
- { \__xunadd_text_combine:NnnNNn \__xunadd_add_accents:nnNN {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \__xunadd_combine_accents:nnNNn
+ { \__xunadd_text_combine:NnnNNn \__xunadd_add_accents:nnNN }
\cs_new_protected:Npn \__xunadd_add_accents:nnNN #1#2#3#4
{
\tl_if_blank:nTF {#1}
@@ -412,8 +416,8 @@
{ \cs_if_exist_use:cTF { ? #2 } { {#1} } { #1#3#4 } }
}
}
-\cs_new_protected:Npn \__xunadd_combine_circle:nnNNn #1#2#3#4#5
- { \__xunadd_text_combine:NnnNNn \__xunadd_add_circle:nnNN {#1} {#2} {#3} {#4} {#5} }
+\cs_new_protected:Npn \__xunadd_combine_circle:nnNNn
+ { \__xunadd_text_combine:NnnNNn \__xunadd_add_circle:nnNN }
\cs_new_protected:Npn \__xunadd_add_circle:nnNN #1#2#3#4
{
\tl_if_blank:nTF {#1}
@@ -424,14 +428,14 @@
}
{
\__xunadd_glyph_if_exist:nTF { `#4 }
- { \__xunadd_add_circle:Nn #4 {#1} }
+ { \__xunadd_add_circle:nN {#1} #4 }
{ \cs_if_exist_use:cTF { ? #2 } { {#1} } {#1} }
}
}
-\cs_new_protected:Npn \__xunadd_add_circle:Nn #1#2
+\cs_new_protected:Npn \__xunadd_add_circle:nN #1#2
{
- \hcoffin_set:Nn \l__xunadd_circle_coffin {#1}
- \hcoffin_set:Nn \l__xunadd_tmp_coffin {#2}
+ \hcoffin_set:Nn \l__xunadd_tmp_coffin {#1}
+ \hcoffin_set:Nn \l__xunadd_circle_coffin {#2}
\dim_set:Nn \l__xunadd_circle_width_dim
{ \fp_use:N \l__xunadd_circle_ratio_fp \coffin_wd:N \l__xunadd_circle_coffin }
\coffin_resize:Nnn \l__xunadd_tmp_coffin
@@ -455,6 +459,63 @@
{ \fp_set:Nn \l__xunadd_circle_ratio_fp {#1} }
\fp_new:N \l__xunadd_circle_ratio_fp
\settextcircledratio { 0.7 }
+\cs_new_protected:Npn \__xunadd_combine_double_accent:nnNNn
+ { \__xunadd_text_combine:NnnNNn \__xunadd_add_double_accent:nnNN }
+\cs_new_protected:Npn \__xunadd_add_double_accent:nnNN #1#2#3#4
+ {
+ \tl_if_blank:nTF {#1}
+ {
+ \__xunadd_glyph_if_exist:nTF { `#4 }
+ {#4}
+ { \cs_if_exist_use:cTF { ? #2 } { {#1} } {#4} }
+ }
+ {
+ \__xunadd_glyph_if_exist:nTF { `#3 }
+ { \__xunadd_add_double_symbol:nN {#1} #3 }
+ {
+ \__xunadd_glyph_if_exist:nTF { `#4 }
+ { \add@accent { `#4 } {#1} }
+ { \cs_if_exist_use:cTF { ? #2 } { {#1} } { #1#3 } }
+ }
+ }
+ }
+\cs_new_protected:Npn \__xunadd_combine_double_symbol:nnNNn
+ { \__xunadd_text_combine:NnnNNn \__xunadd_add_double_symbol:nnNN }
+\cs_new_protected:Npn \__xunadd_add_double_symbol:nnNN #1#2#3#4
+ {
+ \tl_if_blank:nTF {#1}
+ {
+ \__xunadd_glyph_if_exist:nTF { `#4 }
+ {#4}
+ { \cs_if_exist_use:cTF { ? #2 } { {#1} } {#4} }
+ }
+ {
+ \__xunadd_glyph_if_exist:nTF { `#3 }
+ { \__xunadd_add_double_symbol:nN {#1} #3 }
+ { \cs_if_exist_use:cTF { ? #2 } { {#1} } { #1#3 } }
+ }
+ }
+\cs_new_protected:Npn \__xunadd_add_double_symbol:nN #1#2
+ {
+ \tl_if_head_is_N_type:nTF {#1}
+ {
+ \exp_after:wN \exp_after:wN \exp_after:wN
+ \__xunadd_add_double_symbol_aux:NnN \exp_after:wN \exp_after:wN
+ \tl_head:w #1 \q_stop \exp_after:wN { \use_none:n #1 } #2
+ }
+ { #1#2 }
+ }
+\cs_new_protected:Npn \__xunadd_add_double_symbol_aux:NnN #1#2#3
+ {
+ \bool_if:nTF
+ {
+ \token_if_letter_p:N #1 ||
+ \token_if_other_p:N #1 ||
+ \token_if_chardef_p:N #1
+ }
+ { #1#3#2 }
+ { #1#2#3 }
+ }
\NewDocumentCommand \AtBeginUTFCommand { s O { } +m }
{
\tl_if_blank:nTF {#2}
@@ -505,6 +566,28 @@
{#2}
\tl_use:N \l__xunadd_end_hook_tl
}
+\NewDocumentCommand \DeclareUTFTIPACommand { O { \UTFencname } m }
+ { \use:x { \__xunadd_text_tipa_command:Nnn \exp_not:N #2 { \token_to_str:N #2 } {#1} } }
+\cs_new_protected:Npn \__xunadd_text_tipa_command:Nnn #1#2#3
+ {
+ \cs_set_eq:cc { UTF/#3#2 } { #3#2 }
+ \DeclareTextCommand #1 {#3} { \__xunadd_text_tipa_command:nnn {#3} {#2} }
+ }
+\cs_new_protected:Npn \__xunadd_text_tipa_command:nnn #1#2#3
+ {
+ \exp_after:wN \__xunadd_check_for_tipa:NNn
+ \cs:w \use_none:n #2 \exp_after:wN \cs_end:
+ \cs:w UTF/#1#2 \cs_end: {#3}
+ }
+\cs_new_protected:Npn \__xunadd_check_for_tipa:NNn #1#2#3
+ {
+ \tl_if_head_eq_meaning:nNTF {#3} \textipa
+ {
+ \exp_after:wN \tipacatchonechar \exp_after:wN
+ { \exp_after:wN #1 \use_none:n #3 }
+ }
+ { #2 {#3} }
+ }
%%
%% This package consists of the file xeCJK.dtx,
%% full-stop.map,
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
index 964c3539a42..05390f50817 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `xunextra')
%%
-%% $Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+%% $Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -15,9 +15,9 @@
%% Leo Liu <leoliu.pku@gmail.com>
%% Qing Lee <sobenlee@gmail.com>
%%
-%% Copyright (C) 2007--2013 Wenchang Sun
-%% (C) 2009--2013 Leo Liu
-%% (C) 2012--2013 Qing Lee
+%% Copyright (C) 2007--2014 Wenchang Sun
+%% (C) 2009--2014 Leo Liu
+%% (C) 2012--2014 Qing Lee
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,11 +31,11 @@
%% The Current Maintainer of this work are Leo Liu and Qing Lee.
%% -----------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx 537 2013-12-08 13:01:40Z sobenlee $
+\GetIdInfo$Id: xeCJK.dtx 549 2014-03-01 09:06:08Z sobenlee $
{extra definition for xunicode}
\ProvidesExplFile
{\ExplFileName.def}
- {\ExplFileDate}{3.2.9}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.10}{\ExplFileDescription}
\ExplSyntaxOff
\DeclareUTFComposite\textsuperscript
\DeclareUTFComposite\textsubscript
@@ -84,12 +84,19 @@
\DeclareUTFEncodedAccent\textrightarrowhead{"0350}{"02C3}
\DeclareUTFEncodedAccent\textlefthalfring{"0351}{"02D3}
\DeclareUTFEncodedAccent\textrighthalfring{"0357}{"02D2}
-\DeclareUTFEncodedAccent\textdoubletilde{"0360}{"0360}
-\DeclareUTFEncodedAccent\t{"0361}{"0361}
-\DeclareUTFEncodedAccent\textdoublebreve{"035D}{"035D}
-\DeclareUTFEncodedAccent\textdoublemacron{"035E}{"035E}
-\DeclareUTFEncodedAccent\capitaltie{"0361}{"0361}
-\DeclareUTFEncodedAccent\texttoptiebar{"0361}{"0361}
+\DeclareUTFDoubleEncodedSymbol\textdoublebrevebelow{"035C}{"035C}
+\DeclareUTFDoubleEncodedAccent\textdoublebreve{"035D}{"035D}
+\DeclareUTFDoubleEncodedAccent\textdoublemacron{"035E}{"035E}
+\DeclareUTFDoubleEncodedSymbol\textdoublemacronbelow{"035F}{"035F}
+\DeclareUTFDoubleEncodedAccent\textdoubletilde{"0360}{"0360}
+\DeclareUTFDoubleEncodedAccent\t{"0361}{"0361}
+\DeclareUTFDoubleEncodedAccent\capitaltie{"0361}{"0361}
+\DeclareUTFDoubleEncodedAccent\texttoptiebar{"0361}{"0361}
+\DeclareUTFDoubleEncodedSymbol\sliding{"0362}{"0362}
+\DeclareUTFTIPACommand\t
+\DeclareUTFTIPACommand\capitaltie
+\DeclareUTFTIPACommand\texttoptiebar
+\DeclareUTFTIPACommand\sliding
\DeclareUTFEncodedAccent\texthighrise{"1DC4}{"1DC4}
\DeclareUTFEncodedAccent\textlowrise{"1DC5}{"1DC5}
\DeclareUTFEncodedAccent\textrisefall{"1DC8}{"1DC8}
@@ -211,6 +218,36 @@
\DeclareUTFCompositeSymbol\textcircled{x}{"24E7}
\DeclareUTFCompositeSymbol\textcircled{y}{"24E8}
\DeclareUTFCompositeSymbol\textcircled{z}{"24E9}
+\DeclareUTFCompositeSymbol\textsuperscript{h}{"02B0}
+\DeclareUTFCompositeSymbol\textsuperscript{\texthth}{"02B1}
+\DeclareUTFCompositeSymbol\textsuperscript{j}{"02B2}
+\DeclareUTFCompositeSymbol\textsuperscript{r}{"02B3}
+\DeclareUTFCompositeSymbol\textsuperscript{\textturnr}{"02B4}
+\DeclareUTFCompositeSymbol\textsuperscript{\textturnrrtail}{"02B5}
+\DeclareUTFCompositeSymbol\textsuperscript{\textinvscr}{"02B6}
+\DeclareUTFCompositeSymbol\textsuperscript{w}{"02B7}
+\DeclareUTFCompositeSymbol\textsuperscript{y}{"02B8}
+\DeclareUTFCompositeSymbol\textsuperscript{\textbabygamma}{"02E0}
+\DeclareUTFCompositeSymbol\textsuperscript{\textgammalatinsmall}{"02E0}
+\DeclareUTFCompositeSymbol\textsuperscript{l}{"02E1}
+\DeclareUTFCompositeSymbol\textsuperscript{s}{"02E2}
+\DeclareUTFCompositeSymbol\textsuperscript{x}{"02E3}
+\DeclareUTFCompositeSymbol\textsuperscript{\textrevglotstop}{"02E4}
+\DeclareUTFCompositeSymbol\textsuperscript{\textrevepsilon}{"1D4C}
+\DeclareUTFCompositeSymbol\textsuperscript{\cyrn}{"1D78}
+\DeclareUTFCompositeSymbol\textsuperscript{\textbarsci}{"1DA7}
+\DeclareUTFCompositeSymbol\textsuperscript{V}{"2C7D}
+\DeclareUTFCompositeSymbol\textsuperscript{\textHbar}{"A7F8}
+\DeclareUTFCompositeSymbol\textsuperscript{\textHslash}{"A7F8}
+\DeclareUTFCompositeSymbol\textsuperscript{\oe}{"A7F9}
+\DeclareUTFCompositeSymbol\textsubscript{h}{"2095}
+\DeclareUTFCompositeSymbol\textsubscript{k}{"2096}
+\DeclareUTFCompositeSymbol\textsubscript{l}{"2097}
+\DeclareUTFCompositeSymbol\textsubscript{m}{"2098}
+\DeclareUTFCompositeSymbol\textsubscript{n}{"2099}
+\DeclareUTFCompositeSymbol\textsubscript{p}{"209A}
+\DeclareUTFCompositeSymbol\textsubscript{s}{"209B}
+\DeclareUTFCompositeSymbol\textsubscript{t}{"209C}
\DeclareUTFEncodedAccent\textinvbreve{"0311}{"0311}
\DeclareUTFEncodedSymbol\textsubbreve{"032E}{"203F}
\DeclareUTFSymbol\textHT{"0009}
@@ -693,12 +730,7 @@
\DeclareUTFSymbol\textRe{"211C}
\DeclareUTFSymbol\textriota{"2129}
\DeclareUTFSymbol\textangstrom{"212B}
-\DeclareUTFSymbol\textFinv{"2132}
-\DeclareUTFSymbol\textaleph{"2135}
-\DeclareUTFSymbol\textbeth{"2136}
-\DeclareUTFSymbol\textdaleth{"2138}
\DeclareUTFSymbol\textfax{"213B}
-\DeclareUTFSymbol\textGame{"2141}
\DeclareUTFSymbol\textinvamp{"214B}
\DeclareUTFSymbol\textoneseventh{"2150}
\DeclareUTFSymbol\textoneninth{"2151}
@@ -1074,7 +1106,6 @@
\DeclareUTFSymbol\textLEFTCIRCLE{"25D6}
\DeclareUTFSymbol\textRIGHTCIRCLE{"25D7}
\DeclareUTFSymbol\textboxbar{"25EB}
-\DeclareUTFSymbol\textbigcircle{"25EF}
\DeclareUTFSymbol\textCloud{"2601}
\DeclareUTFSymbol\textFiveStar{"2605}
\DeclareUTFSymbol\textFiveStarOpen{"2606}