texlive[70657] trunk: pdfxup (15mar24)
commits+karl at tug.org
commits+karl at tug.org
Fri Mar 15 22:25:17 CET 2024
Revision: 70657
https://tug.org/svn/texlive?view=revision&revision=70657
Author: karl
Date: 2024-03-15 22:25:17 +0100 (Fri, 15 Mar 2024)
Log Message:
-----------
pdfxup (15mar24)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
trunk/Master/texmf-dist/doc/man/man1/pdfxup.1
trunk/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf
trunk/Master/texmf-dist/doc/support/pdfxup/README
trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES
trunk/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf
trunk/Master/texmf-dist/scripts/pdfxup/pdfxup
trunk/Master/texmf-dist/tex/latex/pdfxup/pdfxup-template.tex
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/pdfxup/lipics.xup
trunk/Master/texmf-dist/tex/latex/pdfxup/llncs.xup
Modified: trunk/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/man/man1/pdfxup.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/pdfxup.1 2024-03-15 21:24:56 UTC (rev 70656)
+++ trunk/Master/texmf-dist/doc/man/man1/pdfxup.1 2024-03-15 21:25:17 UTC (rev 70657)
@@ -1,6 +1,6 @@
.\" Manpage for pdfxup.
.\" Contact pdfxup at markey.fr to correct errors or typos.
-.TH man 1 "25 april 2021" "2.10" "pdfxup man page"
+.TH man 1 "24 april 2021" "2.10" "pdfxup man page"
.SH NAME
pdfxup \- n-up tool with reduced margins
.SH SYNOPSIS
@@ -125,12 +125,20 @@
.TP
\fB\-col\fR, \fB\-\-column-mode\fR, \fB\-\-vertical\fR
fill in pages top-down first (instead of the default left-to-right mode).
-By default, pages are inserted from left to right, until the line is full;
+By default, pages are inserted from left-to-right, until the line is full;
with this option, pages are inserted from top to bottom, until the column
-is full. See option \fB\-bal\fR below for examples of both options.
+is full. For instance:
+.nf
+ --------- ---------
+row-mode | 1 2 3 | column-mode | 1 4 7 |
+ | 4 5 6 | | 2 5 8 |
+ | 7 8 9 | | 3 6 9 |
+ --------- ---------
+
+.fi
.TP
\fB\-row\fR, \fB\-\-row-mode\fR, \fB\-\-horizontal\fR
-fill in pages left to right (which is the default mode).
+fill in pages left to right.
.TP
\fB\-bal\fR, \fB\-\-balance-last\fR
balance last page: when using column mode, the pages are filled in from
@@ -140,26 +148,16 @@
rows.
.nf
--------- ---------
-row, no-balance | 1 2 3 | column, no-balance | 1 4 7 |
-(default mode) | 4 5 6 | | 2 5 8 |
- | 7 8 9 | | 3 6 9 |
+row, no-balance | 1 2 3 | column, no-balance | 1 4 |
+ | 4 5 | | 2 5 |
+ | | | 3 |
--------- ---------
- --------- ---------
- |10 11 12 | |10 13 |
- |13 14 | |11 14 |
- | | |12 |
- --------- ---------
--------- ---------
- row, balance | 1 2 3 | column, balance | 1 4 7 |
- | 4 5 6 | | 2 5 8 |
- | 7 8 9 | | 3 6 9 |
+ row, balance | 1 2 | column, balance | 1 3 5 |
+ | 3 4 | | 2 4 |
+ | 5 | | |
--------- ---------
- --------- ---------
- |10 11 | |10 12 14 |
- |12 13 | |11 13 |
- |14 | | |
- --------- ---------
.fi
.TP
Modified: trunk/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/support/pdfxup/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/pdfxup/README 2024-03-15 21:24:56 UTC (rev 70656)
+++ trunk/Master/texmf-dist/doc/support/pdfxup/README 2024-03-15 21:25:17 UTC (rev 70657)
@@ -1,4 +1,4 @@
-PDFXUP -- v2.10 (2021/04/25)
+PDFXUP -- v2.11 (2024/03/15)
N. Markey <pdfxup at markey.fr>
@@ -18,7 +18,7 @@
-%% (c) 2021/04/25 Nicolas Markey <pdfxup at markey dot fr>
+%% (c) 2024/03/15 Nicolas Markey <pdfxup at markey dot fr>
%%
%% This work may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
Modified: trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES
===================================================================
--- trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES 2024-03-15 21:24:56 UTC (rev 70656)
+++ trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES 2024-03-15 21:25:17 UTC (rev 70657)
@@ -58,7 +58,10 @@
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976080
It was solved with the help of Christian Gnaegi.
- fixed 2 bugs in the computations of size of pages
- - fixed a bug which inhibited short-edge option of booklets
- added options --col (to fill in pages vertically first) and --bal
(to balance columns (or rows) the last page). This feature was
requested by Philipp Killinger.
+
+v2.11 (2024/03/15)
+ - fixed a bug in testdim, which did not support fractional values
+ (bug reported by Walt Tuvell)
Modified: trunk/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/scripts/pdfxup/pdfxup
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/tex/latex/pdfxup/lipics.xup
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfxup/lipics.xup (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/pdfxup/lipics.xup 2024-03-15 21:25:17 UTC (rev 70657)
@@ -0,0 +1,2 @@
+## force bounding-box to default LIPICS values (with page numbers)
+SET_BBOX="75 47 540 755"
Added: trunk/Master/texmf-dist/tex/latex/pdfxup/llncs.xup
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfxup/llncs.xup (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/pdfxup/llncs.xup 2024-03-15 21:25:17 UTC (rev 70657)
@@ -0,0 +1,2 @@
+## force bounding-box to default LNCS values (without page numbers)
+SET_BBOX="134 126 482 677"
Modified: trunk/Master/texmf-dist/tex/latex/pdfxup/pdfxup-template.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pdfxup/pdfxup-template.tex 2024-03-15 21:24:56 UTC (rev 70656)
+++ trunk/Master/texmf-dist/tex/latex/pdfxup/pdfxup-template.tex 2024-03-15 21:25:17 UTC (rev 70657)
@@ -1,25 +1,6 @@
-%
-% pdfxup template file
-%
-%% (c) 2021/04/25 Nicolas Markey <pdfxup at markey dot fr>
-%%
-%% This work may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, either version 1.3 of this license
-%% or (at your option) any later version. The latest version of this
-%% license is in
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% and version 1.3 or later is part of all distributions of LaTeX version
-%% 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%% The Current Maintainer of this work is Nicolas Markey.
-
-
\expandafter\ifx\csname pdfxupfile\endcsname\relax
\PackageError{pdfxup}{This file should not be compiled alone}
- {File pdfxup-template.tex is not meant to be compiled alone.
+ {File pdfxup-template.pdf is not meant to be compiled alone.
\MessageBreak
It should only be used via the 'pdfxup' script.}
\fi
@@ -39,17 +20,17 @@
\newcounter{result}%
\newif\iffound
\def\@parserange#1-#2-#3\@end#4\@end{%
- \c at result=#4\relax%
- \ifnum\c at result=1\relax
+ \setcounter{result}{#4}%
+ \ifnum\value{result}=1\relax
\foundtrue
- \c at result=#1\relax%
+ \setcounter{result}{#1}%
\else
- \advance\c at result by -1\relax%
+ \addtocounter{result}{-1}%
\ifx\relax#3\relax%% means that range contains no -
\else
- \advance\c at result by #1\relax%
- \ifnum#2<\c at result\relax
- \advance\c at result by -#2\relax%
+ \addtocounter{result}{#1}%
+ \ifnum#2<\value{result}\relax
+ \addtocounter{result}{-#2}%
\else
\foundtrue
\fi
@@ -59,7 +40,7 @@
\def\@parsecsl#1,#2\@end#3\@end{%
\parserange{#3}{#1}%
\iffound\else
- \ifx\relax#2\relax\else\@parsecsl#2\@end\c at result\@end\fi\fi}
+ \ifx\relax#2\relax\else\@parsecsl#2\@end\value{result}\@end\fi\fi}
%% \nthvalue#1#2 looks for #1-th value in list of intervals #2
\def\nthvalue#1#2{\foundfalse\expandafter\@parsecsl#2,\@end#1\@end}
@@ -68,35 +49,36 @@
%% - width and height of frame containing image (\hboxsize and \vboxsize)
\newcounter{lastpage}
\newcounter{outpage}%%% nr of pages of output document
- \c at outpage=\pdfxupnbpages\relax
- \advance\c at outpage by -1\relax
+ \setcounter{outpage}{\pdfxupnbpages}
+ \addtocounter{outpage}{-1}
\divide\c at outpage by \pdfxupnbhoriz
\divide\c at outpage by \pdfxupnbvert
\ifbooklet
- \divide\c at outpage by 2\relax
+ \divide\c at outpage by 2
\fi
- \advance\c at outpage by 1\relax
+ \stepcounter{outpage}
\ifbooklet
- \multiply\c at outpage by 2\relax
+ \multiply\c at outpage by 2
\fi
- \c at lastpage=\c at outpage\relax
+ \setcounter{lastpage}{\value{outpage}}
\multiply\c at lastpage by \pdfxupnbhoriz
\multiply\c at lastpage by \pdfxupnbvert
+ \makeatother
%
\newlength\outputvmargin
\newlength\outputhmargin
- \outputvmargin=\pdfxupvmargin\relax
- \outputhmargin=\pdfxuphmargin\relax
+ \setlength\outputvmargin{\pdfxupvmargin}
+ \setlength\outputhmargin{\pdfxuphmargin}
\newlength\innervmargin
\newlength\innerhmargin
- \innervmargin=\pdfxupinnervmargin\relax
- \innerhmargin=\pdfxupinnerhmargin\relax
+ \setlength\innervmargin{\pdfxupinnervmargin}
+ \setlength\innerhmargin{\pdfxupinnerhmargin}
\newlength\outputindivvmargin
\newlength\outputindivhmargin
- \outputindivvmargin=\pdfxupintermvspace\relax
- \outputindivhmargin=\pdfxupintermhspace\relax
+ \setlength\outputindivvmargin{\pdfxupintermvspace}
+ \setlength\outputindivhmargin{\pdfxupintermhspace}
%
- \fboxrule=\pdfxupframewidth\relax
+ \setlength\fboxrule{\pdfxupframewidth}
\fboxsep=-\fboxrule
\newlength\hresult
\newlength\vresult
@@ -147,11 +129,11 @@
%% compute actual scale by which PDF is shrunk (or extended)
\ifnum\pdfxupemptybb=0\relax
\newcounter{origx}
- \c at origx=\pdfxupw\relax
- \advance\c at origx by -\pdfxupx\relax
+ \setcounter{origx}{\pdfxupw}
+ \addtocounter{origx}{-\pdfxupx}
\newcounter{origy}
- \c at origy=\pdfxuph\relax
- \advance\c at origy by -\pdfxupy\relax
+ \setcounter{origy}{\pdfxuph}
+ \addtocounter{origy}{-\pdfxupy}
\newlength\finalx
\newlength\finaly
\finalx=\hresult
@@ -176,8 +158,9 @@
%\tracingoutput=1
%\tracingpages=1
%\tracingparagraphs=1
+ \makeatletter
\newcounter{curroutpage}%%%% counts pages nr of output document
- \c at curroutpage=0\relax
+ \setcounter{curroutpage}{0}%
\newcounter{currpage}%%%%%%% page nr of input document
\newcounter{linecurrpage}%%% currpage at beginning of line
\newcounter{currcol}%
@@ -185,11 +168,11 @@
\newcounter{realout}%
\newcounter{wmout}%
\newcounter{wmoutaux}%
- \@whilenum \c at outpage>\c at curroutpage \do%
- {\advance\c at curroutpage by 1\relax%
+ \@whilenum \value{outpage}>\value{curroutpage} \do%
+ {\advance\c at curroutpage by 1%
%% check if we are on last page, and if so, possibly balance last page
\if0\balancelast\relax\else
- \c at currpage=\c at curroutpage\relax%
+ \c at currpage=\c at curroutpage %
\multiply\c at currpage by \pdfxupnbhoriz\relax%
\multiply\c at currpage by \pdfxupnbvert\relax%
\ifnum\c at currpage>\pdfxupnbpages\relax
@@ -202,15 +185,15 @@
\advance\c at currpage by -1\relax
\divide\c at currpage by \pdfxupnbvert\relax%
\advance\c at currpage by 1\relax
- \edef\horizincr{\thecurrpage}%
- \edef\pdfxupnbcols{\thecurrpage}%
+ \edef\horizincr{\thecurrpage}
+ \edef\pdfxupnbcols{\thecurrpage}
\else
\advance\c at currpage by -1\relax
\divide\c at currpage by \pdfxupnbhoriz\relax%
\advance\c at currpage by 1\relax
%\showthe\value{currpage}
- \edef\vertincr{\thecurrpage}%
- \edef\pdfxupnblines{\thecurrpage}%
+ \edef\vertincr{\thecurrpage}
+ \edef\pdfxupnblines{\thecurrpage}
%\show\vertincr
%\show\horizincr
\fi
@@ -218,52 +201,52 @@
\fi
%% start producing page
\c at currpage=\c at curroutpage%
- \advance\c at currpage by -1\relax%
- \multiply\c at currpage by \pdfxupnbhoriz\relax%
- \multiply\c at currpage by \pdfxupnbvert\relax%
+ \advance\c at currpage by -1%
+ \multiply\c at currpage by \pdfxupnbhoriz%
+ \multiply\c at currpage by \pdfxupnbvert%
\c at linecurrpage=\c at currpage%
\hrule \@height\z@%
- \c at currline=0\relax%
+ \c at currline=0%
\vskip\outputvmargin%
- \@whilenum\c at currline<\pdfxupnblines \do%
+ \@whilenum\value{currline}<\pdfxupnblines \do%
{\hrule \@height\z@%
- \ifnum\value{currline}>0\relax%
+ \ifnum\value{currline}>0%
\vskip \outputindivvmargin%
- \advance\c at linecurrpage by \horizincr\relax%
+ \advance\c at linecurrpage by \horizincr%
\else%
- \advance\c at linecurrpage by 1\relax%
+ \advance\c at linecurrpage by 1%
\fi%
- \advance\c at currline by 1\relax%
- \c at currpage=\c at linecurrpage\relax%
- \c at currcol=0\relax%
+ \stepcounter{currline}%
+ \c at currpage=\c at linecurrpage%
+ \c at currcol=0%
\hskip \outputhmargin%
- \@whilenum\c at currcol<\pdfxupnbcols \do%
- {\ifnum\c at currcol>0\relax%
+ \@whilenum\value{currcol}<\pdfxupnbcols \do%
+ {\ifnum\value{currcol}>0%
\hskip\outputindivhmargin%
- \advance\c at currpage by \vertincr\relax%
+ \advance\c at currpage by \vertincr%
\fi%
- \advance\c at currcol by 1\relax%
- \ifnum\c at currpage>\c at lastpage\else
+ \stepcounter{currcol}%
+ \ifnum\value{currpage}>\value{lastpage}\else
%% computing page number corresponding to \currline and \currcol
- \c at realout=\c at currpage%
+ \c at realout=\value{currpage}%
\def\ang{0}%
\ifbooklet
\iflongedge
%% long edge:
%% 1->n, 2->1, 3->n-1 (rotated), 4->2(rotated)...
- \ifodd\c at realout\relax% -> 1 or 3
- \advance\c at realout by -1\relax%
+ \ifodd\value{realout}% -> 1 or 3
+ \addtocounter{realout}{-1}%
\divide\c at realout by 2\relax
- \ifodd\c at realout\relax% -> 3
+ \ifodd\value{realout}% -> 3
\def\ang{180}%
\else% -> 1
\fi
- \c at realout=-\value{realout}\relax%
- \advance\c at realout by \c at outpage\relax%
- \advance\c at realout by \c at outpage\relax%
+ \setcounter{realout}{-\value{realout}}%
+ \addtocounter{realout}{\value{outpage}}%
+ \addtocounter{realout}{\value{outpage}}%
\else% -> 2 or 4
\divide\c at realout by 2\relax
- \ifodd\c at realout% -> 2
+ \ifodd\value{realout}% -> 2
\else% -> 4
\def\ang{180}%
\fi
@@ -271,29 +254,29 @@
\else
%% short edge:
%% 1->n, 2->1, 3->2, 4->n-1, 5->n-2, 6->3, 7->4, 8->n-3
- \ifodd\c at realout\relax% -> 1 or 3
- \advance\c at realout by -1\relax%
+ \ifodd\value{realout}% -> 1 or 3
+ \addtocounter{realout}{-1}%
\divide\c at realout by 2\relax
- \ifodd\c at realout% -> 3
- \advance\c at realout by 1\relax
+ \ifodd\value{realout}% -> 3
+ \stepcounter{realout}
\else% -> 1
- \c at realout=-\c at realout%
- \advance\c at realout by \c at outpage\relax%
- \advance\c at realout by \c at outpage\relax%
+ \setcounter{realout}{-\value{realout}}%
+ \addtocounter{realout}{\value{outpage}}%
+ \addtocounter{realout}{\value{outpage}}%
\fi
\else% -> 2 or 4
\divide\c at realout by 2\relax
- \ifodd\c at realout\relax% -> 2
+ \ifodd\value{realout}% -> 2
\else% -> 4
- \c at realout=-\c at realout\relax%
- \advance\c at realout by 1\relax
- \advance\c at realout by \c at outpage\relax%
- \advance\c at realout by \c at outpage\relax%
+ \setcounter{realout}{-\value{realout}}%
+ \stepcounter{realout}
+ \addtocounter{realout}{\value{outpage}}%
+ \addtocounter{realout}{\value{outpage}}%
\fi
\fi
\fi %% \iflongedge...\else
\fi %% \ifbooklet
- \ifnum\c at realout>\pdfxupnbpages\relax
+ \ifnum\value{realout}>\pdfxupnbpages\relax
%% if page above nb of pages, output blank page
%\hskip\hresult\hskip2\fboxrule
\hskip\hboxsize
@@ -300,22 +283,22 @@
\else
%% otherwise compute corresponding page to display
%% first keep realout for watermarking...
- \c at wmoutaux=\c at realout\relax%
- \c at wmout=\c at realout\relax%
- \nthvalue{\c at realout}{\pdfxuppagelist}%
- \iffound\c at realout=\c at result\relax%
+ \setcounter{wmoutaux}{\value{realout}}%
+ \setcounter{wmout}{\value{realout}}%
+ \nthvalue{\value{realout}}{\pdfxuppagelist}%
+ \iffound\setcounter{realout}{\value{result}}%
\else %% hmmm... problem
\message{I'm messed up counting pages...}%
\fi
%% compute watermarking page and display
\ifx\pdfxupwatermark\@empty\else
- \ifnum\pdfxupnbwp<\c at wmoutaux\relax
- \advance\c at wmoutaux by -\pdfxupnbwp\relax%
- \advance\c at wmoutaux by -1\relax%
+ \ifnum\pdfxupnbwp<\value{wmoutaux}\relax
+ \addtocounter{wmoutaux}{-\pdfxupnbwp}%
+ \addtocounter{wmoutaux}{-1}%
\divide\c at wmoutaux by \pdfxupwperiod\relax
- \advance\c at wmoutaux by 1\relax%
+ \stepcounter{wmoutaux}%
\multiply\c at wmoutaux by \pdfxupwperiod\relax
- \advance\c at wmout by -\c at wmoutaux%
+ \addtocounter{wmout}{-\value{wmoutaux}}%
\fi
\vbox to \vboxsize{\vfill
\hbox to \hboxsize{\hfill
More information about the tex-live-commits
mailing list.