diff options
author | Karl Berry <karl@freefriends.org> | 2020-01-15 21:48:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-01-15 21:48:01 +0000 |
commit | 586af81988b0010289175e033ca7b8da81c95e7f (patch) | |
tree | 878cfcedd9e07ad5ab61aa4a461e8c8a83207d19 /Master/texmf-dist/source | |
parent | 3b161a9a7d50654716f09a4c08e0281d8c71dec7 (diff) |
ascmac (15jan20)
git-svn-id: svn://tug.org/texlive/trunk@53411 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/ascmac/Makefile | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/ascmac/ascmac.dtx | 58 |
2 files changed, 39 insertions, 21 deletions
diff --git a/Master/texmf-dist/source/latex/ascmac/Makefile b/Master/texmf-dist/source/latex/ascmac/Makefile index 06c631d4d3c..bcbfb413a9a 100644 --- a/Master/texmf-dist/source/latex/ascmac/Makefile +++ b/Master/texmf-dist/source/latex/ascmac/Makefile @@ -38,6 +38,8 @@ install: cp ./*.pdf ${TEXMF}/doc/latex/ascmac/ mkdir -p ${TEXMF}/fonts/source/public/ascmac cp ./*.mf ${TEXMF}/fonts/source/public/ascmac/ + mkdir -p ${TEXMF}/fonts/map/dvips/ascmac + cp ./*.map ${TEXMF}/fonts/map/dvips/ascmac/ mkdir -p ${TEXMF}/fonts/type1/public/ascmac cp ./*.pfb ${TEXMF}/fonts/type1/public/ascmac/ mkdir -p ${TEXMF}/fonts/tfm/public/ascmac diff --git a/Master/texmf-dist/source/latex/ascmac/ascmac.dtx b/Master/texmf-dist/source/latex/ascmac/ascmac.dtx index 95ac10d90c5..483aee8cf2e 100644 --- a/Master/texmf-dist/source/latex/ascmac/ascmac.dtx +++ b/Master/texmf-dist/source/latex/ascmac/ascmac.dtx @@ -11,6 +11,10 @@ % % \iffalse % +% 2020/01/15 v2.1 +% - Use an external map file for supporting dvips. +% 2020/01/14 v2.0j +% - Fix a bug introduced in v2.0i for XeLaTeX. % 2020/01/13 v2.0i % - Fix a bug: latex in DVI mode of pdfTeX did not work. % 2018/03/09 v2.0h @@ -76,7 +80,7 @@ %</driver> %<tascmac>\ProvidesPackage{tascmac} %<ascmac>\ProvidesPackage{ascmac} - [2020/01/13 v2.0i + [2020/01/15 v2.1 %<driver|tascmac> ascmac package (community edition) %<ascmac> ascmac wrapper (community edition) ] @@ -341,31 +345,43 @@ \fi % \end{macrocode} % -% pdf\LaTeX{}やLua\LaTeX{}のプリミティブを使って、ascgrpのType1フォントを -% 使用できるように設定します。 +% 以前の版ではascgrpのType1フォントを設定するために +% pdf\LaTeX{}やLua\LaTeX{}のプリミティブを使用していましたが、 +% v2.1ではマップファイル(ascmac.map)を用意しました。 +% このmapファイルを\verb+$TEXMF/fonts/map/dvips/ascmac/+にインストールして +%\begin{verbatim} +% updmap-sys --enable MixedMap=ascmac.map +%\end{verbatim} +% を実行すれば有効になります。 % \changes{2016/08/21}{v2.0c}{pdf\LaTeX{}でascgrpのType1フォントを使用} % \changes{2017/12/06}{v2.0e}{念のためe-拡張なしのエンジンでのエラーを防止} % \changes{2017/12/17}{v2.0f}{判定が逆になっていたのを修正} +% \changes{2020/01/13}{v2.0i}{\LaTeX{}のDVIモードをサポート} +% \changes{2020/01/14}{v2.0j}{v2.0iの変更でXeLaTeXでエラーが出たのを修正} +% \changes{2020/01/15}{v2.1}{dvipsもサポートするため、外部マップファイルに分離} % \begin{macrocode} %% -%% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX) -\ifx\pdfextension\@undefined - \ifx\pdfmapline\@undefined\else - % pdfTeX, LuaTeX (<=0.81) - \ifnum\pdfoutput>\z@\relax - \pdfmapline{+ascgrp <ascgrp.pfb} - \pdfmapline{+ascii10 <ascii10.pfb} - \pdfmapline{+ascii36 <ascii36.pfb} - \fi - \fi -\else - % LuaTeX (>=0.85) - \ifnum\outputmode>\z@\relax - \pdfextension mapline{+ascgrp <ascgrp.pfb} - \pdfextension mapline{+ascii10 <ascii10.pfb} - \pdfextension mapline{+ascii36 <ascii36.pfb} - \fi -\fi +%% Use Type1 font for ascgrp: moved to an external map file +%\ifx\pdfextension\@undefined +% \ifx\pdfmapline\@undefined\else +% % pdfTeX, LuaTeX (<=0.81) +% % [memo] XeTeX does not have \pdfmapline, but xelatex.ini defines it. +% % Here we ignore it by checking the existence of \pdfoutput, +% % as [x]dvipdfmx can add the similar effect implicitly. +% \ifx\pdfoutput\@undefined\else\ifnum\pdfoutput>\z@\relax +% \pdfmapline{+ascgrp <ascgrp.pfb} +% \pdfmapline{+ascii10 <ascii10.pfb} +% \pdfmapline{+ascii36 <ascii36.pfb} +% \fi\fi +% \fi +%\else +% % LuaTeX (>=0.85) +% \ifnum\outputmode>\z@\relax +% \pdfextension mapline{+ascgrp <ascgrp.pfb} +% \pdfextension mapline{+ascii10 <ascii10.pfb} +% \pdfextension mapline{+ascii36 <ascii36.pfb} +% \fi +%\fi % \end{macrocode} % % \begin{macro}{\@savetbaselineshift} |