From 88e5447894e0ea46f39245a6c449cc313d5bc837 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Oct 2017 22:42:55 +0000 Subject: bxpapersize (8oct17) git-svn-id: svn://tug.org/texlive/trunk@45501 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bxpapersize/README.md | 3 +++ .../tex/latex/bxpapersize/bxpapersize.sty | 21 ++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/bxpapersize/README.md b/Master/texmf-dist/doc/latex/bxpapersize/README.md index 197a407160d..97c65e5d8a6 100644 --- a/Master/texmf-dist/doc/latex/bxpapersize/README.md +++ b/Master/texmf-dist/doc/latex/bxpapersize/README.md @@ -133,6 +133,9 @@ but `\bxpapersizesetup` will be always provided. Revision History ---------------- + * Version 0.3b ‹2017/10/08› + - Support pTeX-ng (ApTeX) engine properly. + - (Experimental) Add `adjustmag` option. * Version 0.3a ‹2017/05/02› - Support format `size=*` * Version 0.3 ‹2017/02/08› diff --git a/Master/texmf-dist/tex/latex/bxpapersize/bxpapersize.sty b/Master/texmf-dist/tex/latex/bxpapersize/bxpapersize.sty index f765830dce3..1370314a8a2 100644 --- a/Master/texmf-dist/tex/latex/bxpapersize/bxpapersize.sty +++ b/Master/texmf-dist/tex/latex/bxpapersize/bxpapersize.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxpapersize}[2017/05/02 v0.3a] +\ProvidesPackage{bxpapersize}[2017/10/08 v0.3b] %% preparation \def\bxpr@pkgname{bxpapersize} @@ -62,6 +62,11 @@ %% unique tokens \def\bxpr@end{\bxpr@end@} +%% \bxpr@ptexng +\chardef\bxpr@ptexng=0 +\edef\bxpr@tmpa{\string\ngbanner}\edef\bxpr@tmpb{\meaning\ngbanner} +\ifx\bxpr@tmpa\bxpr@tmpb \chardef\bxpr@ptexng=1 \fi + %% \bxpr@pagewidth / \bxpr@pageheight %% \bxpr@horigin / \bxpr@vorigin \ifluatex % LuaTeX @@ -84,7 +89,7 @@ \else\ifvtex % VTeX \let\bxpr@pagewidth\mediawidth \let\bxpr@pageheight\mediaheight -\else\ifpdf % pdfTeX in PDF mode +\else\ifnum0\the\bxpr@ptexng\ifpdf1\fi>0 % pdfTeX in PDF mode \let\bxpr@pagewidth\pdfpagewidth \let\bxpr@pageheight\pdfpageheight \let\bxpr@horigin\pdfhorigin @@ -165,6 +170,11 @@ \def\bxpr@set@priority#1{% invalidate \bxpr@err@nlprm{priority}}} +%% 'adjustmag' +\define@boolkey+[bxpr]{prm}{adjustmag}[true]% + {}% + {\bxpr@err@ivval{adjustmag}{#1}} + %% 'truedimen' \define@boolkey+[bxpr]{prm}{truedimen}[true]% {\bxpr@needs@reset@sizetrue}% @@ -389,7 +399,12 @@ \edef\bxpr@special@chunk{\special{papersize=\bxpr@tmpb}}}% \else %pdf \def\bxpr@set@page@size#1#2{% - \bxpr@pagewidth=#1\relax \bxpr@pageheight=#2\relax + \let\bxpr@tmpb\@empty + \ifbxpr@prm@adjustmag + \bxpr@let@real@mag@to\bxpr@tmpb + \fi + \bxpr@pagewidth=#1\relax \bxpr@pagewidth=\bxpr@tmpb\bxpr@pagewidth + \bxpr@pageheight=#2\relax \bxpr@pageheight=\bxpr@tmpb\bxpr@pageheight \bxDebug{papersize=\the\bxpr@pagewidth,\the\bxpr@pageheight}}% \fi -- cgit v1.2.3