summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-14 00:15:43 +0000
committerKarl Berry <karl@freefriends.org>2013-11-14 00:15:43 +0000
commitdc8de378dea7a09d1e83b20828ab14721fd7f4a1 (patch)
tree31864bac82a89caaee33378923c2f47dad530265 /Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
parentedb8af6d0ce44c0948ea2c747925d34fb230197d (diff)
xpinyin (13nov13)
git-svn-id: svn://tug.org/texlive/trunk@32142 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty')
-rw-r--r--Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty22
1 files changed, 10 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
index dd0a6116271..cd488147b72 100644
--- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
+++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty
@@ -21,10 +21,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xpinyin.dtx 512 2013-08-17 15:03:03Z sobenlee $
+\GetIdInfo$Id: xpinyin.dtx 526 2013-11-12 00:16:04Z sobenlee $
{Automatically add pinyin to Chinese characters}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{1.4}{\ExplFileDescription}
+ {\ExplFileDate}{1.5}{\ExplFileDescription}
\msg_new:nnn { xpinyin } { no-LuaTeX }
{
The~xpinyin~package~is~not~supported~in~LuaTeX.\\\\
@@ -141,12 +141,13 @@
\box_new:N \l__xpinyin_tmpb_box
\cs_new_protected_nopar:Npn \__xpinyin_make_box:nn #1#2
{
- \__xpinyin_save_CJKsymbol:n {#1}
\__xpinyin_make_pinyin_box:xnn { \__xpinyin_to_unicode:n {#1} } {#1} {#2}
+ \__xpinyin_save_CJKsymbol:n {#1}
}
\cs_new_protected_nopar:Npn \__xpinyin_make_pinyin_box:nnn #1#2#3
{
- \hbox_overlap_left:n
+ \__xpinyin_leavevmode:
+ \hbox_overlap_right:n
{
\hbox_set:Nn \l__xpinyin_tmpa_box
{ \__xpinyin_CJKsymbol_hook: \__xpinyin_save_CJKsymbol:n {#2} }
@@ -175,8 +176,6 @@
{ \tex_hss:D \box_use_clear:N \l__xpinyin_tmpb_box \tex_hss:D }
}
}
- { \__xpinyin_CJK_node: }
- \__xpinyin_ignore_spaces:w
}
\tl_new:N \l__xpinyin_pinyin_box_hook_tl
\cs_generate_variant:Nn \__xpinyin_make_pinyin_box:nnn { x }
@@ -184,8 +183,8 @@
{ \__xpinyin_CJKsymbol:xn { \__xpinyin_to_unicode:n {#1} } {#1} }
\cs_new_protected_nopar:Npn \__xpinyin_CJKsymbol:nn #1#2
{
- \__xpinyin_save_CJKsymbol:n {#2}
\__xpinyin_make_pinyin_box:nnn {#1} {#2} { \use:c { c__xpinyin_ #1 _tl } }
+ \__xpinyin_save_CJKsymbol:n {#2}
}
\cs_generate_variant:Nn \__xpinyin_CJKsymbol:nn { x }
\NewDocumentEnvironment { pinyinscope } { O { } }
@@ -214,6 +213,7 @@
\group_begin:
\keys_set:nn { xpinyin } {#2}
\settowidth \l__xpinyin_CJKglue_dim { \CJKglue }
+ \leavevmode
\__xpinyin_single_aux:nn {#3}
}
}
@@ -268,7 +268,7 @@
\cs_new_nopar:Npn \__xpinyin_UTF_to_unicode:n #1
{
\int_to_hexadecimal:n
- { \exp_args:No \int_from_hexadecimal: { \CJK@plane } * "100 + #1 }
+ { \exp_args:No \int_from_hexadecimal:n { \CJK@plane } * "100 + #1 }
}
\cs_new_nopar:Npn \__xpinyin_UTFchar_to_unicode:n #1
{ \int_to_hexadecimal:n { \__xpinyin_UTF_viii_to_unicode:NNNw #1 \q_stop } }
@@ -288,10 +288,9 @@
\cs_new_eq:NN \__xpinyin_to_unicode:n \__xpinyin_to_unicode_xetex:n
\cs_new_eq:NN \__xpinyin_char_to_unicode:n \__xpinyin_to_unicode:n
\cs_new_eq:NN \__xpinyin_replace_CJKsymbol: \__xpinyin_replace_CJKsymbol_aux:
- \cs_new_protected_nopar:Npn \__xpinyin_ignore_spaces:w { \xeCJK_ignore_spaces:w }
- \cs_new_protected_nopar:Npn \__xpinyin_CJK_node: { \xeCJK_make_node:n { CJK } }
\tl_gset:Nn \l__xpinyin_coor_tl
{ (\cs_meaning:N \l__xpinyin_font_tl)/\l_xeCJK_current_font_tl/\l__xpinyin_ratio_tl }
+ \cs_new_eq:NN \__xpinyin_leavevmode: \prg_do_nothing:
\cs_new_protected_nopar:Npn \__xpinyin_CJKsymbol_hook:
{ \makexeCJKinactive \xeCJK_select_font: }
\cs_new_protected_nopar:Npn \__xpinyin_single_hook:n
@@ -309,9 +308,8 @@
\cs_new_eq:NN \__xpinyin_char_to_unicode:n \__xpinyin_UTFchar_to_unicode:n
}
\cs_new_eq:NN \__xpinyin_select_font: \__xpinyin_select_font_aux:
+ \cs_new_eq:NN \__xpinyin_leavevmode: \leavevmode
\cs_new_eq:NN \__xpinyin_CJKsymbol_hook: \prg_do_nothing:
- \cs_new_protected_nopar:Npn \__xpinyin_CJK_node: { \CJK@CJK }
- \cs_new_protected_nopar:Npn \__xpinyin_ignore_spaces:w { \CJK@ignorespaces }
\@ifpackageloaded { CJKpunct }
{ \__xpinyin_adjust_CJKpunct_hook: }
{