summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-03 22:59:51 +0000
committerKarl Berry <karl@freefriends.org>2016-02-03 22:59:51 +0000
commit1290d7454b9754f3c7a7e4a229981e18f58ea6f6 (patch)
treeaa01beb72d34acd81690358b54be7493a5244544 /Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
parente5ef88072190f4f0e310c900fd626db1dd7dc096 (diff)
ctex (3feb16)
git-svn-id: svn://tug.org/texlive/trunk@39559 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def19
1 files changed, 8 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
index 6a6e2a0cbf4..d45315f24d2 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6255367 2015-07-01 01:15:24 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee <sobenlee@gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.3}{\ExplFileDescription}
\RequirePackage { xeCJK }
\exp_args:Nx \xeCJKsetup
{
@@ -45,7 +45,7 @@
{
\file_if_exist:nTF { nul: }
{
- \file_if_exist:nTF { \c__ctex_engine_file_tl }
+ \file_if_exist:nTF { \c__ctex_upper_case_file_str }
{ \ctex_if_macosx:TF { mac } { windows } }
{ \ctex_if_macosx:TF { mac } { fandol } }
}
@@ -53,23 +53,19 @@
}
{ \tl_gset:Nn \g__ctex_fontset_tl { windows } }
}
-\tex_uppercase:D \exp_after:wN
- {
- \exp_after:wN \tl_const:Nn \exp_after:wN \c__ctex_engine_file_tl
- \exp_after:wN { \g_file_current_name_tl }
- }
+\str_const:Nx \c__ctex_upper_case_file_str
+ { \exp_args:No \str_upper_case:n { \g_file_current_name_tl } }
\cs_new_protected_nopar:Npn \ctex_if_macosx:TF #1#2
{
- \file_if_exist:nTF { \c__ctex_macosx_file_tl }
+ \file_if_exist:nTF { \c__ctex_macosx_file_str }
{ \tl_gset:Nn \g__ctex_fontset_tl {#1} }
{ \tl_gset:Nn \g__ctex_fontset_tl {#2} }
}
-\tl_const:Nn \c__ctex_macosx_file_tl { /Library/Fonts/Songti.ttc }
+\str_const:Nn \c__ctex_macosx_file_str { /Library/Fonts/Songti.ttc }
\ctex_hypersetup:n { pdfencoding = unicode }
\RequirePackage { xeCJKfntef }
\@ifpackagelater { xeCJKfntef } { 2014/11/04 }
{
-
\cs_new_protected_nopar:Npn \__ctex_clear_fntef_color:n #1
{ \xeCJKsetup { #1 / format = { } } }
}
@@ -148,6 +144,7 @@
} ,
punct .default:n = { quanjiao } ,
}
+\tl_set:Nn \l__ctex_encoding_tl { UTF8 }
%%
%%
%% End of file `ctex-engine-xetex.def'.