diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty index 82fffb22565..31c1de3584d 100644 --- a/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty +++ b/Master/texmf-dist/tex/latex/xcjk2uni/xCJK2uni.sty @@ -21,10 +21,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xCJK2uni.dtx 655 2014-05-12 15:25:37Z sobenlee $ +\GetIdInfo$Id: xCJK2uni.dtx 691 2014-06-20 09:20:07Z sobenlee $ {Convert CJK character to Unicode.} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{0.3}{\ExplFileDescription} + {\ExplFileDate}{0.4}{\ExplFileDescription} \pdftex_if_engine:F { \msg_new:nnn { xCJK2uni } { pdflatex } @@ -195,32 +195,47 @@ \HyPsd@DecimalToOctalSecond { \int_mod:nn {#1} { \c_two_hundred_fifty_six } } } -\cs_if_exist_use:NTF \hypersetup { { unicode } } - { \PassOptionsToPackage { unicode } { hyperref } } -\AtBeginDocument +\cs_if_exist_use:NTF \hypersetup { { unicode , CJKbookmarks = false } } + { \PassOptionsToPackage { unicode , CJKbookmarks = false } { hyperref } } +\msg_new:nnn { xCJK2uni } { UTF-8-encoding } + { It~is~not~necessary~to~load~xCJK2uni~in~UTF-8~encoding. } +\tl_if_exist:NF \pdfstringdefPreHook { \tl_new:N \pdfstringdefPreHook } +\@ifpackageloaded { CJKutf8 } + { \msg_warning:nn { xCJK2uni } { UTF-8-encoding } } { - \@ifpackageloaded { CJKutf8 } - { \msg_warning:nn { xCJK2uni } { UTF-8-encoding } } + \cs_new_eq:NN \CJKtu@bookmarks@hook \CJKtu_bookmarks_hook: + \tl_gput_right:Nn \pdfstringdefPreHook { \CJKtu@bookmarks@hook } + \AtBeginDocument { - \cs_if_free:NF \pdfstringdefDisableCommands + \@ifpackageloaded { CJKutf8 } { - \hypersetup { CJKbookmarks = false } - \pdfstringdefDisableCommands { \CJKtu_bookmarks_hook: } + \cs_gset_eq:NN \CJKtu@bookmarks@hook \scan_stop: + \msg_warning:nn { xCJK2uni } { UTF-8-encoding } } + { \cs_if_exist_use:NT \hypersetup { { CJKbookmarks = false } } } } } -\msg_new:nnn { xCJK2uni } { UTF-8-encoding } - { It~is~not~necessary~to~load~xCJK2uni~in~UTF-8~encoding. } \cs_new_eq:NN \useCJKencmap \__CJKtu_use_enc_map:n \cs_new_eq:NN \CJKchartouni \__CJKtu_char_to_unicode:n \cs_new_eq:NN \CJKsfdtouni \__CJKtu_sfd_to_unicode:nn -\useCJKencmap { GBK } +\cs_new_protected_nopar:Npn \__CJKtu_initial:N #1 + { + \tl_if_exist:NTF #1 + { + \prop_get:NxNTF \c__CJKtu_sfd_prop {#1} \l__CJKtu_sfd_tl + { \__CJKtu_enc_map:nn {#1} { \l__CJKtu_sfd_tl } } + { \__CJKtu_use_enc_map:n { GBK } } + } + { \__CJKtu_use_enc_map:n { GBK } } + } +\exp_args:Nc \__CJKtu_initial:N { CJK @ @ @ enc } %% %% This package consists of the file xCJK2uni.dtx, %% and the derived files xCJK2uni.pdf, %% xCJK2uni.sty, %% xCJK2uni.ins, -%% xCJK2uni-make.ltx, +%% xCJK2uni-make.tex, +%% xCJK2uni-sfd.def, %% xCJK2uni-UBg5plus.def, %% xCJK2uni-UBig5.def, %% xCJK2uni-UGB.def, |