From 15f0c94913f0d5cb24dd909c5358b3a997994dd7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 2 May 2020 22:24:14 +0000 Subject: ctex (2may20) git-svn-id: svn://tug.org/texlive/trunk@54976 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex | 32 ++++-- .../texmf-dist/tex/generic/ctex/ctexspamacro.tex | 18 ++-- Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex | 91 +++++++++++----- .../texmf-dist/tex/generic/ctex/zhadobefonts.tex | 55 ++++------ .../texmf-dist/tex/generic/ctex/zhfandolfonts.tex | 53 ++++------ .../texmf-dist/tex/generic/ctex/zhfounderfonts.tex | 104 ++++++++---------- Master/texmf-dist/tex/generic/ctex/zhmacfonts.tex | 111 ++++++++++++++++++++ .../texmf-dist/tex/generic/ctex/zhubuntufonts.tex | 83 +++++---------- .../texmf-dist/tex/generic/ctex/zhwindowsfonts.tex | 116 +++++++++------------ 9 files changed, 374 insertions(+), 289 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/ctex/zhmacfonts.tex (limited to 'Master/texmf-dist/tex/generic') 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@