xdcjk 3.2.10 (28Feb)

git-svn-id: svn://tug.org/texlive/trunk@33074 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 209 insertions, 61 deletions

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}