texlive[66399] branches/branch2022.final: pagelayout (6mar23)
commits+karl at tug.org
commits+karl at tug.org
Mon Mar 6 22:41:33 CET 2023
Revision: 66399
http://tug.org/svn/texlive?view=revision&revision=66399
Author: karl
Date: 2023-03-06 22:41:32 +0100 (Mon, 06 Mar 2023)
Log Message:
-----------
pagelayout (6mar23) (branch)
Modified Paths:
--------------
branches/branch2022.final/Build/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi
branches/branch2022.final/Build/source/texk/texlive/linked_scripts/pagelayout/textestvis
branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/README.md
branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf
branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex
branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/tests.zip
branches/branch2022.final/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf
branches/branch2022.final/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf
branches/branch2022.final/Master/texmf-dist/scripts/pagelayout/pagelayoutapi
branches/branch2022.final/Master/texmf-dist/scripts/pagelayout/textestvis
branches/branch2022.final/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls
Modified: branches/branch2022.final/Build/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi
===================================================================
--- branches/branch2022.final/Build/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi 2023-03-06 21:41:09 UTC (rev 66398)
+++ branches/branch2022.final/Build/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi 2023-03-06 21:41:32 UTC (rev 66399)
@@ -13,7 +13,7 @@
# LaTeX version 2008/05/04 or later.
#
-version=1.0.3
+version=1.0.4
_convert() {
turbo=$1
@@ -136,7 +136,7 @@
}
makeshadow() {
- if command -v magick >/dev/null 2>&1; then
+ if command -v inkscape >/dev/null 2>&1; then
filename=$1
stdDeviation=$2
opacity=$3
Modified: branches/branch2022.final/Build/source/texk/texlive/linked_scripts/pagelayout/textestvis
===================================================================
--- branches/branch2022.final/Build/source/texk/texlive/linked_scripts/pagelayout/textestvis 2023-03-06 21:41:09 UTC (rev 66398)
+++ branches/branch2022.final/Build/source/texk/texlive/linked_scripts/pagelayout/textestvis 2023-03-06 21:41:32 UTC (rev 66399)
@@ -13,7 +13,7 @@
# LaTeX version 2008/05/04 or later.
#
-version=1.0.3
+version=1.0.4
OK="$( tput setaf 2 )•$( tput sgr0 )"
FAILED="$( tput setaf 1 )$( tput bold )x$( tput sgr0 )"
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/README.md
===================================================================
--- branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/README.md 2023-03-06 21:41:09 UTC (rev 66398)
+++ branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/README.md 2023-03-06 21:41:32 UTC (rev 66399)
@@ -73,7 +73,7 @@
In general, you should use the package manager shipped with your TeX distribution to install the pagelayout package.
-To install manually, copy the contents of [pagelayout.tds.zip](https://github.com/friedemannbartels/latex-pagelayout/releases/download/v1.0.3/pagelayout.tds.zip) to your local TeX directory tree and run the command `texhash`.
+To install manually, copy the contents of [pagelayout.tds.zip](https://github.com/friedemannbartels/latex-pagelayout/releases/download/v1.0.4/pagelayout.tds.zip) to your local TeX directory tree and run the command `texhash`.
To enable image optimization, shadow creation, and preflight, perform these installation steps:
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex
===================================================================
--- branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex 2023-03-06 21:41:09 UTC (rev 66398)
+++ branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex 2023-03-06 21:41:32 UTC (rev 66399)
@@ -18,7 +18,7 @@
\usepackage{tikz}
\OnlyDescription
\hypersetup{pdfborder={0 0 0}}
-\def\pagelayoutversion{1.0.3}
+\def\pagelayoutversion{1.0.4}
\begin{document}
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/pagelayout/tests.zip
===================================================================
(Binary files differ)
Modified: branches/branch2022.final/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2022.final/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2022.final/Master/texmf-dist/scripts/pagelayout/pagelayoutapi
===================================================================
--- branches/branch2022.final/Master/texmf-dist/scripts/pagelayout/pagelayoutapi 2023-03-06 21:41:09 UTC (rev 66398)
+++ branches/branch2022.final/Master/texmf-dist/scripts/pagelayout/pagelayoutapi 2023-03-06 21:41:32 UTC (rev 66399)
@@ -13,7 +13,7 @@
# LaTeX version 2008/05/04 or later.
#
-version=1.0.3
+version=1.0.4
_convert() {
turbo=$1
@@ -136,7 +136,7 @@
}
makeshadow() {
- if command -v magick >/dev/null 2>&1; then
+ if command -v inkscape >/dev/null 2>&1; then
filename=$1
stdDeviation=$2
opacity=$3
Modified: branches/branch2022.final/Master/texmf-dist/scripts/pagelayout/textestvis
===================================================================
--- branches/branch2022.final/Master/texmf-dist/scripts/pagelayout/textestvis 2023-03-06 21:41:09 UTC (rev 66398)
+++ branches/branch2022.final/Master/texmf-dist/scripts/pagelayout/textestvis 2023-03-06 21:41:32 UTC (rev 66399)
@@ -13,7 +13,7 @@
# LaTeX version 2008/05/04 or later.
#
-version=1.0.3
+version=1.0.4
OK="$( tput setaf 2 )•$( tput sgr0 )"
FAILED="$( tput setaf 1 )$( tput bold )x$( tput sgr0 )"
Modified: branches/branch2022.final/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls
===================================================================
--- branches/branch2022.final/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls 2023-03-06 21:41:09 UTC (rev 66398)
+++ branches/branch2022.final/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls 2023-03-06 21:41:32 UTC (rev 66399)
@@ -13,8 +13,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesClass{pagelayout}[2023/01/23 Layout graphic rich documents]
-\def\pagelayoutversion{1.0.3}
+\ProvidesClass{pagelayout}[2023/03/05 Layout graphic rich documents]
+\def\pagelayoutversion{1.0.4}
% packages
\RequirePackage{pgfopts}
@@ -391,8 +391,8 @@
\x=\dimexpr\pal at gridstartx{\pal at undefdim}-\pal at leftbleed\relax
\y=\dimexpr\pal at gridstarty{\pal at undefdim}-\pal at bottombleed\relax
- \pal at gridstartxdim=\dimexpr\pal at gridstartx{\pal at gridoptionx}\relax
- \pal at gridstartydim=\dimexpr\pal at gridstarty{\pal at gridoptiony}\relax
+ \pal at gridstartxdim=\dimexpr\pal at gridstartx{\pal at gridoptionx} - \pal at gutter / 2\relax
+ \pal at gridstartydim=\dimexpr\pal at gridstarty{\pal at gridoptiony} - \pal at gutter / 2\relax
\pal at gridwidth=\dimexpr\pal at calculatefullgridwidth\relax
\ifnum\rowsH>0
@@ -728,7 +728,7 @@
\newcommand\pal at gridstartx[1]{
\ifdim\dimexpr#1\relax=\pal at undefdim
\ifpal at isdoublepage
- (\pal at outermargin + \pal at leftbleed - \pal at gutter / 2
+ (\pal at outermargin + \pal at leftbleed
\ifpal at frontcover
\else
\ifpal at fanfold
@@ -740,11 +740,11 @@
\fi
)
\else
- (\pal at leftmargin + \pal at leftbleed - \pal at gutter / 2)
+ (\pal at leftmargin + \pal at leftbleed)
\fi
\else%
\ifpal at isdoublepage
- (#1 + \pal at leftbleed - \pal at gutter / 2
+ (#1 + \pal at leftbleed
\ifpal at frontcover
\else
\ifpal at fanfold
@@ -756,15 +756,15 @@
\fi
)
\else
- (#1 + \pal at leftbleed - \pal at gutter / 2)
+ (#1 + \pal at leftbleed)
\fi
\fi%
}
\newcommand\pal at gridstarty[1]{
\ifdim\dimexpr#1\relax=\pal at undefdim
- (\pal at bottommargin + \pal at bottombleed - \pal at gutter / 2)%
+ (\pal at bottommargin + \pal at bottombleed)%
\else%
- (#1 + \pal at bottombleed - \pal at gutter / 2)
+ (#1 + \pal at bottombleed)
\fi%
}
\newcommand\pal at setdimensions{
@@ -1532,8 +1532,20 @@
\height=\dimexpr(\pal at yy - \pal at y)\relax
\pal at x=\dimexpr(\pal at x + \width)\relax
\pal at y=\dimexpr(\pal at y + \height)\relax
- \ifdim\pal at x>\dimexpr\pal at pagewidth+\pal at innerbleed+\pal at outerbleed\relax
- \pal at x=\dimexpr\pal at pagewidth+\pal at innerbleed+\pal at outerbleed\relax
+ \ifpal at frontcover
+ \ifdim\pal at x>\dimexpr2\pal at pagewidth+2\pal at outerbleed+\spinewidth\relax
+ \pal at x=\dimexpr2\pal at pagewidth+2\pal at outerbleed+\spinewidth\relax
+ \fi
+ \else
+ \ifpal at fanfold
+ \ifdim\pal at x>\dimexpr2\pal at pagewidth+2\pal at outerbleed\relax
+ \pal at x=\dimexpr2\pal at pagewidth+2\pal at outerbleed\relax
+ \fi
+ \else
+ \ifdim\pal at x>\dimexpr\pal at pagewidth+\pal at innerbleed+\pal at outerbleed\relax
+ \pal at x=\dimexpr\pal at pagewidth+\pal at innerbleed+\pal at outerbleed\relax
+ \fi
+ \fi
\fi
\ifdim\pal at y>\dimexpr\pal at pageheight+\pal at topbleed+\pal at bottombleed\relax
\pal at y=\dimexpr\pal at pageheight+\pal at topbleed+\pal at bottombleed\relax
@@ -3720,11 +3732,7 @@
\ClassError{pagelayout}{Shell access forbidden. #1}{Make sure `pagelayoutapi' is added to the list of shell escape commands\MessageBreak(shell_escape_commands = pagelayoutapi) in your `texmf.cnf'.\MessageBreak\MessageBreak\@ehc}
}
\def\pal at errmsg@shellaccessfailed#1{
- \ifdefined\XeTeXversion
- \ClassError{pagelayout}{Shell access failed. #1}{Make sure the `scripts' folder is added to your path.\MessageBreak\MessageBreak\@ehc}
- \else
- \ClassError{pagelayout}{Shell access failed. #1}{Make sure the `scripts' folder is added to your path.\MessageBreak Shell access does not work in unrestricted mode (--shell-escape).\MessageBreak Make sure `pagelayoutapi' is added to the list of shell escape commands\MessageBreak(shell_escape_commands = pagelayoutapi) in your `texmf.cnf'.\MessageBreak\MessageBreak\@ehc}
- \fi
+ \ClassError{pagelayout}{Shell access failed. #1}{Make sure the `scripts' folder is added to your path.\MessageBreak\MessageBreak\@ehc}
}
\def\pal at errmsg@inkscapenotinstalled#1{
\ClassError{pagelayout}{Inkscape not installed. #1}{Make sure Inkscape is installed.\MessageBreak\MessageBreak\@ehc}
More information about the tex-live-commits
mailing list.