From 8ff31de8e556b04af853316e6de5852c6b2def20 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 17 Dec 2017 22:55:29 +0000
Subject: platex (17dec17)

git-svn-id: svn://tug.org/texlive/trunk@46082 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/platex/base/README.md     |   2 +-
 Master/texmf-dist/doc/platex/base/ascmac.pdf    | Bin 148536 -> 148478 bytes
 Master/texmf-dist/source/platex/base/ascmac.dtx |  19 ++++++++++++-------
 Master/texmf-dist/tex/platex/base/ascmac.sty    |   2 +-
 Master/texmf-dist/tex/platex/base/tascmac.sty   |  16 +++++++++-------
 5 files changed, 23 insertions(+), 16 deletions(-)

(limited to 'Master/texmf-dist')

diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md
index 473ca2ad4f3..4bf6b7efba7 100644
--- a/Master/texmf-dist/doc/platex/base/README.md
+++ b/Master/texmf-dist/doc/platex/base/README.md
@@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2017-12-06
+2017-12-17
 
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/platex/base/ascmac.pdf b/Master/texmf-dist/doc/platex/base/ascmac.pdf
index 52f1db6d560..93ff816e7d3 100644
Binary files a/Master/texmf-dist/doc/platex/base/ascmac.pdf and b/Master/texmf-dist/doc/platex/base/ascmac.pdf differ
diff --git a/Master/texmf-dist/source/platex/base/ascmac.dtx b/Master/texmf-dist/source/platex/base/ascmac.dtx
index edb5b6d0340..f9895e6e146 100644
--- a/Master/texmf-dist/source/platex/base/ascmac.dtx
+++ b/Master/texmf-dist/source/platex/base/ascmac.dtx
@@ -11,6 +11,8 @@
 %
 % \iffalse
 %
+% 2017/12/17 v2.0f
+%     - Fix a bug.
 % 2017/12/06 v2.0e
 %     - Again works with non-e-TeX engines.
 % 2017/07/22 v2.0d
@@ -67,7 +69,7 @@
 %</driver>
 %<tascmac>\ProvidesPackage{tascmac}
 %<ascmac>\ProvidesPackage{ascmac}
-  [2017/12/06 v2.0e
+  [2017/12/17 v2.0f
 %<driver|tascmac>  ascmac package (community edition)
 %<ascmac>  ascmac wrapper (community edition)
   ]
@@ -329,21 +331,24 @@
 % 使用できるように設定します。
 % \changes{2016/08/21}{v2.0c}{pdf\LaTeX{}でascgrpのType1フォントを使用}
 % \changes{2017/12/06}{v2.0e}{念のためe-拡張なしのエンジンでのエラーを防止}
+% \changes{2017/12/17}{v2.0f}{判定が逆になっていたのを修正}
 %    \begin{macrocode}
 %%
 %% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX)
 \ifascmac@ptex\else
   \ifx\pdfextension\@undefined
+    \ifx\pdfmapline\@undefined\else
+      % pdfTeX, LuaTeX (<=0.81)
+      \pdfmapline{+ascgrp <ascgrp.pfb}
+      \pdfmapline{+ascii10 <ascii10.pfb}
+      \pdfmapline{+ascii36 <ascii36.pfb}
+    \fi
+  \else
     % LuaTeX (>=0.85)
     \pdfextension mapline{+ascgrp <ascgrp.pfb}
     \pdfextension mapline{+ascii10 <ascii10.pfb}
     \pdfextension mapline{+ascii36 <ascii36.pfb}
-  \else\ifx\pdfmapline\@undefined
-    % pdfTeX, LuaTeX (<=0.81)
-    \pdfmapline{+ascgrp <ascgrp.pfb}
-    \pdfmapline{+ascii10 <ascii10.pfb}
-    \pdfmapline{+ascii36 <ascii36.pfb}
-  \fi\fi
+  \fi
 \fi
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/platex/base/ascmac.sty b/Master/texmf-dist/tex/platex/base/ascmac.sty
index c7d11fa8cc2..f2ab32cc2a6 100644
--- a/Master/texmf-dist/tex/platex/base/ascmac.sty
+++ b/Master/texmf-dist/tex/platex/base/ascmac.sty
@@ -16,7 +16,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ascmac}
-  [2017/12/06 v2.0e
+  [2017/12/17 v2.0f
   ascmac wrapper (community edition)
   ]
 \RequirePackage{tascmac}
diff --git a/Master/texmf-dist/tex/platex/base/tascmac.sty b/Master/texmf-dist/tex/platex/base/tascmac.sty
index 317f97565d0..207bf51bd72 100644
--- a/Master/texmf-dist/tex/platex/base/tascmac.sty
+++ b/Master/texmf-dist/tex/platex/base/tascmac.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tascmac}
-  [2017/12/06 v2.0e
+  [2017/12/17 v2.0f
   ascmac package (community edition)
   ]
 %%
@@ -53,16 +53,18 @@
 %% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX)
 \ifascmac@ptex\else
   \ifx\pdfextension\@undefined
+    \ifx\pdfmapline\@undefined\else
+      % pdfTeX, LuaTeX (<=0.81)
+      \pdfmapline{+ascgrp <ascgrp.pfb}
+      \pdfmapline{+ascii10 <ascii10.pfb}
+      \pdfmapline{+ascii36 <ascii36.pfb}
+    \fi
+  \else
     % LuaTeX (>=0.85)
     \pdfextension mapline{+ascgrp <ascgrp.pfb}
     \pdfextension mapline{+ascii10 <ascii10.pfb}
     \pdfextension mapline{+ascii36 <ascii36.pfb}
-  \else\ifx\pdfmapline\@undefined
-    % pdfTeX, LuaTeX (<=0.81)
-    \pdfmapline{+ascgrp <ascgrp.pfb}
-    \pdfmapline{+ascii10 <ascii10.pfb}
-    \pdfmapline{+ascii36 <ascii36.pfb}
-  \fi\fi
+  \fi
 \fi
 %%
 %% ascmac.sty 10/28 '88
-- 
cgit v1.2.3