From 7b2afae251df578fd99b7a9c03e39cc707bd7178 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 13 Jan 2020 21:25:41 +0000 Subject: ascmac (13jan20) git-svn-id: svn://tug.org/texlive/trunk@53391 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ascmac/ascmac.sty | 4 ++-- Master/texmf-dist/tex/latex/ascmac/tascmac.sty | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ascmac') 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 =0.85) + \fi +\else + % LuaTeX (>=0.85) + \ifnum\outputmode>\z@\relax \pdfextension mapline{+ascgrp