Skip to content

Commit

Permalink
ctex: zhadobefonts.tex 等字体映射文件更名为 ctex-zhmap*.tex
Browse files Browse the repository at this point in the history
  • Loading branch information
qinglee committed May 5, 2020
1 parent 320df30 commit a15aa2d
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 56 deletions.
1 change: 1 addition & 0 deletions ctex/build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ gitverfiles = {"ctex.dtx", "ctxdoc.cls"}
tdslocations = {
"source/latex/ctex/*-make.lua",
"source/latex/ctex/*.ins",
"tex/generic/ctex/zhmap/ctex-zhmap*.tex",
"tex/generic/ctex/*.tex",
"tex/latex/ctex/config/*.cfg",
"tex/latex/ctex/fd/*.fd",
Expand Down
114 changes: 60 additions & 54 deletions ctex/ctex.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,14 @@ Copyright and Licence
ctex-fontset-windows.def,
ctexspa.def,
ctexpunct.spa,
ctexmakespa.tex,
ctexspamacro.tex,
zhadobefonts.tex,
zhfandolfonts.tex,
zhfounderfonts.tex,
zhmacfonts.tex,
zhubuntufonts.tex,
zhwindowsfonts.tex,
ctex-spa-make.tex,
ctex-spa-macro.tex,
ctex-zhmap-adobe.tex,
ctex-zhmap-fandol.tex,
ctex-zhmap-founder.tex,
ctex-zhmap-mac.tex,
ctex-zhmap-ubuntu.tex,
ctex-zhmap-windows.tex,
ctex-zhconv-index.lua,
translator-theorem-dictionary-ChineseGBK.dict,
translator-theorem-dictionary-ChineseUTF8.dict, and
Expand Down Expand Up @@ -249,14 +249,14 @@ Copyright and Licence
ctex-fontset-windows.def,
ctexspa.def,
ctexpunct.spa,
ctexmakespa.tex,
ctexspamacro.tex,
zhadobefonts.tex,
zhfandolfonts.tex,
zhfounderfonts.tex,
zhmacfonts.tex,
zhubuntufonts.tex,
zhwindowsfonts.tex,
ctex-spa-make.tex,
ctex-spa-macro.tex,
ctex-zhmap-adobe.tex,
ctex-zhmap-fandol.tex,
ctex-zhmap-founder.tex,
ctex-zhmap-mac.tex,
ctex-zhmap-ubuntu.tex,
ctex-zhmap-windows.tex,
ctex-zhconv-index.lua,
translator-theorem-dictionary-ChineseGBK.dict,
translator-theorem-dictionary-ChineseUTF8.dict, and
Expand Down Expand Up @@ -330,14 +330,14 @@ Copyright and Licence
\file{ctexspa.def} {\from{\jobname.dtx}{ctexspa}
\from{ctexpunct.spa}{}}
\usedir{tex/generic/ctex}
\file{ctexmakespa.tex} {\from{\jobname.dtx}{spa,make}}
\file{ctexspamacro.tex} {\from{\jobname.dtx}{spa,macro}}
\file{zhadobefonts.tex} {\from{\jobname.dtx}{zhmap,adobe}}
\file{zhfandolfonts.tex} {\from{\jobname.dtx}{zhmap,fandol}}
\file{zhfounderfonts.tex} {\from{\jobname.dtx}{zhmap,founder}}
\file{zhmacfonts.tex} {\from{\jobname.dtx}{zhmap,mac}}
\file{zhubuntufonts.tex} {\from{\jobname.dtx}{zhmap,ubuntu}}
\file{zhwindowsfonts.tex} {\from{\jobname.dtx}{zhmap,windows}}
\file{ctex-spa-make.tex} {\from{\jobname.dtx}{spa,make}}
\file{ctex-spa-macro.tex} {\from{\jobname.dtx}{spa,macro}}
\file{ctex-zhmap-adobe.tex} {\from{\jobname.dtx}{zhmap,adobe}}
\file{ctex-zhmap-fandol.tex} {\from{\jobname.dtx}{zhmap,fandol}}
\file{ctex-zhmap-founder.tex} {\from{\jobname.dtx}{zhmap,founder}}
\file{ctex-zhmap-mac.tex} {\from{\jobname.dtx}{zhmap,mac}}
\file{ctex-zhmap-ubuntu.tex} {\from{\jobname.dtx}{zhmap,ubuntu}}
\file{ctex-zhmap-windows.tex} {\from{\jobname.dtx}{zhmap,windows}}
%</install>
%<*internal>
\usedir{source/latex/ctex}
Expand Down Expand Up @@ -415,14 +415,14 @@ Copyright and Licence
\Msg{* ctex-fontset-ubuntu.def *}
\Msg{* ctex-fontset-windows.def *}
\Msg{* ctexspa.def *}
\Msg{* ctexmakespa.tex *}
\Msg{* ctexspamacro.tex *}
\Msg{* zhadobefonts.tex *}
\Msg{* zhfandolfonts.tex *}
\Msg{* zhfounderfonts.tex *}
\Msg{* zhmacfonts.tex *}
\Msg{* zhubuntufonts.tex *}
\Msg{* zhwindowsfonts.tex *}
\Msg{* ctex-spa-make.tex *}
\Msg{* ctex-spa-macro.tex *}
\Msg{* ctex-zhmap-adobe.tex *}
\Msg{* ctex-zhmap-fandol.tex *}
\Msg{* ctex-zhmap-founder.tex *}
\Msg{* ctex-zhmap-mac.tex *}
\Msg{* ctex-zhmap-ubuntu.tex *}
\Msg{* ctex-zhmap-windows.tex *}
\Msg{* translator-theorem-dictionary-ChineseGBK.dict *}
\Msg{* translator-theorem-dictionary-ChineseUTF8.dict *}
\Msg{* *}
Expand Down Expand Up @@ -4188,7 +4188,7 @@ Copyright and Licence
\tl_set:Nn \CJKrmdefault {#1}
\tl_set:Nn \CJKsfdefault {#2}
\tl_set:Nn \CJKttdefault {#3}
\ctex_set_zhmap:n { \ctex_zhmap_input:n {#4} }
\ctex_set_zhmap:n { \ctex_zhmap_input:n { ctex-zhmap- #4 .tex } }
}
\@onlypreamble \ctex_load_zhmap:nnnn
% \end{macrocode}
Expand Down Expand Up @@ -10028,7 +10028,7 @@ Copyright and Licence
\ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
{
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhadobefonts }
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { adobe }
\ctex_punct_set:n { adobe }
\ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
\ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
Expand Down Expand Up @@ -10098,7 +10098,7 @@ Copyright and Licence
\ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
{
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfandolfonts }
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { fandol }
\ctex_punct_set:n { fandol }
\ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
\ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
Expand Down Expand Up @@ -10172,7 +10172,7 @@ Copyright and Licence
\ctex_punct_map_bfseries:nn { zhyou } { zhyoub }
}
{
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfounderfonts }
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { founder }
\ctex_punct_set:n { founder }
\ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
\ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
Expand Down Expand Up @@ -10281,7 +10281,7 @@ Copyright and Licence
\ctex_punct_map_bfseries:nn { zhyou } { zhyoub }
}
{
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhmacfonts }
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { mac }
\ctex_punct_set:n { mac }
\ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
\ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
Expand Down Expand Up @@ -10367,7 +10367,7 @@ Copyright and Licence
\ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
}
{
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhsong } { zhubuntufonts }
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhsong } { ubuntu }
\ctex_punct_set:n { ubuntu }
\ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
\ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
Expand Down Expand Up @@ -10448,7 +10448,7 @@ Copyright and Licence
\ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
}
{
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts }
\ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { windows }
\ctex_punct_set:n { windows }
\ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
\ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
Expand Down Expand Up @@ -10533,6 +10533,9 @@ Copyright and Licence
%
% \subsubsection{\pkg{zhmetrics} 的字体映射}
%
% \changes{v2.5.2}{2020/05/05}{\file{zhadobefonts.tex} 等字体映射文件更名为
% \file{ctex-zhmap-*.tex}。}
%
% 确认 \tn{catcode},没有重复载入检查。
% \begin{macrocode}
%<*zhmap>
Expand Down Expand Up @@ -10600,21 +10603,21 @@ Copyright and Licence
%
% 文件标识信息。
% \begin{macrocode}
%<adobe>\ProvidesFile{zhadobefonts.tex}%
%<adobe>\ProvidesFile{ctex-zhmap-adobe.tex}%
%<adobe> [2020/05/02 v2.5.1 Adobe font map loader for DVIPDFMx (CTEX)]
%<fandol>\ProvidesFile{zhfandolfonts.tex}%
%<fandol>\ProvidesFile{ctex-zhmap-fandol.tex}%
%<fandol> [2020/05/02 v2.5.1 Fandol font map loader for DVIPDFMx (CTEX)]
%<founder>\ProvidesFile{zhfounderfonts.tex}%
%<founder>\ProvidesFile{ctex-zhmap-founder.tex}%
%<founder> [2020/05/02 v2.5.1 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
%<mac>\ProvidesFile{zhmacfonts.tex}%
%<mac> [2020/05/02 v2.5.1 Mac font map loader for pdfTeX and DVIPDFMx (CTEX)]
%<ubuntu>\ProvidesFile{zhubuntufonts.tex}%
%<ubuntu> [2020/05/02 v2.5.1 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
%<windows>\ProvidesFile{zhwindowsfonts.tex}%
%<mac>\ProvidesFile{ctex-zhmap-mac.tex}%
%<mac> [2020/05/02 v2.5.1 Mac font map loader for DVIPDFMx (CTEX)]
%<ubuntu>\ProvidesFile{ctex-zhmap-ubuntu.tex}%
%<ubuntu> [2020/05/02 v2.5.1 Ubuntu font map loader for DVIPDFMx (CTEX)]
%<windows>\ProvidesFile{ctex-zhmap-windows.tex}%
%<windows> [2020/05/02 v2.5.1 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
% \end{macrocode}
%
% \paragraph{\pkg{zhadobefonts.tex}}
% \paragraph{\pkg{ctex-zhmap-adobe.tex}}
%
% \begin{macrocode}
%<*adobe>
Expand Down Expand Up @@ -10643,7 +10646,7 @@ Copyright and Licence
%</adobe>
% \end{macrocode}
%
% \paragraph{\pkg{zhfandolfonts.tex}}
% \paragraph{\pkg{ctex-zhmap-fandol.tex}}
%
% \begin{macrocode}
%<*fandol>
Expand Down Expand Up @@ -10672,7 +10675,7 @@ Copyright and Licence
%</fandol>
% \end{macrocode}
%
% \paragraph{\pkg{zhfounderfonts.tex}}
% \paragraph{\pkg{ctex-zhmap-founder.tex}}
%
% \begin{macrocode}
%<*founder>
Expand Down Expand Up @@ -10734,7 +10737,7 @@ Copyright and Licence
%</founder>
% \end{macrocode}
%
% \paragraph{\pkg{zhmacfonts.tex}}
% \paragraph{\pkg{ctex-zhmap-mac.tex}}
%
% \changes{v2.5}{2020/01/15}{增加字体映射文件 \file{zhmacfonts.tex}。}
%
Expand Down Expand Up @@ -10773,7 +10776,7 @@ Copyright and Licence
%</mac>
% \end{macrocode}
%
% \paragraph{\pkg{zhubuntufonts.tex}}
% \paragraph{\pkg{ctex-zhmap-ubuntu.tex}}
%
% \begin{macrocode}
%<*ubuntu>
Expand Down Expand Up @@ -10802,7 +10805,7 @@ Copyright and Licence
%</ubuntu>
% \end{macrocode}
%
% \paragraph{\pkg{zhwindowsfonts.tex}}
% \paragraph{\pkg{ctex-zhmap-windows.tex}}
%
% \begin{macrocode}
%<*windows>
Expand Down Expand Up @@ -10871,6 +10874,9 @@ Copyright and Licence
%
% \subsubsection{制作 \texttt{spa} 文件}
%
% \changes{v2.5.2}{2020/05/05}{\file{ctexmakespa.tex} 更名为 \file{ctex-spa-make.tex}。}
% \changes{v2.5.2}{2020/05/05}{\file{ctexspamacro.tex} 更名为 \file{ctex-spa-macro.tex}。}
%
% 我们通过 \XeTeX{} 的 \tn{XeTeXglyphbounds} 取得字体中标点符号的边界信息,为
% \pkg{CJKpunct} 宏包制作 \file{spa}。
%
Expand Down Expand Up @@ -10970,7 +10976,7 @@ Copyright and Licence
% 下面是 \CTeX{} 定义的一些字体。
% \begin{macrocode}
%<*make>
\input ctexspamacro %
\input ctex-spa-macro %
\MAKESPA {ctexpunct.spa}
{
{adobezhsong} {AdobeSongStd-Light} ,
Expand Down
2 changes: 1 addition & 1 deletion ctex/test/testfiles/files01.pdftex.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ ctex.cfg
UTF8.bdg
UTF8.enc
UTF8.chr
zhfandolfonts.tex
ctex-zhmap-fandol.tex
2 changes: 1 addition & 1 deletion ctex/test/testfiles/files02.pdftex.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ ctex.cfg
UTF8.bdg
UTF8.enc
UTF8.chr
zhfandolfonts.tex
ctex-zhmap-fandol.tex

0 comments on commit a15aa2d

Please sign in to comment.