ascmac (13jan20)

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

7 files changed, 30 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/ascmac/LICENSE b/Master/texmf-dist/doc/latex/ascmac/LICENSE
index c052ebeb9c0..cd23b4d446f 100644
--- a/Master/texmf-dist/doc/latex/ascmac/LICENSE
+++ b/Master/texmf-dist/doc/latex/ascmac/LICENSE
@@ -1,5 +1,5 @@
 Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2018 Japanese TeX Development Community
+Copyright (c) 2016-2020 Japanese TeX Development Community
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -12,9 +12,9 @@ modification, are permitted provided that the following conditions are met:
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-* Neither the name of platex nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+* Neither the name of the copyright holder nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/Master/texmf-dist/doc/latex/ascmac/README.md b/Master/texmf-dist/doc/latex/ascmac/README.md
index 0f9f11c6330..1f47a8e1102 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
 
-2018-03-09
+2020-01-13
 
 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 353dbb2e304..04a5b02e591 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/source/latex/ascmac/ascmac.dtx b/Master/texmf-dist/source/latex/ascmac/ascmac.dtx
index 66badfe8669..95ac10d90c5 100644
--- a/Master/texmf-dist/source/latex/ascmac/ascmac.dtx
+++ b/Master/texmf-dist/source/latex/ascmac/ascmac.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 %  Copyright (c) 2010 ASCII MEDIA WORKS
-%  Copyright (c) 2016-2018 Japanese TeX Development Community
+%  Copyright (c) 2016-2020 Japanese TeX Development Community
 %
 %  This file is part of ascmac community edition.
 %  -------------------------------------------------------------
@@ -11,6 +11,8 @@
 %
 % \iffalse
 %
+% 2020/01/13 v2.0i
+%     - Fix a bug: latex in DVI mode of pdfTeX did not work.
 % 2018/03/09 v2.0h
 %     - Moved to new GitHub repository:
 %       https://github.com/texjporg/ascmac
@@ -74,7 +76,7 @@
 %</driver>
 %<tascmac>\ProvidesPackage{tascmac}
 %<ascmac>\ProvidesPackage{ascmac}
-  [2018/03/09 v2.0h
+  [2020/01/13 v2.0i
 %<driver|tascmac>  ascmac package (community edition)
 %<ascmac>  ascmac wrapper (community edition)
   ]
@@ -347,16 +349,18 @@
 %    \begin{macrocode}
 %%
 %% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX)
-\ifascmac@ptex\else
-  \ifx\pdfextension\@undefined
-    \ifx\pdfmapline\@undefined\else
-      % pdfTeX, LuaTeX (<=0.81)
+\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
-  \else
-    % LuaTeX (>=0.85)
+  \fi
+\else
+  % LuaTeX (>=0.85)
+  \ifnum\outputmode>\z@\relax
     \pdfextension mapline{+ascgrp <ascgrp.pfb}
     \pdfextension mapline{+ascii10 <ascii10.pfb}
     \pdfextension mapline{+ascii36 <ascii36.pfb}
diff --git a/Master/texmf-dist/source/latex/ascmac/ascmac.ins b/Master/texmf-dist/source/latex/ascmac/ascmac.ins
index 413b1eec2ef..47b17c9cdbd 100644
--- a/Master/texmf-dist/source/latex/ascmac/ascmac.ins
+++ b/Master/texmf-dist/source/latex/ascmac/ascmac.ins
@@ -8,7 +8,7 @@
 \preamble
 
 Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2018 Japanese TeX Development Community
+Copyright (c) 2016-2020 Japanese TeX Development Community
 
 This file is part of ascmac community edition.
 -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/ascmac/ascmac.sty b/Master/texmf-dist/tex/latex/ascmac/ascmac.sty
index 5ce995d9cf8..2c0d7e9e400 100644
--- a/Master/texmf-dist/tex/latex/ascmac/ascmac.sty
+++ b/Master/texmf-dist/tex/latex/ascmac/ascmac.sty
@@ -7,7 +7,7 @@
 %% ascmac.dtx  (with options: `ascmac')
 %% 
 %% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
 %% 
 %% This file is part of ascmac community edition.
 %% -------------------------------------------------------------
@@ -16,7 +16,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ascmac}
-  [2018/03/09 v2.0h
+  [2020/01/13 v2.0i
   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 41e2b52123b..1a965b7e61e 100644
--- a/Master/texmf-dist/tex/latex/ascmac/tascmac.sty
+++ b/Master/texmf-dist/tex/latex/ascmac/tascmac.sty
@@ -7,7 +7,7 @@
 %% ascmac.dtx  (with options: `tascmac')
 %% 
 %% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
 %% 
 %% This file is part of ascmac community edition.
 %% -------------------------------------------------------------
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tascmac}
-  [2018/03/09 v2.0h
+  [2020/01/13 v2.0i
   ascmac package (community edition)
   ]
 %%
@@ -51,16 +51,18 @@
 \fi
 %%
 %% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX)
-\ifascmac@ptex\else
-  \ifx\pdfextension\@undefined
-    \ifx\pdfmapline\@undefined\else
-      % pdfTeX, LuaTeX (<=0.81)
+\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
-  \else
-    % LuaTeX (>=0.85)
+  \fi
+\else
+  % LuaTeX (>=0.85)
+  \ifnum\outputmode>\z@\relax
     \pdfextension mapline{+ascgrp <ascgrp.pfb}
     \pdfextension mapline{+ascii10 <ascii10.pfb}
     \pdfextension mapline{+ascii36 <ascii36.pfb}