From b3225c4301e7724de481f410444fef5463799b9d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 14 Jan 2020 03:00:43 +0000 Subject: CTAN sync 202001140300 --- macros/latex/contrib/ascmac/LICENSE | 8 ++++---- macros/latex/contrib/ascmac/README.md | 2 +- macros/latex/contrib/ascmac/ascmac.dtx | 20 ++++++++++++-------- macros/latex/contrib/ascmac/ascmac.ins | 2 +- macros/latex/contrib/ascmac/ascmac.pdf | Bin 153604 -> 158813 bytes 5 files changed, 18 insertions(+), 14 deletions(-) (limited to 'macros/latex/contrib/ascmac') diff --git a/macros/latex/contrib/ascmac/LICENSE b/macros/latex/contrib/ascmac/LICENSE index c052ebeb9c..cd23b4d446 100644 --- a/macros/latex/contrib/ascmac/LICENSE +++ b/macros/latex/contrib/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/macros/latex/contrib/ascmac/README.md b/macros/latex/contrib/ascmac/README.md index 0f9f11c633..1f47a8e110 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 -2018-03-09 +2020-01-13 Japanese TeX Development Community diff --git a/macros/latex/contrib/ascmac/ascmac.dtx b/macros/latex/contrib/ascmac/ascmac.dtx index 66badfe866..95ac10d90c 100644 --- a/macros/latex/contrib/ascmac/ascmac.dtx +++ b/macros/latex/contrib/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 @@ % %\ProvidesPackage{tascmac} %\ProvidesPackage{ascmac} - [2018/03/09 v2.0h + [2020/01/13 v2.0i % ascmac package (community edition) % 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 =0.85) + \fi +\else + % LuaTeX (>=0.85) + \ifnum\outputmode>\z@\relax \pdfextension mapline{+ascgrp