summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex/fontset
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-02 22:24:14 +0000
committerKarl Berry <karl@freefriends.org>2020-05-02 22:24:14 +0000
commit15f0c94913f0d5cb24dd909c5358b3a997994dd7 (patch)
tree9043df32cd0199835f5b3f9804ad132907857139 /Master/texmf-dist/tex/latex/ctex/fontset
parent151fbc4b66cb3705f6ce20368a2c6f7c06b8d57d (diff)
ctex (2may20)
git-svn-id: svn://tug.org/texlive/trunk@54976 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/fontset')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def138
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def164
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def122
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def16
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def121
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def47
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def96
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def99
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def120
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def104
10 files changed, 456 insertions, 571 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
index 4c981401a65..675a1ce373c 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `fontset,adobe')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,86 +20,80 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\sys_if_engine_pdftex:TF
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_fontset_case:nnnn
+ { \ctex_fontset_error:n { adobe } }
{
- \sys_if_output_pdf:TF
- { \ctex_fontset_error:n { adobe } }
+ \ctex_zhmap_case:nnn
{
- \ctex_zhmap_case:nnn
- {
- \setCJKmainfont
- [
- cmap = UniGB-UTF16-H ,
- BoldFont = AdobeHeitiStd-Regular.otf ,
- ItalicFont = AdobeKaitiStd-Regular.otf
- ] { AdobeSongStd-Light.otf }
- \setCJKsansfont [ cmap = UniGB-UTF16-H ] { AdobeHeitiStd-Regular.otf }
- \setCJKmonofont [ cmap = UniGB-UTF16-H ] { AdobeFangsongStd-Regular.otf }
- \setCJKfamilyfont { zhsong }
- [ cmap = UniGB-UTF16-H ] { AdobeSongStd-Light.otf }
- \setCJKfamilyfont { zhhei }
- [ cmap = UniGB-UTF16-H ] { AdobeHeitiStd-Regular.otf }
- \setCJKfamilyfont { zhkai }
- [ cmap = UniGB-UTF16-H ] { AdobeKaitiStd-Regular.otf }
- \setCJKfamilyfont { zhfs }
- [ cmap = UniGB-UTF16-H ] { AdobeFangsongStd-Regular.otf }
- \ctex_punct_set:n { adobe }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
- \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- }
- {
- \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhadobefonts }
- \ctex_punct_set:n { adobe }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- }
- { \ctex_fontset_error:n { adobe } }
+ \setCJKmainfont { AdobeSongStd-Light.otf }
+ [
+ cmap = UniGB-UTF16-H,
+ BoldFont = AdobeHeitiStd-Regular.otf,
+ ItalicFont = AdobeKaitiStd-Regular.otf
+ ]
+ \setCJKsansfont { AdobeHeitiStd-Regular.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \setCJKmonofont { AdobeFangsongStd-Regular.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \setCJKfamilyfont { zhsong } { AdobeSongStd-Light.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \setCJKfamilyfont { zhhei } { AdobeHeitiStd-Regular.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \setCJKfamilyfont { zhkai } { AdobeKaitiStd-Regular.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \setCJKfamilyfont { zhfs } { AdobeFangsongStd-Regular.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \ctex_punct_set:n { adobe }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
+ \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
- }
- {
- \sys_if_engine_uptex:TF
{
- \ctex_set_upfonts:nnnnnn
- {AdobeSongStd-Light.otf} {AdobeHeitiStd-Regular.otf} {AdobeKaitiStd-Regular.otf}
- {AdobeHeitiStd-Regular.otf} {AdobeHeitiStd-Regular.otf}
- {AdobeFangsongStd-Regular.otf}
- \ctex_set_upfamily:nnn { zhsong } { upzhserif } {}
- \ctex_set_upfamily:nnn { zhhei } { upzhsans } {}
- \ctex_set_upfamily:nnn { zhfs } { upzhmono} {}
- \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
- }
- {
- \setCJKmainfont
- [
- BoldFont = AdobeHeitiStd-Regular ,
- ItalicFont = AdobeKaitiStd-Regular
- ] { AdobeSongStd-Light }
- \setCJKsansfont { AdobeHeitiStd-Regular}
- \setCJKmonofont { AdobeFangsongStd-Regular}
- \setCJKfamilyfont { zhsong } { AdobeSongStd-Light }
- \setCJKfamilyfont { zhhei } { AdobeHeitiStd-Regular }
- \setCJKfamilyfont { zhfs } { AdobeFangsongStd-Regular }
- \setCJKfamilyfont { zhkai } { AdobeKaitiStd-Regular }
+ \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhadobefonts }
+ \ctex_punct_set:n { adobe }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
+ { \ctex_fontset_error:n { adobe } }
+ }
+ {
+ \ctex_set_upfonts:nnnnnn
+ { AdobeSongStd-Light.otf }
+ { AdobeHeitiStd-Regular.otf }
+ { AdobeKaitiStd-Regular.otf }
+ { AdobeHeitiStd-Regular.otf }
+ { AdobeHeitiStd-Regular.otf }
+ { AdobeFangsongStd-Regular.otf }
+ \ctex_set_upfamily:nnn { zhsong } { upzhserif } {}
+ \ctex_set_upfamily:nnn { zhhei } { upzhsans } {}
+ \ctex_set_upfamily:nnn { zhfs } { upzhmono } {}
+ \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
+ }
+ {
+ \setCJKmainfont { AdobeSongStd-Light }
+ [ BoldFont = AdobeHeitiStd-Regular, ItalicFont = AdobeKaitiStd-Regular ]
+ \setCJKsansfont { AdobeHeitiStd-Regular }
+ \setCJKmonofont { AdobeFangsongStd-Regular }
+ \setCJKfamilyfont { zhsong } { AdobeSongStd-Light }
+ \setCJKfamilyfont { zhhei } { AdobeHeitiStd-Regular }
+ \setCJKfamilyfont { zhfs } { AdobeFangsongStd-Regular }
+ \setCJKfamilyfont { zhkai } { AdobeKaitiStd-Regular }
}
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
%%
%%
%% End of file `ctex-fontset-adobe.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
index 03853321971..2ff57b29633 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `fontset,fandol')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,101 +20,91 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\sys_if_engine_pdftex:TF
- {
- \sys_if_output_pdf:TF
- { \ctex_fontset_error:n { fandol } }
- {
- \ctex_zhmap_case:nnn
- {
- \setCJKmainfont
- [
- cmap = UniGB-UTF16-H ,
- BoldFont = FandolSong-Bold.otf ,
- ItalicFont = FandolKai-Regular.otf
- ] { FandolSong-Regular.otf }
- \setCJKsansfont
- [
- cmap = UniGB-UTF16-H ,
- BoldFont = FandolHei-Bold.otf
- ] { FandolHei-Regular.otf }
- \setCJKmonofont [ cmap = UniGB-UTF16-H ] { FandolFang-Regular.otf }
- \setCJKfamilyfont { zhsong }
- [
- cmap = UniGB-UTF16-H ,
- BoldFont = FandolSong-Bold.otf
- ] { FandolSong-Regular.otf }
- \setCJKfamilyfont { zhhei }
- [
- cmap = UniGB-UTF16-H ,
- BoldFont = FandolHei-Bold.otf
- ] { FandolHei-Regular.otf }
- \setCJKfamilyfont { zhfs }
- [ cmap = UniGB-UTF16-H ] { FandolFang-Regular.otf }
- \setCJKfamilyfont { zhkai }
- [ cmap = UniGB-UTF16-H ] { FandolKai-Regular.otf }
- \ctex_punct_set:n { fandol }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
- \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault , zhsong } { zhsongb }
- \ctex_punct_map_bfseries:nn { \CJKsfdefault , zhhei } { zhheib }
- }
- {
- \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfandolfonts }
- \ctex_punct_set:n { fandol }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- }
- { \ctex_fontset_error:n { fandol } }
- }
- }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_fontset_case:nnnn
+ { \ctex_fontset_error:n { fandol } }
{
- \sys_if_engine_uptex:TF
- {
- \ctex_set_upfonts:nnnnnn
- {FandolSong-Regular.otf} {FandolSong-Bold.otf} {FandolKai-Regular.otf}
- {FandolHei-Regular.otf} {FandolHei-Bold.otf}
- {FandolFang-Regular.otf}
- \ctex_set_upfamily:nnn { zhsong } { upzhserif } { upzhserifb }
- \ctex_set_upfamily:nnn { zhhei } { upzhsans } { upzhsansb }
- \ctex_set_upfamily:nnn { zhfs } { upzhmono} {}
- \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
- }
+ \ctex_zhmap_case:nnn
{
- \setCJKmainfont
+ \setCJKmainfont { FandolSong-Regular.otf }
[
- Extension = .otf ,
- BoldFont = FandolSong-Bold , ItalicFont = FandolKai-Regular
+ cmap = UniGB-UTF16-H,
+ BoldFont = FandolSong-Bold.otf,
+ ItalicFont = FandolKai-Regular.otf
]
- { FandolSong-Regular }
- \setCJKsansfont
- [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular }
- \setCJKmonofont [ Extension = .otf ] { FandolFang-Regular }
- \setCJKfamilyfont { zhsong }
- [ Extension = .otf , BoldFont = FandolSong-Bold ] { FandolSong-Regular }
- \setCJKfamilyfont { zhhei }
- [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular }
- \setCJKfamilyfont { zhfs } [ Extension = .otf ] { FandolFang-Regular }
- \setCJKfamilyfont { zhkai } [ Extension = .otf ] { FandolKai-Regular }
+ \setCJKsansfont { FandolHei-Regular.otf }
+ [ cmap = UniGB-UTF16-H, BoldFont = FandolHei-Bold.otf ]
+ \setCJKmonofont { FandolFang-Regular.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \setCJKfamilyfont { zhsong } { FandolSong-Regular.otf }
+ [ cmap = UniGB-UTF16-H, BoldFont = FandolSong-Bold.otf ]
+ \setCJKfamilyfont { zhhei } { FandolHei-Regular.otf }
+ [ cmap = UniGB-UTF16-H, BoldFont = FandolHei-Bold.otf ]
+ \setCJKfamilyfont { zhfs } { FandolFang-Regular.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \setCJKfamilyfont { zhkai } { FandolKai-Regular.otf }
+ [ cmap = UniGB-UTF16-H ]
+ \ctex_punct_set:n { fandol }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
+ \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault, zhsong } { zhsongb }
+ \ctex_punct_map_bfseries:nn { \CJKsfdefault, zhhei } { zhheib }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
+ {
+ \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfandolfonts }
+ \ctex_punct_set:n { fandol }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+ }
+ { \ctex_fontset_error:n { fandol } }
+ }
+ {
+ \ctex_set_upfonts:nnnnnn
+ { FandolSong-Regular.otf }
+ { FandolSong-Bold.otf }
+ { FandolKai-Regular.otf }
+ { FandolHei-Regular.otf }
+ { FandolHei-Bold.otf }
+ { FandolFang-Regular.otf }
+ \ctex_set_upfamily:nnn { zhsong } { upzhserif } { upzhserifb }
+ \ctex_set_upfamily:nnn { zhhei } { upzhsans } { upzhsansb }
+ \ctex_set_upfamily:nnn { zhfs } { upzhmono } {}
+ \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
+ }
+ {
+ \setCJKmainfont { FandolSong-Regular }
+ [
+ Extension = .otf,
+ BoldFont = FandolSong-Bold,
+ ItalicFont = FandolKai-Regular
+ ]
+ \setCJKsansfont { FandolHei-Regular }
+ [ Extension = .otf, BoldFont = FandolHei-Bold ]
+ \setCJKmonofont { FandolFang-Regular }
+ [ Extension = .otf ]
+ \setCJKfamilyfont { zhsong } { FandolSong-Regular }
+ [ Extension = .otf, BoldFont = FandolSong-Bold ]
+ \setCJKfamilyfont { zhhei } { FandolHei-Regular }
+ [ Extension = .otf, BoldFont = FandolHei-Bold ]
+ \setCJKfamilyfont { zhfs } { FandolFang-Regular }
+ [ Extension = .otf ]
+ \setCJKfamilyfont { zhkai } { FandolKai-Regular }
+ [ Extension = .otf ]
}
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
%%
%%
%% End of file `ctex-fontset-fandol.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
index 034ba79de24..c9b117e17f8 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `fontset,founder')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,83 +20,83 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\sys_if_engine_pdftex:TF
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_fontset_case:nnn
{
\ctex_zhmap_case:nnn
{
- \setCJKmainfont
- [ BoldFont = FZXBSK.TTF , ItalicFont = FZKTK.TTF ] { FZSSK.TTF }
- \setCJKsansfont [ BoldFont = FZHTK.TTF ] { FZXH1K.TTF }
+ \setCJKmainfont { FZSSK.TTF }
+ [ BoldFont = FZXBSK.TTF, ItalicFont = FZKTK.TTF ]
+ \setCJKsansfont { FZXH1K.TTF } [ BoldFont = FZHTK.TTF ]
\setCJKmonofont { FZFSK.TTF }
- \setCJKfamilyfont { zhsong } [ BoldFont = FZXBSK.TTF ] { FZSSK.TTF }
- \setCJKfamilyfont { zhhei } { FZHTK.TTF }
- \setCJKfamilyfont { zhkai } { FZKTK.TTF }
- \setCJKfamilyfont { zhfs } { FZFSK.TTF }
- \setCJKfamilyfont { zhli } { FZLSK.TTF }
- \setCJKfamilyfont { zhyou } [ BoldFont = FZY3K.TTF ] { FZY1K.TTF }
+ \setCJKfamilyfont { zhsong } { FZSSK.TTF } [ BoldFont = FZXBSK.TTF ]
+ \setCJKfamilyfont { zhhei } { FZHTK.TTF }
+ \setCJKfamilyfont { zhkai } { FZKTK.TTF }
+ \setCJKfamilyfont { zhfs } { FZFSK.TTF }
+ \setCJKfamilyfont { zhli } { FZLSK.TTF }
+ \setCJKfamilyfont { zhyou } { FZY1K.TTF } [ BoldFont = FZY3K.TTF ]
\ctex_punct_set:n { founder }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_family:nn { \CJKsfdefault } { zhheil }
- \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault , zhsong } { zhsongb }
- \ctex_punct_map_bfseries:nn { \CJKsfdefault } { zhhei }
- \ctex_punct_map_bfseries:nn { zhyou } { zhyoub }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_family:nn { \CJKsfdefault } { zhheil }
+ \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault, zhsong } { zhsongb }
+ \ctex_punct_map_bfseries:nn { \CJKsfdefault } { zhhei }
+ \ctex_punct_map_bfseries:nn { zhyou } { zhyoub }
}
{
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfounderfonts }
\ctex_punct_set:n { founder }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
{ \ctex_fontset_error:n { founder } }
}
{
- \sys_if_engine_uptex:TF
- {
- \ctex_set_upfonts:nnnnnn
- { FZSSK.TTF } { FZXBSK.TTF } { FZKTK.TTF }
- { FZXH1K.TTF } { FZHTK.TTF }
- { FZFSK.TTF }
- \ctex_set_upfamily:nnn { zhsong } { upzhserif } { upzhserifb }
- \ctex_set_upfamily:nnn { zhhei } { upzhsans } { upzhsansb }
- \ctex_set_upfamily:nnn { zhfs } { upzhmono} {}
- \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
- \ctex_set_upfamily:nnn { zhli } { upschrm } {}
- \ctex_set_upmap:nnn { upstsl } { FZLSK.TTF } {}
- \ctex_set_upfamily:nnn { zhyou } { upschgt } {}
- \ctex_set_upmap:nnn { upstht } { FZY1K.TTF } {}
- }
- {
- \setCJKmainfont
- [ BoldFont = FZXiaoBiaoSong-B05 , ItalicFont = FZKai-Z03 ] { FZShuSong-Z01 }
- \setCJKsansfont [ BoldFont = FZHei-B01 ] { FZXiHeiI-Z08 }
- \setCJKmonofont { FZFangSong-Z02 }
- \setCJKfamilyfont { zhsong } [ BoldFont = FZXiaoBiaoSong-B05 ] { FZShuSong-Z01 }
- \setCJKfamilyfont { zhhei } { FZHei-B01 }
- \setCJKfamilyfont { zhkai } { FZKai-Z03 }
- \setCJKfamilyfont { zhfs } { FZFangSong-Z02 }
- \setCJKfamilyfont { zhli } { FZLiShu-S01 }
- \setCJKfamilyfont { zhyou } [ BoldFont = FZZhunYuan-M02 ] { FZXiYuan-M01 }
- }
+ \ctex_set_upfonts:nnnnnn
+ { FZSSK.TTF }
+ { FZXBSK.TTF }
+ { FZKTK.TTF }
+ { FZXH1K.TTF }
+ { FZHTK.TTF }
+ { FZFSK.TTF }
+ \ctex_set_upfamily:nnn { zhsong } { upzhserif } { upzhserifb }
+ \ctex_set_upfamily:nnn { zhhei } { upzhsans } { upzhsansb }
+ \ctex_set_upfamily:nnn { zhfs } { upzhmono } {}
+ \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
+ \ctex_set_upfamily:nnn { zhli } { upschrm } {}
+ \ctex_set_upfamily:nnn { zhyou } { upschgt } {}
+ \ctex_set_upmap:nnn { upstsl } { FZLSK.TTF } {}
+ \ctex_set_upmap:nnn { upstht } { FZY1K.TTF } {}
+ }
+ {
+ \setCJKmainfont { FZShuSong-Z01 }
+ [ BoldFont = FZXiaoBiaoSong-B05, ItalicFont = FZKai-Z03 ]
+ \setCJKsansfont { FZXiHeiI-Z08 } [ BoldFont = FZHei-B01 ]
+ \setCJKmonofont { FZFangSong-Z02 }
+ \setCJKfamilyfont { zhsong } { FZShuSong-Z01 }
+ [ BoldFont = FZXiaoBiaoSong-B05 ]
+ \setCJKfamilyfont { zhhei } { FZHei-B01 }
+ \setCJKfamilyfont { zhkai } { FZKai-Z03 }
+ \setCJKfamilyfont { zhfs } { FZFangSong-Z02 }
+ \setCJKfamilyfont { zhli } { FZLiShu-S01 }
+ \setCJKfamilyfont { zhyou } { FZXiYuan-M01 }
+ [ BoldFont = FZZhunYuan-M02 ]
}
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
-\NewDocumentCommand \lishu { } { \CJKfamily { zhli } }
-\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \lishu { } { \CJKfamily { zhli } }
+\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } }
%%
%%
%% End of file `ctex-fontset-founder.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
index a3c6b43a561..16357dbe17e 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `fontset,mac')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,16 +20,14 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
- {Mac OS X fonts definition (CTEX)}
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
+ {macOS fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
\file_if_exist:nTF { /System/Library/Fonts/PingFang.ttc }
{ \ctex_file_input:n { ctex-fontset-macnew.def } }
{ \ctex_file_input:n { ctex-fontset-macold.def } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
index ff07af939d4..9dc1dfa9c9a 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `fontset,macnew')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,48 +20,99 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
- {Mac OS X fonts definition for El Capitan or later version (CTEX)}
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
+ {macOS fonts definition for El Capitan or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-macnew.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\sys_if_engine_pdftex:TF
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { mac } }
{
- \sys_if_engine_uptex:TF
- { \ctex_fontset_error:n { mac } }
+ \ctex_zhmap_case:nnn
{
- \setCJKmainfont
- [
- UprightFont = *~Light ,
- BoldFont = *~Bold ,
- ItalicFont = Kaiti~SC ,
- BoldItalicFont = Kaiti~SC~Bold
- ] { Songti~SC }
- \setCJKsansfont { PingFang~SC }
- \setCJKmonofont { STFangsong }
- \setCJKfamilyfont { zhsong }
+ \setCJKmainfont { :3:Songti.ttc }
[
- UprightFont = *~Light ,
- BoldFont = *~Bold ,
- ] { Songti~SC }
- \setCJKfamilyfont { zhhei } { Heiti~SC }
- \setCJKfamilyfont { zhpf } { PingFang~SC }
- \setCJKfamilyfont { zhfs } { STFangsong }
-\setCJKfamilyfont { zhkai } { Kaiti~SC }
+ BoldFont = :1:Songti.ttc,
+ ItalicFont = :0:Kaiti.ttc,
+ BoldItalicFont = :3:Kaiti.ttc,
+ ]
+ \setCJKsansfont { :2:PingFang.ttc } [ BoldFont = :8:PingFang.ttc ]
+ \setCJKmonofont { STFANGSO.ttf }
+ \setCJKfamilyfont { zhsong } { :3:Songti.ttc } [ BoldFont = :1:Songti.ttc ]
+ \setCJKfamilyfont { zhhei } { :2:PingFang.ttc } [ BoldFont = :8:PingFang.ttc ]
+ \setCJKfamilyfont { zhkai } { :0:Kaiti.ttc } [ BoldFont = :3:Kaiti.ttc ]
+ \setCJKfamilyfont { zhfs } { STFANGSO.ttf }
+ \setCJKfamilyfont { zhli } { :0:Baoli.ttc }
+ \setCJKfamilyfont { zhyou } { :4:Yuanti.ttc } [ BoldFont = :0:Yuanti.ttc ]
+ \ctex_punct_set:n { mac }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_family:nn { \CJKsfdefault } { zhheil }
+ \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault, zhsong } { zhsongb }
+ \ctex_punct_map_bfseries:nn { \CJKsfdefault } { zhhei }
+ \ctex_punct_map_bfseries:nn { zhyou } { zhyoub }
+ }
+ {
+ \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhmacfonts }
+ \ctex_punct_set:n { mac }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
+ { \ctex_fontset_error:n { macnew } }
+ }
+ {
+ \ctex_set_upmap:nnn { upserif } { :3:Songti.ttc } { :1:Songti.ttc }
+ \ctex_set_upmap:nnn { upserifit } { :0:Kaiti.ttc } { }
+ \ctex_set_upmap:nnn { upstsl } { :0:Baoli.ttc } { }
+ \ctex_set_upmap:nnn { upstht } { :4:Yuanti.ttc } { }
+ \ctex_set_upmap_unicode:nnn { upsans } { :2:PingFang.ttc } { :8:PingFang.ttc }
+ \ctex_set_upmap_unicode:nnn { upmono } { STFANGSO.ttf } { }
+ \ctex_set_upfamily:nnn { zhsong } { upzhserif } { upzhserifb }
+ \ctex_set_upfamily:nnn { zhhei } { upzhsans } { upzhsansb }
+ \ctex_set_upfamily:nnn { zhfs } { upzhmono } { }
+ \ctex_set_upfamily:nnn { zhkai } { upzhserifit } { }
+ \ctex_set_upfamily:nnn { zhli } { upschrm } { }
+ \ctex_set_upfamily:nnn { zhyou } { upschgt } { }
+ }
+ {
+ \setCJKmainfont { Songti~SC~Light }
+ [
+ BoldFont = Songti~SC~Bold,
+ ItalicFont = Kaiti~SC,
+ BoldItalicFont = Kaiti~SC~Bold
+ ]
+ \setCJKsansfont { PingFang~SC }
+ \setCJKmonofont { STFangsong }
+ \setCJKfamilyfont { zhsong } { Songti~SC~Light } [ BoldFont = Songti~SC~Bold ]
+ \setCJKfamilyfont { zhhei } { Heiti~SC~Light } [ BoldFont = Heiti~SC~Medium ]
+ \setCJKfamilyfont { zhpf } { PingFang~SC }
+ \setCJKfamilyfont { zhfs } { STFangsong }
+ \setCJKfamilyfont { zhkai } { Kaiti~SC } [ BoldFont = Kaiti~SC~Bold ]
+ \setCJKfamilyfont { zhli } { Baoli~SC }
+ \setCJKfamilyfont { zhyou } { Yuanti~SC~Light } [ BoldFont = Yuanti~SC~Regular ]
+ }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \lishu { } { \CJKfamily { zhli } }
+\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } }
+\bool_lazy_or:nnTF
+ { \sys_if_engine_pdftex_p: }
+ { \sys_if_engine_uptex_p: }
+ {
+ \cs_new_eq:NN \yahei \heiti
+ \cs_new_eq:NN \pingfang \heiti
+ }
+ {
+ \NewDocumentCommand \yahei { } { \CJKfamily { zhpf } }
+ \NewDocumentCommand \pingfang { } { \CJKfamily { zhpf } }
}
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
-\NewDocumentCommand \yahei { } { \CJKfamily { zhpf } }
-\NewDocumentCommand \pingfang { } { \CJKfamily { zhpf } }
%%
%%
%% End of file `ctex-fontset-macnew.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
index 8047567fb8a..509c23e34f4 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `fontset,macold')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,35 +20,32 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
- {Mac OS X fonts definition for Yosemite or earlier version (CTEX)}
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
+ {macOS fonts definition for Yosemite or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-macold.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\sys_if_engine_pdftex:TF
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { mac } }
+ { \ctex_fontset_error:n { macold } }
+ { \ctex_fontset_error:n { macold } }
{
- \sys_if_engine_uptex:TF
- { \ctex_fontset_error:n { mac } }
- {
- \setCJKmainfont [ BoldFont = STHeiti , ItalicFont = STKaiti ] { STSong }
- \setCJKsansfont [ BoldFont = STHeiti ] { STXihei }
- \setCJKmonofont { STFangsong }
- \setCJKfamilyfont { zhsong } { STSong }
- \setCJKfamilyfont { zhhei } { STHeiti }
- \setCJKfamilyfont { zhfs } { STFangsong }
-\setCJKfamilyfont { zhkai } { STKaiti }
- }
+ \setCJKmainfont { STSong }
+ [ BoldFont = STHeiti, ItalicFont = STKaiti ]
+ \setCJKsansfont { STXihei } [ BoldFont = STHeiti ]
+ \setCJKmonofont { STFangsong }
+ \setCJKfamilyfont { zhsong } { STSong }
+ \setCJKfamilyfont { zhhei } { STHeiti }
+ \setCJKfamilyfont { zhfs } { STFangsong }
+ \setCJKfamilyfont { zhkai } { STKaiti }
}
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
%%
%%
%% End of file `ctex-fontset-macold.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
index 4c7862412b7..0493c6ee8e0 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `fontset,ubuntu')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,67 +20,69 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\sys_if_engine_pdftex:TF
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\ctex_fontset_case:nnnn
+ { \ctex_fontset_error:n { ubuntu } }
{
\ctex_zhmap_case:nnn
{
- \setCJKmainfont
- [ BoldFont = wqy-zenhei.ttc , ItalicFont = ukai.ttc ] { uming.ttc }
- \setCJKsansfont { wqy-zenhei.ttc }
- \setCJKmonofont { uming.ttc }
- \setCJKfamilyfont { zhsong } { uming.ttc }
- \setCJKfamilyfont { zhhei } { wqy-zenhei.ttc }
- \setCJKfamilyfont { zhkai } { ukai.ttc }
- \ctex_punct_set:n { ubuntu }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
- \ctex_punct_map_family:nn { \CJKttdefault } { zhsong }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \setCJKmainfont { :2:NotoSerifCJK-Regular.ttc }
+ [ BoldFont = :2:NotoSerifCJK-Bold.ttc, ItalicFont = gkai00mp.ttf ]
+ \setCJKsansfont { :2:NotoSansCJK-Regular.ttc }
+ [ BoldFont = :2:NotoSansCJK-Bold.ttc ]
+ \setCJKmonofont { :2:NotoSerifCJK-Regular.ttc }
+ [ BoldFont = :2:NotoSerifCJK-Bold.ttc ]
+ \setCJKfamilyfont { zhsong } { :2:NotoSerifCJK-Regular.ttc }
+ [ BoldFont = :2:NotoSerifCJK-Bold.ttc ]
+ \setCJKfamilyfont { zhhei } { :2:NotoSansCJK-Regular.ttc }
+ [ BoldFont = :2:NotoSansCJK-Bold.ttc ]
+ \setCJKfamilyfont { zhkai } { gkai00mp.ttf }
+ \ctex_punct_set:n { fandol }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault, zhsong } { zhsongb }
+ \ctex_punct_map_bfseries:nn { \CJKsfdefault, zhhei } { zhheib }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
{
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhsong } { zhubuntufonts }
\ctex_punct_set:n { ubuntu }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
{ \ctex_fontset_error:n { ubuntu } }
}
{
- \sys_if_engine_uptex:TF
- {
- \ctex_set_upfonts:nnnnnn
- { uming.ttc } { wqy-zenhei.ttc } { ukai.ttc }
- { wqy-zenhei.ttc } { wqy-zenhei.ttc }
- { uming.ttc }
- \ctex_set_upfamily:nnn { zhsong } { upzhserif } {}
- \ctex_set_upfamily:nnn { zhhei } { upzhsans } {}
- \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
- }
- {
- \setCJKmainfont
- [ BoldFont = WenQuanYi~Zen~Hei , ItalicFont = AR~PL~UKai~CN ] { AR~PL~UMing~CN }
- \setCJKsansfont { WenQuanYi~Zen~Hei }
- \setCJKmonofont { AR~PL~UMing~CN }
- \setCJKfamilyfont { zhsong } { AR~PL~UMing~CN }
- \setCJKfamilyfont { zhhei } { WenQuanYi~Zen~Hei }
- \setCJKfamilyfont { zhkai } { AR~PL~UKai~CN }
- }
+ \ctex_set_upmap_unicode:nnn { upserif }
+ { :2:NotoSerifCJK-Regular.ttc } { :2:NotoSerifCJK-Bold.ttc }
+ \ctex_set_upmap_unicode:nnn { upsans }
+ { :2:NotoSansCJK-Regular.ttc } { :2:NotoSansCJK-Bold.ttc }
+ \ctex_set_upmap_unicode:nnn { upmono }
+ { :2:NotoSerifCJK-Regular.ttc } { }
+ \ctex_set_upmap:nnn { upserifit } { gkai00mp.ttf } { }
+ \ctex_set_upfamily:nnn { zhsong } { upzhserif } { upzhserifb }
+ \ctex_set_upfamily:nnn { zhhei } { upzhsans } { upzhsansb }
+ \ctex_set_upfamily:nnn { zhkai } { upzhserifit } { }
+ }
+ {
+ \setCJKmainfont { Noto~Serif~CJK~SC } [ ItalicFont = AR~PL~KaitiM~GB ]
+ \setCJKsansfont { Noto~Sans~CJK~SC }
+ \setCJKmonofont { Noto~Serif~CJK~SC }
+ \setCJKfamilyfont { zhsong } { Noto~Serif~CJK~SC }
+ \setCJKfamilyfont { zhhei } { Noto~Sans~CJK~SC }
+ \setCJKfamilyfont { zhkai } { AR~PL~KaitiM~GB }
}
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
%%
%%
%% End of file `ctex-fontset-ubuntu.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
index 84c015cd8f7..daeb2dc02e1 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `fontset,windows')
%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2003--2020
%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,19 +20,96 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `maintained'.
+%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% ---------------------------------------------------------------------
%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\file_if_exist:nTF { C:/bootfont.bin }
- { \ctex_file_input:n { ctex-fontset-windowsold.def } }
- { \ctex_file_input:n { ctex-fontset-windowsnew.def } }
+ {\ExplFileDate}{2.5.1}{\ExplFileDescription}
+\file_if_exist:nTF { \c_dollar_str WINDIR/Fonts/msyh.ttc }
+ { \tl_const:Nn \c__ctex_msyh_suffix_tl { ttc } }
+ {
+ \file_if_exist:nTF { msyh.ttc }
+ { \tl_const:Nn \c__ctex_msyh_suffix_tl { ttc } }
+ { \tl_const:Nn \c__ctex_msyh_suffix_tl { ttf } }
+ }
+\ctex_fontset_case:nnn
+ {
+ \ctex_zhmap_case:nnn
+ {
+ \ctex_punct_set:n { windows }
+ \setCJKmainfont { simsun.ttc }
+ [ BoldFont = simhei.ttf, ItalicFont = simkai.ttf ]
+ \setCJKsansfont { msyh.\c__ctex_msyh_suffix_tl }
+ [ BoldFont = msyhbd.\c__ctex_msyh_suffix_tl ]
+ \setCJKmonofont { simfang.ttf }
+ \setCJKfamilyfont { zhsong } { simsun.ttc }
+ \setCJKfamilyfont { zhhei } { simhei.ttf }
+ \setCJKfamilyfont { zhfs } { simfang.ttf }
+ \setCJKfamilyfont { zhkai } { simkai.ttf }
+ \setCJKfamilyfont { zhyahei } { msyh.\c__ctex_msyh_suffix_tl }
+ [ BoldFont = msyhbd.\c__ctex_msyh_suffix_tl ]
+ \setCJKfamilyfont { zhli } { simli.ttf }
+ \setCJKfamilyfont { zhyou } { simyou.ttf }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+ \ctex_punct_map_family:nn { \CJKsfdefault } { zhyahei }
+ \ctex_punct_map_bfseries:nn { \CJKsfdefault, zhyahei } { zhyaheib }
+ \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+ }
+ {
+ \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts }
+ \ctex_punct_set:n { windows }
+ \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+ \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+ }
+ {
+ \tl_set:Nn \CJKrmdefault { rm }
+ \tl_set:Nn \CJKsfdefault { sf }
+ \tl_set:Nn \CJKttdefault { tt }
+ }
+ }
+ {
+ \ctex_set_upfonts:nnnnnn
+ { simsun.ttc }
+ { simhei.ttf }
+ { simkai.ttf }
+ { msyh.\c__ctex_msyh_suffix_tl }
+ { msyhbd.\c__ctex_msyh_suffix_tl }
+ { simfang.ttf }
+ \ctex_set_upfamily:nnn { zhsong } { upzhserif } {}
+ \ctex_set_upfamily:nnn { zhhei } { upzhserifb } {}
+ \ctex_set_upfamily:nnn { zhfs } { upzhmono } {}
+ \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
+ \ctex_set_upfamily:nnn { zhyahei } { upzhsans } { upzhsansb }
+ \ctex_set_upfamily:nnn { zhli } { upschrm } {}
+ \ctex_set_upfamily:nnn { zhyou } { upschgt } {}
+ \ctex_set_upmap:nnn { upstsl } { simli.ttf } {}
+ \ctex_set_upmap:nnn { upstht } { simyou.ttf } {}
+ }
+ {
+ \setCJKmainfont { SimSun } [ BoldFont = SimHei , ItalicFont = KaiTi ]
+ \setCJKsansfont { Microsoft~YaHei } [ BoldFont = *~Bold ]
+ \setCJKmonofont { FangSong }
+ \setCJKfamilyfont { zhsong } { SimSun }
+ \setCJKfamilyfont { zhhei } { SimHei }
+ \setCJKfamilyfont { zhfs } { FangSong }
+ \setCJKfamilyfont { zhkai } { KaiTi }
+ \setCJKfamilyfont { zhyahei } { Microsoft~YaHei } [ BoldFont = *~Bold ]
+ \setCJKfamilyfont { zhli } { LiSu }
+ \setCJKfamilyfont { zhyou } { YouYuan }
+ }
+\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \lishu { } { \CJKfamily { zhli } }
+\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } }
+\NewDocumentCommand \yahei { } { \CJKfamily { zhyahei } }
%%
%%
%% End of file `ctex-fontset-windows.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
deleted file mode 100644
index 55957b1283d..00000000000
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
+++ /dev/null
@@ -1,120 +0,0 @@
-%%
-%% This is file `ctex-fontset-windowsnew.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ctex.dtx (with options: `fontset,windowsnew')
-%%
-%% Copyright (C) 2003--2019
-%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%% http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
-%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
- {Windows fonts definition for Vista or later version (CTEX)}
-\ProvidesExplFile{ctex-fontset-windowsnew.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\tl_new:N \l__ctex_msyh_suffix_tl
-\tl_set:Nn \l__ctex_msyh_suffix_tl { .ttc }
-\file_if_exist:nF { C:/Windows/Fonts/msyh.ttc }
- {
- \file_if_exist:nF { msyh.ttc }
- { \tl_set:Nn \l__ctex_msyh_suffix_tl { .ttf } }
- }
-\sys_if_engine_pdftex:TF
- {
- \ctex_zhmap_case:nnn
- {
- \ctex_punct_set:n { windows }
- \setCJKmainfont
- [ BoldFont = simhei.ttf , ItalicFont = simkai.ttf ] { simsun.ttc }
- \setCJKsansfont
- [ BoldFont = msyhbd\l__ctex_msyh_suffix_tl ] { msyh\l__ctex_msyh_suffix_tl }
- \setCJKfamilyfont { zhyahei }
- [ BoldFont = msyhbd\l__ctex_msyh_suffix_tl ] { msyh\l__ctex_msyh_suffix_tl }
- \ctex_punct_map_family:nn { \CJKsfdefault } { zhyahei }
- \ctex_punct_map_bfseries:nn { \CJKsfdefault , zhyahei } { zhyaheib }
- \setCJKmonofont { simfang.ttf }
- \setCJKfamilyfont { zhkai } { simkai.ttf }
- \setCJKfamilyfont { zhfs } { simfang.ttf }
- \setCJKfamilyfont { zhsong } { simsun.ttc }
- \setCJKfamilyfont { zhhei } { simhei.ttf }
- \setCJKfamilyfont { zhli } { simli.ttf }
- \setCJKfamilyfont { zhyou } { simyou.ttf }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- }
- {
- \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts }
- \ctex_punct_set:n { windows }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- }
- {
- \tl_set:Nn \CJKrmdefault { rm }
- \tl_set:Nn \CJKsfdefault { sf }
- \tl_set:Nn \CJKttdefault { tt }
- }
- }
- {
- \sys_if_engine_uptex:TF
- {
- \ctex_set_upfonts:nnnnnn
- {simsun.ttc} {simhei.ttf} {simkai.ttf}
- {msyh\l__ctex_msyh_suffix_tl} {msyhbd\l__ctex_msyh_suffix_tl}
- {simfang.ttf}
- \ctex_set_upfamily:nnn { zhsong } { upzhserif } {}
- \ctex_set_upfamily:nnn { zhhei } { upzhserifb } {}
- \ctex_set_upfamily:nnn { zhfs } { upzhmono} {}
- \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
- \ctex_set_upfamily:nnn { zhyahei } { upzhsans } { upzhsansb }
- \ctex_set_upfamily:nnn { zhli } { upschrm } {}
- \ctex_set_upmap:nnn { upstsl } { simli.ttf } {}
- \ctex_set_upfamily:nnn { zhyou } { upschgt } {}
- \ctex_set_upmap:nnn { upstht } { simyou.ttf } {}
- }
- {
- \setCJKmainfont
- [ BoldFont = SimHei , ItalicFont = KaiTi ] { SimSun }
- \setCJKsansfont
- [ BoldFont = { *~Bold } ] { Microsoft~YaHei }
- \setCJKmonofont { FangSong }
- \setCJKfamilyfont { zhkai } { KaiTi }
- \setCJKfamilyfont { zhfs } { FangSong }
- \setCJKfamilyfont { zhsong } { SimSun }
- \setCJKfamilyfont { zhhei } { SimHei }
- \setCJKfamilyfont { zhli } { LiSu }
- \setCJKfamilyfont { zhyou } { YouYuan }
- \setCJKfamilyfont { zhyahei }
- [ BoldFont = { *~Bold } ] { Microsoft~YaHei }
- }
- }
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
-\NewDocumentCommand \lishu { } { \CJKfamily { zhli } }
-\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } }
-\NewDocumentCommand \yahei { } { \CJKfamily { zhyahei } }
-%%
-%%
-%% End of file `ctex-fontset-windowsnew.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
deleted file mode 100644
index 8c6ed74b725..00000000000
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% This is file `ctex-fontset-windowsold.def',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ctex.dtx (with options: `fontset,windowsold')
-%%
-%% Copyright (C) 2003--2019
-%% CTEX.ORG and any individual authors listed in the documentation.
-%% ------------------------------------------------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%% http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of
-%% LaTeX version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
-%%
-%% ------------------------------------------------------------------------------
-%%
-\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $
- {Windows fonts definition for XP or earlier version (CTEX)}
-\ProvidesExplFile{ctex-fontset-windowsold.def}
- {\ExplFileDate}{2.4.16}{\ExplFileDescription}
-\sys_if_engine_pdftex:TF
- {
- \ctex_zhmap_case:nnn
- {
- \ctex_punct_set:n { windows }
- \setCJKmainfont
- [ BoldFont = simhei.ttf , ItalicFont = simkai.ttf ] { simsun.ttc }
- \setCJKsansfont { simhei.ttf }
- \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
- \setCJKmonofont { simfang.ttf }
- \setCJKfamilyfont { zhkai } { simkai.ttf }
- \setCJKfamilyfont { zhfs } { simfang.ttf }
- \setCJKfamilyfont { zhsong } { simsun.ttc }
- \setCJKfamilyfont { zhhei } { simhei.ttf }
- \setCJKfamilyfont { zhli } { simli.ttf }
- \setCJKfamilyfont { zhyou } { simyou.ttf }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- }
- {
- \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts }
- \ctex_punct_set:n { windows }
- \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
- \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
- \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
- }
- {
- \tl_set:Nn \CJKrmdefault { rm }
- \tl_set:Nn \CJKsfdefault { sf }
- \tl_set:Nn \CJKttdefault { tt }
- }
- }
- {
- \sys_if_engine_uptex:TF
- {
- \ctex_set_upfonts:nnnnnn
- {simsun.ttc} {simhei.ttf} {simkai.ttf}
- {simhei.ttf} {simhei.ttf}
- {simfang.ttf}
- \ctex_set_upfamily:nnn { zhsong } { upzhserif } {}
- \ctex_set_upfamily:nnn { zhhei } { upzhserifb } {}
- \ctex_set_upfamily:nnn { zhfs } { upzhmono} {}
- \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {}
- \ctex_set_upfamily:nnn { zhli } { upschrm } {}
- \ctex_set_upmap:nnn { upstsl } { simli.ttf } {}
- \ctex_set_upfamily:nnn { zhyou } { upschgt } {}
- \ctex_set_upmap:nnn { upstht } { simyou.ttf } {}
- }
- {
- \setCJKmainfont
- [ BoldFont = SimHei , ItalicFont = KaiTi_GB2312 ] { SimSun }
- \setCJKsansfont { SimHei }
- \setCJKmonofont { FangSong_GB2312 }
- \setCJKfamilyfont { zhkai } { KaiTi_GB2312 }
- \setCJKfamilyfont { zhfs } { FangSong_GB2312 }
- \setCJKfamilyfont { zhsong } { SimSun }
- \setCJKfamilyfont { zhhei } { SimHei }
- \setCJKfamilyfont { zhli } { LiSu }
- \setCJKfamilyfont { zhyou } { YouYuan }
- }
- }
-\NewDocumentCommand \songti { } { \CJKfamily { zhsong } }
-\NewDocumentCommand \heiti { } { \CJKfamily { zhhei } }
-\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
-\NewDocumentCommand \kaishu { } { \CJKfamily { zhkai } }
-\NewDocumentCommand \lishu { } { \CJKfamily { zhli } }
-\NewDocumentCommand \youyuan { } { \CJKfamily { zhyou } }
-%%
-%%
-%% End of file `ctex-fontset-windowsold.def'.