summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def89
1 files changed, 41 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
index 792efb9a6cb..58a354885a6 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `aptex')
%%
-%% Copyright (C) 2003--2018
+%% Copyright (C) 2003--2019
%% CTEX.ORG and any individual authors listed in the documentation.
%% ------------------------------------------------------------------------------
%%
@@ -26,10 +26,10 @@
%%
%% ------------------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $
+\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.4.14}{\ExplFileDescription}
+ {\ExplFileDate}{2.4.15}{\ExplFileDescription}
\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
{
\AtBeginDvi {#1}
@@ -37,32 +37,43 @@
{ \AtBeginShipoutFirst {#1} }
}
\@onlypreamble \ctex_set_zhmap:n
-\tl_set:Nn \CJKrmdefault { rm }
-\tl_set:Nn \CJKsfdefault { sf }
-\tl_set:Nn \CJKttdefault { tt }
+\tl_set:Nn \CJKrmdefault { zhrm }
+\tl_set:Nn \CJKsfdefault { zhsf }
+\tl_set:Nn \CJKttdefault { zhtt }
\tl_set:Nn \CJKfamilydefault { \CJKrmdefault }
-\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKrmdefault } }
- { }
- { \ctex_patch_failure:N \rmfamily }
-\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKsfdefault } }
- { }
- { \ctex_patch_failure:N \sffamily }
-\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff }
- { \kanjifamily { \CJKttdefault } }
- { }
- { \ctex_patch_failure:N \ttfamily }
-\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff }
- { \kanjifamily { \CJKfamilydefault } }
- { \cs_set_eq:NN \reset@font \normalfont }
- { \ctex_patch_failure:N \normalfont }
+\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault }
+\RenewDocumentCommand \rmfamily { }
+ {
+ \not@math@alphabet \rmfamily \mathrm
+ \romanfamily \rmdefault
+ \kanjifamily \CJKrmdefault
+ \selectfont
+ }
+\RenewDocumentCommand \sffamily { }
+ {
+ \not@math@alphabet \sffamily \mathsf
+ \romanfamily \sfdefault
+ \kanjifamily \CJKsfdefault
+ \selectfont
+ }
+\RenewDocumentCommand \ttfamily { }
+ {
+ \not@math@alphabet \ttfamily \mathtt
+ \romanfamily \ttdefault
+ \kanjifamily \CJKttdefault
+ \selectfont
+ }
\NewDocumentCommand \CJKfamily { m }
{
- \kanjifamily { #1 }
+ \kanjifamily {#1}
\selectfont
}
-\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault }
+\DeclareErrorKanjiFont{JY2}{zhrm}{m}{n}{10}
+\DeclareKanjiSubstitution{JY2}{zhrm}{m}{n}
+\DeclareKanjiSubstitution{JT2}{zhrm}{m}{n}
+\DeclareSymbolFont{mincho}{JY2}{zhrm}{m}{n}
+\SetSymbolFont{mincho}{bold}{JY2}{zhrm}{bx}{n}
+\jfam \symmincho
\ctex_at_end_preamble:n { \ctex_update_default_family: }
\normalfont
\ctex_patch_cmd_once:NnnnTF \em
@@ -164,14 +175,14 @@
\cs_new_eq:NN \CTEXfilltwosides \use_none:n
\cs_new_eq:NN \endCTEXfilltwosides \prg_do_nothing:
\cs_new_protected_nopar:Npn \ctex_update_ccwd:
- { \skip_set:Nn \ccwd { 1zw + \ptex_kanjiskip:D } }
+ { \skip_set:Nn \ccwd { 1zw + \tex_kanjiskip:D } }
\dim_new:N \ccwd
\cs_new_protected_nopar:Npn \ctex_update_ccglue:
- { \skip_set_eq:NN \ptex_kanjiskip:D \l__ctex_ccglue_skip }
+ { \skip_set_eq:NN \tex_kanjiskip:D \l__ctex_ccglue_skip }
\skip_new:N \l__ctex_ccglue_skip
\prg_new_conditional:Npnn \ctex_if_ccglue_touched: { TF }
{
- \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \ptex_kanjiskip:D }
+ \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \tex_kanjiskip:D }
{ \prg_return_false: } { \prg_return_true: }
}
\cs_new_protected_nopar:Npn \ctex_update_em_unit:
@@ -208,10 +219,10 @@
\cs_new_protected_nopar:Npn \ctex_update_xkanjiskip:
{
\skip_if_eq:nnT
- { \ptex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip }
+ { \tex_xkanjiskip:D } { \l__ctex_xkanjiskip_skip }
{
\skip_set:Nn \l__ctex_xkanjiskip_skip { \l__ctex_xkanjiskip_tl }
- \skip_set_eq:NN \ptex_xkanjiskip:D \l__ctex_xkanjiskip_skip
+ \skip_set_eq:NN \tex_xkanjiskip:D \l__ctex_xkanjiskip_skip
}
}
\tl_new:N \l__ctex_xkanjiskip_tl
@@ -219,7 +230,7 @@
{ .25zw plus 1pt minus 1pt }
\skip_new:N \l__ctex_xkanjiskip_skip
\skip_set:Nn \l__ctex_xkanjiskip_skip
- { \ptex_xkanjiskip:D }
+ { \tex_xkanjiskip:D }
\ctex_add_to_selectfont:n { \ctex_update_xkanjiskip: }
\keys_define:nn { ctex }
{
@@ -236,24 +247,6 @@
punct .default:n = { quanjiao } ,
}
\tl_set:Nn \l__ctex_encoding_tl { UTF8 }
-\DeclareKanjiFamily{JY2}{rm}{}
-\DeclareKanjiFamily{JY2}{sf}{}
-\DeclareKanjiFamily{JY2}{tt}{}
-\DeclareKanjiFamily{JT2}{rm}{}
-\DeclareKanjiFamily{JT2}{sf}{}
-\DeclareKanjiFamily{JT2}{tt}{}
-\DeclareFontShape{JY2}{rm}{m}{n}{<-> upzhserif-h}{}
-\DeclareFontShape{JY2}{rm}{m}{it}{<-> upzhserifit-h}{}
-\DeclareFontShape{JY2}{rm}{bx}{n}{<-> upzhserifb-h}{}
-\DeclareFontShape{JT2}{rm}{m}{n}{<-> upzhserif-v}{}
-\DeclareFontShape{JT2}{rm}{m}{it}{<-> upzhserifit-v}{}
-\DeclareFontShape{JT2}{rm}{bx}{n}{<-> upzhserifb-v}{}
-\DeclareFontShape{JY2}{sf}{m}{n}{<-> upzhsans-h}{}
-\DeclareFontShape{JY2}{sf}{bx}{n}{<-> upzhsansb-h}{}
-\DeclareFontShape{JT2}{sf}{m}{n}{<-> upzhsans-v}{}
-\DeclareFontShape{JT2}{sf}{bx}{n}{<-> upzhsansb-v}{}
-\DeclareFontShape{JY2}{tt}{m}{n}{<-> upzhmono-h}{}
-\DeclareFontShape{JT2}{tt}{m}{n}{<-> upzhmono-v}{}
%%
%%
%% End of file `ctex-engine-aptex.def'.