summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/ctex
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/generic/ctex
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/generic/ctex')
-rw-r--r--Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex32
-rw-r--r--Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex18
-rw-r--r--Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex91
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex55
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex53
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex104
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhmacfonts.tex111
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex83
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex116
9 files changed, 374 insertions, 289 deletions
diff --git a/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex b/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex
index 3e46540e514..dd127a90aa6 100644
--- a/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex
+++ b/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `spa,make')
%%
-%% 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,14 +20,11 @@
%% 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.
-%%
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
\input ctexspamacro %
-
\MAKESPA {ctexpunct.spa}
{
{adobezhsong} {AdobeSongStd-Light} ,
@@ -49,9 +46,23 @@
{founderzhli} {FZLiShu-S01} ,
{founderzhyou} {FZXiYuan-M01} ,
{founderzhyoub} {FZZhunYuan-M02} ,
- {ubuntuzhsong} {AR PL UMing CN} ,
- {ubuntuzhhei} {WenQuanYi Zen Hei} ,
- {ubuntuzhkai} {AR PL UKai CN} ,
+ {maczhsong} {Songti SC Light} ,
+ {maczhsongb} {Songti SC Bold} ,
+ {maczhhei} {Heiti SC Medium} ,
+ {maczhheil} {Heiti SC Light} ,
+ {maczhkai} {Kaiti SC} ,
+ {maczhkaib} {Kaiti SC Bold} ,
+ {maczhfs} {STFangsong} ,
+ {maczhli} {Baoli SC} ,
+ {maczhyou} {Yuanti SC Light} ,
+ {maczhyoub} {Yuanti SC Regular} ,
+ {maczhpf} {PingFang SC} ,
+ {maczhpfb} {PingFang SC Semibold} ,
+ {ubuntuzhsong} {Noto Serif CJK SC} ,
+ {ubuntuzhsongb} {Noto Serif CJK SC Bold} ,
+ {ubuntuzhhei} {Noto Sans CJK SC} ,
+ {ubuntuzhheib} {Noto Sans CJK SC Bold} ,
+ {ubuntuzhkai} {AR PL KaitiM GB} ,
{windowszhsong} {SimSun} ,
{windowszhhei} {SimHei} ,
{windowszhkai} {KaiTi} ,
@@ -61,7 +72,6 @@
{windowszhyahei} {Microsoft YaHei} ,
{windowszhyaheib} {Microsoft YaHei Bold}
}
-
\primitive\end
%%
%%
diff --git a/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex b/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex
index 80a148e24c3..e4c91b82867 100644
--- a/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex
+++ b/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `spa,macro')
%%
-%% 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,17 +20,15 @@
%% 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.
-%%
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
\input expl3-generic %
\ExplSyntaxOn
\sys_if_engine_xetex:F
{
- \msg_new:nn { ctex } { xetex }
+ \msg_new:nnn { ctex } { xetex }
{ XeTeX~is~required~to~compile~this~document! }
\msg_fatal:nn { ctex } { xetex }
}
@@ -42,7 +40,7 @@
"FF01 , "FF1F , "FF05 , "3015 , "FF09 , "FF3D , "FF5D , "3009 ,
"300B , "3017 , "3011 , "2019 , "201D , "300D , "300F
}
-\cs_new_protected_nopar:Npn \ctex_make_spa:nn #1#2
+\cs_new_protected:Npn \ctex_make_spa:nn #1#2
{
\iow_open:Nn \g__ctex_spa_iow {#1}
\clist_map_inline:nn {#2}
@@ -66,7 +64,7 @@
}
\group_end:
}
-\cs_new_protected_nopar:Npn \__ctex_save_bounds:n #1
+\cs_new_protected:Npn \__ctex_save_bounds:n #1
{
\clist_put_right:Nx \l__ctex_punct_bounds_clist
{
@@ -75,7 +73,7 @@
}
}
\clist_new:N \l__ctex_punct_bounds_clist
-\cs_new_nopar:Npn \__ctex_calc_bounds:nn #1#2
+\cs_new:Npn \__ctex_calc_bounds:nn #1#2
{
\fp_eval:n
{
diff --git a/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex b/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex
index a1948f8bad0..e11443cb3ba 100644
--- a/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex
+++ b/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex
@@ -1,15 +1,10 @@
%%
-%% This is file `ctxdocstrip.tex',
-%% generated with the docstrip utility.
+%% File ctxdocstrip.tex
%%
-%% The original source files were:
-%%
-%% ctex.dtx (with options: `docstrip')
-%%
-%% Copyright (C) 2003--2019
+%% Copyright (C) 2016--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
%% version 1.3c of this license or (at your option) any later
@@ -19,19 +14,20 @@
%% 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.
-%%
-%% ------------------------------------------------------------------------------
-%%
-\csname ctxdocstriploaded\endcsname
-\let\ctxdocstriploaded\endinput
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%%---------------------------------------------------------------------
+%%
+\csname ctxDocstripLoaded\endcsname
+\let\ctxDocstripLoaded\endinput
\input l3docstrip %
-\edef\ctxresetcatcode{%
- \catcode\number`\$=\the\catcode`\$\relax}
+\edef\ctxResetCatcode{%
+ \catcode\number`\$=\the\catcode`\$\relax
+ \catcode\number`\@=\the\catcode`\@\relax
+}
\makeOther\$
+\catcode`\@=11\relax
\def\plusOption+#1>#2$#3$\endLine{%
\maybeMsg{<+#1 . >}%
\Evaluate{#1}%
@@ -39,13 +35,13 @@
\def\ctxID{$#3$}%
\def\do##1##2##3{%
\if1\Expr{##2}%
- \readIDFile
+ \ctxReadIDFile
\StreamPut##1{\inLine}%
\fi
}%
\activefiles
}
-\def\readIDFile{%
+\def\ctxReadIDFile{%
\openin\inputcheck=\jobname.id\relax
\ifeof\inputcheck\else
\read \inputcheck to \inLine
@@ -63,7 +59,52 @@
\endpreamble
\declarepostamble\emptypostamble
\endpostamble
-\ctxresetcatcode
-%%
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax
+ \expandafter\ctxResetCatcode\expandafter\endinput
+\fi
+\let\OriginalStreamClose\StreamClose
+\def\ctxStreamClose#1{%
+ \OriginalStreamClose{#1}%
+ \ctxConvFile{#1}%
+}
+\def\ctxConvFile#1{%
+ \ifcsname zhconv@\csstring#1\endcsname
+ \ctxConv{\lastnamedcs}%
+ {\begincsname pth@\csstring#1\endcsname}%
+ \fi
+}
+\def\ctxLuaFunc{%
+ \directlua{
+ local zhconv = require("ctex-zhconv").conv
+ local scan_arg = token.scan_argument
+ local t = lua.get_functions_table()
+ local id = 233
+ while t[id] do id = id + 1 end
+ t[id] = function ()
+ local enc = scan_arg()
+ local file = scan_arg()
+ return zhconv(enc, file, file)
+ end
+ token.set_lua("ctxConv", id, "global", "protected")
+ }%
+ \global\let\ctxLuaFunc\relax
+}
+\def\convfile{%
+ \ifx\@file\file
+ \expandafter\ctxfile\else
+ \expandafter\setconvfile\fi
+}
+\def\setconvfile#1#2{%
+ \ctxLuaFunc
+ \Name\def{zhconv@#2}{#1}%
+ \let\StreamClose\ctxStreamClose
+}
+\def\ctxfile#1#2{%
+ \setconvfile{#1}{#2}%
+ \file{#2}%
+}
+\ctxResetCatcode
+%%
%%
-%% End of file `ctxdocstrip.tex'.
+%% End of file ctxdocstrip.tex
diff --git a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex b/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
index 1ef217b9e24..f79b90d807c 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `zhmap,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,18 +20,16 @@
%% 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.
-%%
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode 35=6 % #
\catcode123=1 % {
\catcode125=2 % }
\toks0{\endlinechar=\the\endlinechar\relax}%
- \toks2{\endlinechar=13 }%
+ \toks2{\endlinechar=-1 }%
\def\x#1 #2 {%
\toks0\expandafter{\the\toks0 \catcode#1=\the\catcode#1\relax}%
\toks2\expandafter{\the\toks2 \catcode#1=#2 }}%
@@ -76,36 +74,29 @@
\fi
\endgroup
\ProvidesFile{zhadobefonts.tex}%
- [2019/05/29 v2.4.16 Adobe font map loader for DVIPDFMx (CTEX)]
-
+ [2020/05/02 v2.5.1 Adobe font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
-
\else
- \special{pdf:mapline gbk@UGBK@ UniGB-UTF16-H AdobeSongStd-Light.otf}
- \special{pdf:mapline gbksong@UGBK@ UniGB-UTF16-H AdobeSongStd-Light.otf}
- \special{pdf:mapline gbkkai@UGBK@ UniGB-UTF16-H AdobeKaitiStd-Regular.otf}
- \special{pdf:mapline gbkhei@UGBK@ UniGB-UTF16-H AdobeHeitiStd-Regular.otf}
- \special{pdf:mapline gbkfs@UGBK@ UniGB-UTF16-H AdobeFangsongStd-Regular.otf}
-
- \special{pdf:mapline cyberb@Unicode@ UniGB-UTF16-H AdobeSongStd-Light.otf}
- \special{pdf:mapline unisong@Unicode@ UniGB-UTF16-H AdobeSongStd-Light.otf}
- \special{pdf:mapline unikai@Unicode@ UniGB-UTF16-H AdobeKaitiStd-Regular.otf}
- \special{pdf:mapline unihei@Unicode@ UniGB-UTF16-H AdobeHeitiStd-Regular.otf}
- \special{pdf:mapline unifs@Unicode@ UniGB-UTF16-H AdobeFangsongStd-Regular.otf}
-
- \special{pdf:mapline gbksongsl@UGBK@ UniGB-UTF16-H AdobeSongStd-Light.otf -s .167}
- \special{pdf:mapline gbkkaisl@UGBK@ UniGB-UTF16-H AdobeKaitiStd-Regular.otf -s .167}
- \special{pdf:mapline gbkheisl@UGBK@ UniGB-UTF16-H AdobeHeitiStd-Regular.otf -s .167}
- \special{pdf:mapline gbkfssl@UGBK@ UniGB-UTF16-H AdobeFangsongStd-Regular.otf -s .167}
-
- \special{pdf:mapline unisongsl@Unicode@ UniGB-UTF16-H AdobeSongStd-Light.otf -s .167}
- \special{pdf:mapline unikaisl@Unicode@ UniGB-UTF16-H AdobeKaitiStd-Regular.otf -s .167}
- \special{pdf:mapline uniheisl@Unicode@ UniGB-UTF16-H AdobeHeitiStd-Regular.otf -s .167}
+ \special{pdf:mapline gbk@UGBK@ UniGB-UTF16-H AdobeSongStd-Light.otf}
+ \special{pdf:mapline gbksong@UGBK@ UniGB-UTF16-H AdobeSongStd-Light.otf}
+ \special{pdf:mapline gbkkai@UGBK@ UniGB-UTF16-H AdobeKaitiStd-Regular.otf}
+ \special{pdf:mapline gbkhei@UGBK@ UniGB-UTF16-H AdobeHeitiStd-Regular.otf}
+ \special{pdf:mapline gbkfs@UGBK@ UniGB-UTF16-H AdobeFangsongStd-Regular.otf}
+ \special{pdf:mapline cyberb@Unicode@ UniGB-UTF16-H AdobeSongStd-Light.otf}
+ \special{pdf:mapline unisong@Unicode@ UniGB-UTF16-H AdobeSongStd-Light.otf}
+ \special{pdf:mapline unikai@Unicode@ UniGB-UTF16-H AdobeKaitiStd-Regular.otf}
+ \special{pdf:mapline unihei@Unicode@ UniGB-UTF16-H AdobeHeitiStd-Regular.otf}
+ \special{pdf:mapline unifs@Unicode@ UniGB-UTF16-H AdobeFangsongStd-Regular.otf}
+ \special{pdf:mapline gbksongsl@UGBK@ UniGB-UTF16-H AdobeSongStd-Light.otf -s .167}
+ \special{pdf:mapline gbkkaisl@UGBK@ UniGB-UTF16-H AdobeKaitiStd-Regular.otf -s .167}
+ \special{pdf:mapline gbkheisl@UGBK@ UniGB-UTF16-H AdobeHeitiStd-Regular.otf -s .167}
+ \special{pdf:mapline gbkfssl@UGBK@ UniGB-UTF16-H AdobeFangsongStd-Regular.otf -s .167}
+ \special{pdf:mapline unisongsl@Unicode@ UniGB-UTF16-H AdobeSongStd-Light.otf -s .167}
+ \special{pdf:mapline unikaisl@Unicode@ UniGB-UTF16-H AdobeKaitiStd-Regular.otf -s .167}
+ \special{pdf:mapline uniheisl@Unicode@ UniGB-UTF16-H AdobeHeitiStd-Regular.otf -s .167}
\special{pdf:mapline unifssl@Unicode@ UniGB-UTF16-H AdobeFangsongStd-Regular.otf -s .167}
-
\fi
-
\ctex@zhmap@endinput
%%
%%
diff --git a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
index 89ea8f3c2d0..ccb6782467d 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `zhmap,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,18 +20,16 @@
%% 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.
-%%
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode 35=6 % #
\catcode123=1 % {
\catcode125=2 % }
\toks0{\endlinechar=\the\endlinechar\relax}%
- \toks2{\endlinechar=13 }%
+ \toks2{\endlinechar=-1 }%
\def\x#1 #2 {%
\toks0\expandafter{\the\toks0 \catcode#1=\the\catcode#1\relax}%
\toks2\expandafter{\the\toks2 \catcode#1=#2 }}%
@@ -76,36 +74,29 @@
\fi
\endgroup
\ProvidesFile{zhfandolfonts.tex}%
- [2019/05/29 v2.4.16 Fandol font map loader for DVIPDFMx (CTEX)]
-
+ [2020/05/02 v2.5.1 Fandol font map loader for DVIPDFMx (CTEX)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
-
\else
- \special{pdf:mapline gbk@UGBK@ UniGB-UTF16-H FandolSong-Regular.otf}
- \special{pdf:mapline gbksong@UGBK@ UniGB-UTF16-H FandolSong-Regular.otf}
- \special{pdf:mapline gbkkai@UGBK@ UniGB-UTF16-H FandolKai-Regular.otf}
- \special{pdf:mapline gbkhei@UGBK@ UniGB-UTF16-H FandolHei-Regular.otf}
- \special{pdf:mapline gbkfs@UGBK@ UniGB-UTF16-H FandolFang-Regular.otf}
-
- \special{pdf:mapline cyberb@Unicode@ UniGB-UTF16-H FandolSong-Regular.otf}
- \special{pdf:mapline unisong@Unicode@ UniGB-UTF16-H FandolSong-Regular.otf}
- \special{pdf:mapline unikai@Unicode@ UniGB-UTF16-H FandolKai-Regular.otf}
- \special{pdf:mapline unihei@Unicode@ UniGB-UTF16-H FandolHei-Regular.otf}
- \special{pdf:mapline unifs@Unicode@ UniGB-UTF16-H FandolFang-Regular.otf}
-
- \special{pdf:mapline gbksongsl@UGBK@ UniGB-UTF16-H FandolSong-Regular.otf -s .167}
- \special{pdf:mapline gbkkaisl@UGBK@ UniGB-UTF16-H FandolKai-Regular.otf -s .167}
- \special{pdf:mapline gbkheisl@UGBK@ UniGB-UTF16-H FandolHei-Regular.otf -s .167}
- \special{pdf:mapline gbkfssl@UGBK@ UniGB-UTF16-H FandolFang-Regular.otf -s .167}
-
+ \special{pdf:mapline gbk@UGBK@ UniGB-UTF16-H FandolSong-Regular.otf}
+ \special{pdf:mapline gbksong@UGBK@ UniGB-UTF16-H FandolSong-Regular.otf}
+ \special{pdf:mapline gbkkai@UGBK@ UniGB-UTF16-H FandolKai-Regular.otf}
+ \special{pdf:mapline gbkhei@UGBK@ UniGB-UTF16-H FandolHei-Regular.otf}
+ \special{pdf:mapline gbkfs@UGBK@ UniGB-UTF16-H FandolFang-Regular.otf}
+ \special{pdf:mapline cyberb@Unicode@ UniGB-UTF16-H FandolSong-Regular.otf}
+ \special{pdf:mapline unisong@Unicode@ UniGB-UTF16-H FandolSong-Regular.otf}
+ \special{pdf:mapline unikai@Unicode@ UniGB-UTF16-H FandolKai-Regular.otf}
+ \special{pdf:mapline unihei@Unicode@ UniGB-UTF16-H FandolHei-Regular.otf}
+ \special{pdf:mapline unifs@Unicode@ UniGB-UTF16-H FandolFang-Regular.otf}
+ \special{pdf:mapline gbksongsl@UGBK@ UniGB-UTF16-H FandolSong-Regular.otf -s .167}
+ \special{pdf:mapline gbkkaisl@UGBK@ UniGB-UTF16-H FandolKai-Regular.otf -s .167}
+ \special{pdf:mapline gbkheisl@UGBK@ UniGB-UTF16-H FandolHei-Regular.otf -s .167}
+ \special{pdf:mapline gbkfssl@UGBK@ UniGB-UTF16-H FandolFang-Regular.otf -s .167}
\special{pdf:mapline unisongsl@Unicode@ UniGB-UTF16-H FandolSong-Regular.otf -s .167}
- \special{pdf:mapline unikaisl@Unicode@ UniGB-UTF16-H FandolKai-Regular.otf -s .167}
- \special{pdf:mapline uniheisl@Unicode@ UniGB-UTF16-H FandolHei-Regular.otf -s .167}
+ \special{pdf:mapline unikaisl@Unicode@ UniGB-UTF16-H FandolKai-Regular.otf -s .167}
+ \special{pdf:mapline uniheisl@Unicode@ UniGB-UTF16-H FandolHei-Regular.otf -s .167}
\special{pdf:mapline unifssl@Unicode@ UniGB-UTF16-H FandolFang-Regular.otf -s .167}
-
\fi
-
\ctex@zhmap@endinput
%%
%%
diff --git a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
index 25a877e8401..41b50779afb 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `zhmap,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,18 +20,16 @@
%% 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.
-%%
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode 35=6 % #
\catcode123=1 % {
\catcode125=2 % }
\toks0{\endlinechar=\the\endlinechar\relax}%
- \toks2{\endlinechar=13 }%
+ \toks2{\endlinechar=-1 }%
\def\x#1 #2 {%
\toks0\expandafter{\the\toks0 \catcode#1=\the\catcode#1\relax}%
\toks2\expandafter{\the\toks2 \catcode#1=#2 }}%
@@ -76,72 +74,62 @@
\fi
\endgroup
\ProvidesFile{zhfounderfonts.tex}%
- [2019/05/29 v2.4.16 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
-
+ [2020/05/02 v2.5.1 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
- \pdfmapline{=gbk@UGBK@ <FZSSK.TTF}
- \pdfmapline{=gbksong@UGBK@ <FZSSK.TTF}
- \pdfmapline{=gbkkai@UGBK@ <FZKTK.TTF}
- \pdfmapline{=gbkhei@UGBK@ <FZHTK.TTF}
- \pdfmapline{=gbkfs@UGBK@ <FZFSK.TTF}
- \pdfmapline{=gbkli@UGBK@ <FZLSK.TTF}
- \pdfmapline{=gbkyou@UGBK@ <FZY1K.TTF}
-
- \pdfmapline{=cyberb@Unicode@ <FZSSK.TTF}
- \pdfmapline{=unisong@Unicode@ <FZSSK.TTF}
- \pdfmapline{=unikai@Unicode@ <FZKTK.TTF}
- \pdfmapline{=unihei@Unicode@ <FZHTK.TTF}
- \pdfmapline{=unifs@Unicode@ <FZFSK.TTF}
- \pdfmapline{=unili@Unicode@ <FZLSK.TTF}
- \pdfmapline{=uniyou@Unicode@ <FZY1K.TTF}
-
- \pdfmapline{=gbksongsl@UGBK@ <FZSSK.TTF}
- \pdfmapline{=gbkkaisl@UGBK@ <FZKTK.TTF}
- \pdfmapline{=gbkheisl@UGBK@ <FZHTK.TTF}
- \pdfmapline{=gbkfssl@UGBK@ <FZFSK.TTF}
- \pdfmapline{=gbklisl@UGBK@ <FZLSK.TTF}
- \pdfmapline{=gbkyousl@UGBK@ <FZY1K.TTF}
-
+ \pdfmapline{=gbk@UGBK@ <FZSSK.TTF}
+ \pdfmapline{=gbksong@UGBK@ <FZSSK.TTF}
+ \pdfmapline{=gbkkai@UGBK@ <FZKTK.TTF}
+ \pdfmapline{=gbkhei@UGBK@ <FZHTK.TTF}
+ \pdfmapline{=gbkfs@UGBK@ <FZFSK.TTF}
+ \pdfmapline{=gbkli@UGBK@ <FZLSK.TTF}
+ \pdfmapline{=gbkyou@UGBK@ <FZY1K.TTF}
+ \pdfmapline{=cyberb@Unicode@ <FZSSK.TTF}
+ \pdfmapline{=unisong@Unicode@ <FZSSK.TTF}
+ \pdfmapline{=unikai@Unicode@ <FZKTK.TTF}
+ \pdfmapline{=unihei@Unicode@ <FZHTK.TTF}
+ \pdfmapline{=unifs@Unicode@ <FZFSK.TTF}
+ \pdfmapline{=unili@Unicode@ <FZLSK.TTF}
+ \pdfmapline{=uniyou@Unicode@ <FZY1K.TTF}
+ \pdfmapline{=gbksongsl@UGBK@ <FZSSK.TTF}
+ \pdfmapline{=gbkkaisl@UGBK@ <FZKTK.TTF}
+ \pdfmapline{=gbkheisl@UGBK@ <FZHTK.TTF}
+ \pdfmapline{=gbkfssl@UGBK@ <FZFSK.TTF}
+ \pdfmapline{=gbklisl@UGBK@ <FZLSK.TTF}
+ \pdfmapline{=gbkyousl@UGBK@ <FZY1K.TTF}
\pdfmapline{=unisongsl@Unicode@ <FZSSK.TTF}
\pdfmapline{=unikaisl@Unicode@ <FZKTK.TTF}
\pdfmapline{=uniheisl@Unicode@ <FZHTK.TTF}
\pdfmapline{=unifssl@Unicode@ <FZFSK.TTF}
\pdfmapline{=unilisl@Unicode@ <FZLSK.TTF}
\pdfmapline{=uniyousl@Unicode@ <FZY1K.TTF}
-
\else
- \special{pdf:mapline gbk@UGBK@ unicode FZSSK.TTF}
- \special{pdf:mapline gbksong@UGBK@ unicode FZSSK.TTF}
- \special{pdf:mapline gbkkai@UGBK@ unicode FZKTK.TTF}
- \special{pdf:mapline gbkhei@UGBK@ unicode FZHTK.TTF}
- \special{pdf:mapline gbkfs@UGBK@ unicode FZFSK.TTF}
- \special{pdf:mapline gbkli@UGBK@ unicode FZLSK.TTF}
- \special{pdf:mapline gbkyou@UGBK@ unicode FZY1K.TTF}
-
- \special{pdf:mapline cyberb@Unicode@ unicode FZSSK.TTF}
- \special{pdf:mapline unisong@Unicode@ unicode FZSSK.TTF}
- \special{pdf:mapline unikai@Unicode@ unicode FZKTK.TTF}
- \special{pdf:mapline unihei@Unicode@ unicode FZHTK.TTF}
- \special{pdf:mapline unifs@Unicode@ unicode FZFSK.TTF}
- \special{pdf:mapline unili@Unicode@ unicode FZLSK.TTF}
- \special{pdf:mapline uniyou@Unicode@ unicode FZY1K.TTF}
-
- \special{pdf:mapline gbksongsl@UGBK@ unicode FZSSK.TTF -s .167}
- \special{pdf:mapline gbkkaisl@UGBK@ unicode FZKTK.TTF -s .167}
- \special{pdf:mapline gbkheisl@UGBK@ unicode FZHTK.TTF -s .167}
- \special{pdf:mapline gbkfssl@UGBK@ unicode FZFSK.TTF -s .167}
- \special{pdf:mapline gbklisl@UGBK@ unicode FZLSK.TTF -s .167}
- \special{pdf:mapline gbkyousl@UGBK@ unicode FZY1K.TTF -s .167}
-
+ \special{pdf:mapline gbk@UGBK@ unicode FZSSK.TTF}
+ \special{pdf:mapline gbksong@UGBK@ unicode FZSSK.TTF}
+ \special{pdf:mapline gbkkai@UGBK@ unicode FZKTK.TTF}
+ \special{pdf:mapline gbkhei@UGBK@ unicode FZHTK.TTF}
+ \special{pdf:mapline gbkfs@UGBK@ unicode FZFSK.TTF}
+ \special{pdf:mapline gbkli@UGBK@ unicode FZLSK.TTF}
+ \special{pdf:mapline gbkyou@UGBK@ unicode FZY1K.TTF}
+ \special{pdf:mapline cyberb@Unicode@ unicode FZSSK.TTF}
+ \special{pdf:mapline unisong@Unicode@ unicode FZSSK.TTF}
+ \special{pdf:mapline unikai@Unicode@ unicode FZKTK.TTF}
+ \special{pdf:mapline unihei@Unicode@ unicode FZHTK.TTF}
+ \special{pdf:mapline unifs@Unicode@ unicode FZFSK.TTF}
+ \special{pdf:mapline unili@Unicode@ unicode FZLSK.TTF}
+ \special{pdf:mapline uniyou@Unicode@ unicode FZY1K.TTF}
+ \special{pdf:mapline gbksongsl@UGBK@ unicode FZSSK.TTF -s .167}
+ \special{pdf:mapline gbkkaisl@UGBK@ unicode FZKTK.TTF -s .167}
+ \special{pdf:mapline gbkheisl@UGBK@ unicode FZHTK.TTF -s .167}
+ \special{pdf:mapline gbkfssl@UGBK@ unicode FZFSK.TTF -s .167}
+ \special{pdf:mapline gbklisl@UGBK@ unicode FZLSK.TTF -s .167}
+ \special{pdf:mapline gbkyousl@UGBK@ unicode FZY1K.TTF -s .167}
\special{pdf:mapline unisongsl@Unicode@ unicode FZSSK.TTF -s .167}
\special{pdf:mapline unikaisl@Unicode@ unicode FZKTK.TTF -s .167}
\special{pdf:mapline uniheisl@Unicode@ unicode FZHTK.TTF -s .167}
\special{pdf:mapline unifssl@Unicode@ unicode FZFSK.TTF -s .167}
\special{pdf:mapline unilisl@Unicode@ unicode FZLSK.TTF -s .167}
\special{pdf:mapline uniyousl@Unicode@ unicode FZY1K.TTF -s .167}
-
\fi
-
\ctex@zhmap@endinput
%%
%%
diff --git a/Master/texmf-dist/tex/generic/ctex/zhmacfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhmacfonts.tex
new file mode 100644
index 00000000000..d55e58bc950
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/ctex/zhmacfonts.tex
@@ -0,0 +1,111 @@
+%%
+%% This is file `zhmacfonts.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx (with options: `zhmap,mac')
+%%
+%% 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
+%% 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".
+%%
+%% ---------------------------------------------------------------------
+%%
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+ \catcode 35=6 % #
+ \catcode123=1 % {
+ \catcode125=2 % }
+ \toks0{\endlinechar=\the\endlinechar\relax}%
+ \toks2{\endlinechar=-1 }%
+ \def\x#1 #2 {%
+ \toks0\expandafter{\the\toks0 \catcode#1=\the\catcode#1\relax}%
+ \toks2\expandafter{\the\toks2 \catcode#1=#2 }}%
+ \x 13 5 % carriage return
+ \x 32 10 % space
+ \x 35 6 % #
+ \x 40 12 % (
+ \x 41 12 % )
+ \x 45 12 % -
+ \x 46 12 % .
+ \x 47 12 % /
+ \x 58 12 % :
+ \x 60 12 % <
+ \x 61 12 % =
+ \x 64 11 % @
+ \x 91 12 % [
+ \x 93 12 % ]
+ \x 123 1 % {
+ \x 125 2 % }
+ \edef\x#1{\endgroup%
+ \edef\noexpand#1{%
+ \the\toks0 %
+ \let\noexpand\noexpand\noexpand#1%
+ \noexpand\noexpand\noexpand\undefined%
+ \noexpand\noexpand\noexpand\endinput}%
+ \the\toks2}%
+\expandafter\x\csname ctex@zhmap@endinput\endcsname
+\begingroup\expandafter\endgroup
+\expandafter\let\csname ifzhmappdf\expandafter\endcsname\csname
+ \expandafter\ifx\csname ifctexpdf\endcsname\relax
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ iffalse\else\ifnum\pdfoutput < 1 iffalse\else iftrue\fi\fi
+ \else ifctexpdf\fi
+\endcsname
+\begingroup
+\expandafter\ifx\csname ProvidesFile\endcsname\relax
+ \long\def\x#1\ProvidesFile#2[#3]{%
+ #1%
+ \immediate\write-1{File: #2 #3}%
+ \expandafter\xdef\csname ver@#2\endcsname{#3}}
+ \expandafter\x%
+\fi
+\endgroup
+\ProvidesFile{zhmacfonts.tex}%
+ [2020/05/02 v2.5.1 Mac font map loader for pdfTeX and DVIPDFMx (CTEX)]
+\ifzhmappdf
+%% pdfTeX does not support OTF fonts
+\else
+ \special{pdf:mapline gbk@UGBK@ UniGB-UTF16-H :3:Songti.ttc}
+ \special{pdf:mapline gbksong@UGBK@ UniGB-UTF16-H :3:Songti.ttc}
+ \special{pdf:mapline gbkkai@UGBK@ UniGB-UTF16-H :0:Kaiti.ttc}
+ \special{pdf:mapline gbkhei@UGBK@ unicode :2:PingFang.ttc}
+ \special{pdf:mapline gbkfs@UGBK@ unicode STFANGSO.ttf}
+ \special{pdf:mapline gbkli@UGBK@ UniGB-UTF16-H :0:Baoli.ttc}
+ \special{pdf:mapline gbkyou@UGBK@ UniGB-UTF16-H :4:Yuanti.ttc}
+ \special{pdf:mapline cyberb@Unicode@ UniGB-UTF16-H :3:Songti.ttc}
+ \special{pdf:mapline unisong@Unicode@ UniGB-UTF16-H :3:Songti.ttc}
+ \special{pdf:mapline unikai@Unicode@ UniGB-UTF16-H :0:Kaiti.ttc}
+ \special{pdf:mapline unihei@Unicode@ unicode :2:PingFang.ttc}
+ \special{pdf:mapline unifs@Unicode@ unicode STFANGSO.ttf}
+ \special{pdf:mapline unili@Unicode@ UniGB-UTF16-H :0:Baoli.ttc}
+ \special{pdf:mapline uniyou@Unicode@ UniGB-UTF16-H :4:Yuanti.ttc}
+ \special{pdf:mapline gbksongsl@UGBK@ UniGB-UTF16-H :3:Songti.ttc -s .167}
+ \special{pdf:mapline gbkkaisl@UGBK@ UniGB-UTF16-H :0:Kaiti.ttc -s .167}
+ \special{pdf:mapline gbkheisl@UGBK@ unicode :2:PingFang.ttc -s .167}
+ \special{pdf:mapline gbkfssl@UGBK@ unicode STFANGSO.ttf -s .167}
+ \special{pdf:mapline gbklisl@UGBK@ UniGB-UTF16-H :0:Baoli.ttc -s .167}
+ \special{pdf:mapline gbkyousl@UGBK@ UniGB-UTF16-H :4:Yuanti.ttc -s .167}
+ \special{pdf:mapline unisongsl@Unicode@ UniGB-UTF16-H :3:Songti.ttc -s .167}
+ \special{pdf:mapline unikaisl@Unicode@ UniGB-UTF16-H :0:Kaiti.ttc -s .167}
+ \special{pdf:mapline uniheisl@Unicode@ unicode :2:PingFang.ttc -s .167}
+ \special{pdf:mapline unifssl@Unicode@ unicode STFANGSO.ttf -s .167}
+ \special{pdf:mapline unilisl@Unicode@ UniGB-UTF16-H :0:Baoli.ttc -s .167}
+ \special{pdf:mapline uniyousl@Unicode@ UniGB-UTF16-H :4:Yuanti.ttc -s .167}
+\fi
+\ctex@zhmap@endinput
+%%
+%%
+%% End of file `zhmacfonts.tex'.
diff --git a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex b/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
index c62ea5684b3..3161650088f 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `zhmap,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,18 +20,16 @@
%% 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.
-%%
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode 35=6 % #
\catcode123=1 % {
\catcode125=2 % }
\toks0{\endlinechar=\the\endlinechar\relax}%
- \toks2{\endlinechar=13 }%
+ \toks2{\endlinechar=-1 }%
\def\x#1 #2 {%
\toks0\expandafter{\the\toks0 \catcode#1=\the\catcode#1\relax}%
\toks2\expandafter{\the\toks2 \catcode#1=#2 }}%
@@ -76,60 +74,29 @@
\fi
\endgroup
\ProvidesFile{zhubuntufonts.tex}%
- [2019/05/29 v2.4.16 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
-
+ [2020/05/02 v2.5.1 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
- \pdfmapline{=gbk@UGBK@ <uming.ttc}
- \pdfmapline{=gbksong@UGBK@ <uming.ttc}
- \pdfmapline{=gbkkai@UGBK@ <ukai.ttc}
- \pdfmapline{=gbkhei@UGBK@ <wqy-zenhei.ttc}
- \pdfmapline{=gbkfs@UGBK@ <uming.ttc}
- \pdfmapline{=gbkyou@UGBK@ <wqy-zenhei.ttc}
-
- \pdfmapline{=cyberb@Unicode@ <uming.ttc}
- \pdfmapline{=unisong@Unicode@ <uming.ttc}
- \pdfmapline{=unikai@Unicode@ <ukai.ttc}
- \pdfmapline{=unihei@Unicode@ <wqy-zenhei.ttc}
- \pdfmapline{=unifs@Unicode@ <uming.ttc}
- \pdfmapline{=uniyou@Unicode@ <wqy-zenhei.ttc}
-
- \pdfmapline{=gbksongsl@UGBK@ <uming.ttc}
- \pdfmapline{=gbkkaisl@UGBK@ <ukai.ttc}
- \pdfmapline{=gbkheisl@UGBK@ <wqy-zenhei.ttc}
- \pdfmapline{=gbkfssl@UGBK@ <uming.ttc}
- \pdfmapline{=gbkyousl@UGBK@ <wqy-zenhei.ttc}
-
- \pdfmapline{=unisongsl@Unicode@ <uming.ttc}
- \pdfmapline{=unikaisl@Unicode@ <ukai.ttc}
- \pdfmapline{=uniheisl@Unicode@ <wqy-zenhei.ttc}
- \pdfmapline{=unifssl@Unicode@ <uming.ttc}
- \pdfmapline{=uniyousl@Unicode@ <wqy-zenhei.ttc}
-
+%% pdfTeX does not support OTF fonts
\else
- \special{pdf:mapline gbk@UGBK@ unicode :0:uming.ttc}
- \special{pdf:mapline gbksong@UGBK@ unicode :0:uming.ttc}
- \special{pdf:mapline gbkkai@UGBK@ unicode :0:ukai.ttc}
- \special{pdf:mapline gbkhei@UGBK@ unicode :0:wqy-zenhei.ttc}
- \special{pdf:mapline gbkfs@UGBK@ unicode :0:uming.ttc}
-
- \special{pdf:mapline cyberb@Unicode@ unicode :0:uming.ttc}
- \special{pdf:mapline unisong@Unicode@ unicode :0:uming.ttc}
- \special{pdf:mapline unikai@Unicode@ unicode :0:ukai.ttc}
- \special{pdf:mapline unihei@Unicode@ unicode :0:wqy-zenhei.ttc}
- \special{pdf:mapline unifs@Unicode@ unicode :0:uming.ttc}
-
- \special{pdf:mapline gbksongsl@UGBK@ unicode :0:uming.ttc -s .167}
- \special{pdf:mapline gbkkaisl@UGBK@ unicode :0:ukai.ttc -s .167}
- \special{pdf:mapline gbkheisl@UGBK@ unicode :0:wqy-zenhei.ttc -s .167}
- \special{pdf:mapline gbkfssl@UGBK@ unicode :0:uming.ttc -s .167}
-
- \special{pdf:mapline unisongsl@Unicode@ unicode :0:uming.ttc -s .167}
- \special{pdf:mapline unikaisl@Unicode@ unicode :0:ukai.ttc -s .167}
- \special{pdf:mapline uniheisl@Unicode@ unicode :0:wqy-zenhei.ttc -s .167}
- \special{pdf:mapline unifssl@Unicode@ unicode :0:uming.ttc -s .167}
-
+ \special{pdf:mapline gbk@UGBK@ unicode :2:NotoSerifCJK-Regular.ttc}
+ \special{pdf:mapline gbksong@UGBK@ unicode :2:NotoSerifCJK-Regular.ttc}
+ \special{pdf:mapline gbkkai@UGBK@ unicode gkai00mp.ttf}
+ \special{pdf:mapline gbkhei@UGBK@ unicode :2:NotoSansCJK-Regular.ttc}
+ \special{pdf:mapline gbkfs@UGBK@ unicode :2:NotoSerifCJK-Regular.ttc}
+ \special{pdf:mapline cyberb@Unicode@ unicode :2:NotoSerifCJK-Regular.ttc}
+ \special{pdf:mapline unisong@Unicode@ unicode :2:NotoSerifCJK-Regular.ttc}
+ \special{pdf:mapline unikai@Unicode@ unicode gkai00mp.ttf}
+ \special{pdf:mapline unihei@Unicode@ unicode :2:NotoSansCJK-Regular.ttc}
+ \special{pdf:mapline unifs@Unicode@ unicode :2:NotoSerifCJK-Regular.ttc}
+ \special{pdf:mapline gbksongsl@UGBK@ unicode :2:NotoSerifCJK-Regular.ttc -s .167}
+ \special{pdf:mapline gbkkaisl@UGBK@ unicode gkai00mp.ttf -s .167}
+ \special{pdf:mapline gbkheisl@UGBK@ unicode :2:NotoSansCJK-Regular.ttc -s .167}
+ \special{pdf:mapline gbkfssl@UGBK@ unicode :2:NotoSerifCJK-Regular.ttc -s .167}
+ \special{pdf:mapline unisongsl@Unicode@ unicode :2:NotoSerifCJK-Regular.ttc -s .167}
+ \special{pdf:mapline unikaisl@Unicode@ unicode gkai00mp.ttf -s .167}
+ \special{pdf:mapline uniheisl@Unicode@ unicode :2:NotoSansCJK-Regular.ttc -s .167}
+ \special{pdf:mapline unifssl@Unicode@ unicode :2:NotoSerifCJK-Regular.ttc -s .167}
\fi
-
\ctex@zhmap@endinput
%%
%%
diff --git a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
index e1d6a8c4306..5c5226d0e83 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
@@ -6,9 +6,9 @@
%%
%% ctex.dtx (with options: `zhmap,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,18 +20,16 @@
%% 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.
-%%
-%% ------------------------------------------------------------------------------
+%% ---------------------------------------------------------------------
%%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode 35=6 % #
\catcode123=1 % {
\catcode125=2 % }
\toks0{\endlinechar=\the\endlinechar\relax}%
- \toks2{\endlinechar=13 }%
+ \toks2{\endlinechar=-1 }%
\def\x#1 #2 {%
\toks0\expandafter{\the\toks0 \catcode#1=\the\catcode#1\relax}%
\toks2\expandafter{\the\toks2 \catcode#1=#2 }}%
@@ -76,72 +74,62 @@
\fi
\endgroup
\ProvidesFile{zhwindowsfonts.tex}%
- [2019/05/29 v2.4.16 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
-
+ [2020/05/02 v2.5.1 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
\ifzhmappdf
- \pdfmapline{=gbk@UGBK@ <simsun.ttc}
- \pdfmapline{=gbksong@UGBK@ <simsun.ttc}
- \pdfmapline{=gbkkai@UGBK@ <simkai.ttf}
- \pdfmapline{=gbkhei@UGBK@ <simhei.ttf}
- \pdfmapline{=gbkfs@UGBK@ <simfang.ttf}
- \pdfmapline{=gbkli@UGBK@ <simli.ttf}
- \pdfmapline{=gbkyou@UGBK@ <simyou.ttf}
-
- \pdfmapline{=cyberb@Unicode@ <simsun.ttc}
- \pdfmapline{=unisong@Unicode@ <simsun.ttc}
- \pdfmapline{=unikai@Unicode@ <simkai.ttf}
- \pdfmapline{=unihei@Unicode@ <simhei.ttf}
- \pdfmapline{=unifs@Unicode@ <simfang.ttf}
- \pdfmapline{=unili@Unicode@ <simli.ttf}
- \pdfmapline{=uniyou@Unicode@ <simyou.ttf}
-
- \pdfmapline{=gbksongsl@UGBK@ <simsun.ttc}
- \pdfmapline{=gbkkaisl@UGBK@ <simkai.ttf}
- \pdfmapline{=gbkheisl@UGBK@ <simhei.ttf}
- \pdfmapline{=gbkfssl@UGBK@ <simfang.ttf}
- \pdfmapline{=gbklisl@UGBK@ <simli.ttf}
- \pdfmapline{=gbkyousl@UGBK@ <simyou.ttf}
-
+ \pdfmapline{=gbk@UGBK@ <simsun.ttc}
+ \pdfmapline{=gbksong@UGBK@ <simsun.ttc}
+ \pdfmapline{=gbkkai@UGBK@ <simkai.ttf}
+ \pdfmapline{=gbkhei@UGBK@ <simhei.ttf}
+ \pdfmapline{=gbkfs@UGBK@ <simfang.ttf}
+ \pdfmapline{=gbkli@UGBK@ <simli.ttf}
+ \pdfmapline{=gbkyou@UGBK@ <simyou.ttf}
+ \pdfmapline{=cyberb@Unicode@ <simsun.ttc}
+ \pdfmapline{=unisong@Unicode@ <simsun.ttc}
+ \pdfmapline{=unikai@Unicode@ <simkai.ttf}
+ \pdfmapline{=unihei@Unicode@ <simhei.ttf}
+ \pdfmapline{=unifs@Unicode@ <simfang.ttf}
+ \pdfmapline{=unili@Unicode@ <simli.ttf}
+ \pdfmapline{=uniyou@Unicode@ <simyou.ttf}
+ \pdfmapline{=gbksongsl@UGBK@ <simsun.ttc}
+ \pdfmapline{=gbkkaisl@UGBK@ <simkai.ttf}
+ \pdfmapline{=gbkheisl@UGBK@ <simhei.ttf}
+ \pdfmapline{=gbkfssl@UGBK@ <simfang.ttf}
+ \pdfmapline{=gbklisl@UGBK@ <simli.ttf}
+ \pdfmapline{=gbkyousl@UGBK@ <simyou.ttf}
\pdfmapline{=unisongsl@Unicode@ <simsun.ttc}
\pdfmapline{=unikaisl@Unicode@ <simkai.ttf}
\pdfmapline{=uniheisl@Unicode@ <simhei.ttf}
\pdfmapline{=unifssl@Unicode@ <simfang.ttf}
\pdfmapline{=unilisl@Unicode@ <simli.ttf}
\pdfmapline{=uniyousl@Unicode@ <simyou.ttf}
-
\else
- \special{pdf:mapline gbk@UGBK@ unicode :0:simsun.ttc -v 50}
- \special{pdf:mapline gbksong@UGBK@ unicode :0:simsun.ttc -v 50}
- \special{pdf:mapline gbkkai@UGBK@ unicode simkai.ttf -v 70}
- \special{pdf:mapline gbkhei@UGBK@ unicode simhei.ttf -v 150}
- \special{pdf:mapline gbkfs@UGBK@ unicode simfang.ttf -v 50}
- \special{pdf:mapline gbkli@UGBK@ unicode simli.ttf -v 150}
- \special{pdf:mapline gbkyou@UGBK@ unicode simyou.ttf -v 60}
-
- \special{pdf:mapline cyberb@Unicode@ unicode :0:simsun.ttc -v 50}
- \special{pdf:mapline unisong@Unicode@ unicode :0:simsun.ttc -v 50}
- \special{pdf:mapline unikai@Unicode@ unicode simkai.ttf -v 70}
- \special{pdf:mapline unihei@Unicode@ unicode simhei.ttf -v 150}
- \special{pdf:mapline unifs@Unicode@ unicode simfang.ttf -v 50}
- \special{pdf:mapline unili@Unicode@ unicode simli.ttf -v 150}
- \special{pdf:mapline uniyou@Unicode@ unicode simyou.ttf -v 60}
-
- \special{pdf:mapline gbksongsl@UGBK@ unicode :0:simsun.ttc -s .167 -v 50}
- \special{pdf:mapline gbkkaisl@UGBK@ unicode simkai.ttf -s .167 -v 70}
- \special{pdf:mapline gbkheisl@UGBK@ unicode simhei.ttf -s .167 -v 150}
- \special{pdf:mapline gbkfssl@UGBK@ unicode simfang.ttf -s .167 -v 50}
- \special{pdf:mapline gbklisl@UGBK@ unicode simli.ttf -s .167 -v 150}
- \special{pdf:mapline gbkyousl@UGBK@ unicode simyou.ttf -s .167 -v 60}
-
- \special{pdf:mapline unisongsl@Unicode@ unicode :0:simsun.ttc -s .167 -v 50}
- \special{pdf:mapline unikaisl@Unicode@ unicode simkai.ttf -s .167 -v 70}
- \special{pdf:mapline uniheisl@Unicode@ unicode simhei.ttf -s .167 -v 150}
- \special{pdf:mapline unifssl@Unicode@ unicode simfang.ttf -s .167 -v 50}
- \special{pdf:mapline unilisl@Unicode@ unicode simli.ttf -s .167 -v 150}
- \special{pdf:mapline uniyousl@Unicode@ unicode simyou.ttf -s .167 -v 60}
-
+ \special{pdf:mapline gbk@UGBK@ unicode :0:simsun.ttc -v 50}
+ \special{pdf:mapline gbksong@UGBK@ unicode :0:simsun.ttc -v 50}
+ \special{pdf:mapline gbkkai@UGBK@ unicode simkai.ttf -v 70}
+ \special{pdf:mapline gbkhei@UGBK@ unicode simhei.ttf -v 150}
+ \special{pdf:mapline gbkfs@UGBK@ unicode simfang.ttf -v 50}
+ \special{pdf:mapline gbkli@UGBK@ unicode simli.ttf -v 150}
+ \special{pdf:mapline gbkyou@UGBK@ unicode simyou.ttf -v 60}
+ \special{pdf:mapline cyberb@Unicode@ unicode :0:simsun.ttc -v 50}
+ \special{pdf:mapline unisong@Unicode@ unicode :0:simsun.ttc -v 50}
+ \special{pdf:mapline unikai@Unicode@ unicode simkai.ttf -v 70}
+ \special{pdf:mapline unihei@Unicode@ unicode simhei.ttf -v 150}
+ \special{pdf:mapline unifs@Unicode@ unicode simfang.ttf -v 50}
+ \special{pdf:mapline unili@Unicode@ unicode simli.ttf -v 150}
+ \special{pdf:mapline uniyou@Unicode@ unicode simyou.ttf -v 60}
+ \special{pdf:mapline gbksongsl@UGBK@ unicode :0:simsun.ttc -v 50 -s .167}
+ \special{pdf:mapline gbkkaisl@UGBK@ unicode simkai.ttf -v 70 -s .167}
+ \special{pdf:mapline gbkheisl@UGBK@ unicode simhei.ttf -v 150 -s .167}
+ \special{pdf:mapline gbkfssl@UGBK@ unicode simfang.ttf -v 50 -s .167}
+ \special{pdf:mapline gbklisl@UGBK@ unicode simli.ttf -v 150 -s .167}
+ \special{pdf:mapline gbkyousl@UGBK@ unicode simyou.ttf -v 60 -s .167}
+ \special{pdf:mapline unisongsl@Unicode@ unicode :0:simsun.ttc -v 50 -s .167}
+ \special{pdf:mapline unikaisl@Unicode@ unicode simkai.ttf -v 70 -s .167}
+ \special{pdf:mapline uniheisl@Unicode@ unicode simhei.ttf -v 150 -s .167}
+ \special{pdf:mapline unifssl@Unicode@ unicode simfang.ttf -v 50 -s .167}
+ \special{pdf:mapline unilisl@Unicode@ unicode simli.ttf -v 150 -s .167}
+ \special{pdf:mapline uniyousl@Unicode@ unicode simyou.ttf -v 60 -s .167}
\fi
-
\ctex@zhmap@endinput
%%
%%