diff options
Diffstat (limited to 'Master/texmf-dist/source/xelatex')
-rw-r--r-- | Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx | 283 | ||||
-rw-r--r-- | Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins | 16 |
2 files changed, 250 insertions, 49 deletions
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 |