ascmac (15jan20)

git-svn-id: svn://tug.org/texlive/trunk@53411 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 47 insertions, 42 deletions

diff --git a/Master/texmf-dist/doc/latex/ascmac/README.md b/Master/texmf-dist/doc/latex/ascmac/README.md
index 1f47a8e1102..d932130adef 100644
--- a/Master/texmf-dist/doc/latex/ascmac/README.md
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/ascmac/ascmac.pdf b/Master/texmf-dist/doc/latex/ascmac/ascmac.pdf
index 04a5b02e591..6d4a041b908 100644
--- a/Master/texmf-dist/doc/latex/ascmac/ascmac.pdf
+++ b/Master/texmf-dist/doc/latex/ascmac/ascmac.pdf
diff --git a/Master/texmf-dist/fonts/map/dvips/ascmac/ascmac.map b/Master/texmf-dist/fonts/map/dvips/ascmac/ascmac.map
new file mode 100644
index 00000000000..5b08f21314b
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvips/ascmac/ascmac.map
@@ -0,0 +1,3 @@
+ascgrp TeX-ascgrp <ascgrp.pfb
+ascii10 TeX-ascii10 <ascii10.pfb
+ascii36 TeX-ascii36 <ascii36.pfb
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}
diff --git a/Master/texmf-dist/tex/latex/ascmac/ascmac.sty b/Master/texmf-dist/tex/latex/ascmac/ascmac.sty
index 2c0d7e9e400..b1a7bd1b1fa 100644
--- a/Master/texmf-dist/tex/latex/ascmac/ascmac.sty
+++ b/Master/texmf-dist/tex/latex/ascmac/ascmac.sty
@@ -16,7 +16,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ascmac}
-  [2020/01/13 v2.0i
+  [2020/01/15 v2.1
   ascmac wrapper (community edition)
   ]
 \RequirePackage{tascmac}
diff --git a/Master/texmf-dist/tex/latex/ascmac/tascmac.sty b/Master/texmf-dist/tex/latex/ascmac/tascmac.sty
index 1a965b7e61e..446c2f9881b 100644
--- a/Master/texmf-dist/tex/latex/ascmac/tascmac.sty
+++ b/Master/texmf-dist/tex/latex/ascmac/tascmac.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tascmac}
-  [2020/01/13 v2.0i
+  [2020/01/15 v2.1
   ascmac package (community edition)
   ]
 %%
@@ -50,24 +50,7 @@
   \catcode`\Q=14\relax
 \fi
 %%
-%% 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
 %%
 %% ascmac.sty 10/28 '88
 %% ASCII special macros
diff --git a/Master/tlpkg/tlpsrc/ascmac.tlpsrc b/Master/tlpkg/tlpsrc/ascmac.tlpsrc
index e69de29bb2d..493569ed3f6 100644
--- a/Master/tlpkg/tlpsrc/ascmac.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ascmac.tlpsrc
@@ -0,0 +1 @@
+execute addMap ${PKGNAME}.map