From 4c0e3e7fa86ecd3794204d362c7e17b3d9433415 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 16 Jan 2020 03:01:19 +0000 Subject: CTAN sync 202001160301 --- macros/latex/contrib/ascmac/Makefile | 2 ++ macros/latex/contrib/ascmac/README.md | 2 +- macros/latex/contrib/ascmac/ascmac.dtx | 58 +++++++++++++++++++++------------ macros/latex/contrib/ascmac/ascmac.map | 3 ++ macros/latex/contrib/ascmac/ascmac.pdf | Bin 158813 -> 161039 bytes 5 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 macros/latex/contrib/ascmac/ascmac.map (limited to 'macros/latex/contrib/ascmac') diff --git a/macros/latex/contrib/ascmac/Makefile b/macros/latex/contrib/ascmac/Makefile index 06c631d4d3..bcbfb413a9 100644 --- a/macros/latex/contrib/ascmac/Makefile +++ b/macros/latex/contrib/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/macros/latex/contrib/ascmac/README.md b/macros/latex/contrib/ascmac/README.md index 1f47a8e110..d932130ade 100644 --- a/macros/latex/contrib/ascmac/README.md +++ b/macros/latex/contrib/ascmac/README.md @@ -26,6 +26,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-01-13 +2020-01-15 Japanese TeX Development Community diff --git a/macros/latex/contrib/ascmac/ascmac.dtx b/macros/latex/contrib/ascmac/ascmac.dtx index 95ac10d90c..483aee8cf2 100644 --- a/macros/latex/contrib/ascmac/ascmac.dtx +++ b/macros/latex/contrib/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 @@ % %\ProvidesPackage{tascmac} %\ProvidesPackage{ascmac} - [2020/01/13 v2.0i + [2020/01/15 v2.1 % ascmac package (community edition) % 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 =0.85) - \ifnum\outputmode>\z@\relax - \pdfextension mapline{+ascgrp \z@\relax +% \pdfmapline{+ascgrp =0.85) +% \ifnum\outputmode>\z@\relax +% \pdfextension mapline{+ascgrp