summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi4
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pagelayout/textestvis2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl10
-rw-r--r--Master/texmf-dist/doc/latex/pagelayout/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdfbin74868 -> 74994 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pagelayout/tests.zipbin2340300 -> 2669247 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdfbin23492 -> 23492 bytes
-rw-r--r--Master/texmf-dist/doc/man/man1/textestvis.man1.pdfbin19862 -> 19862 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/pagelayout/pagelayoutapi4
-rwxr-xr-xMaster/texmf-dist/scripts/pagelayout/textestvis2
-rw-r--r--Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls42
12 files changed, 38 insertions, 30 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi b/Build/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi
index 295beef2f48..4c6888a2492 100755
--- a/Build/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi
+++ b/Build/source/texk/texlive/linked_scripts/pagelayout/pagelayoutapi
@@ -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 @@ optimize() {
}
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
diff --git a/Build/source/texk/texlive/linked_scripts/pagelayout/textestvis b/Build/source/texk/texlive/linked_scripts/pagelayout/textestvis
index 36b3ff6cfbf..dba5e4c1aaa 100755
--- a/Build/source/texk/texlive/linked_scripts/pagelayout/textestvis
+++ b/Build/source/texk/texlive/linked_scripts/pagelayout/textestvis
@@ -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 )"
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index f798f4af13a..4b8b66783d5 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 66236 2023-02-27 21:44:33Z karl $
+# $Id: tlmgr.pl 66378 2023-03-05 21:09:54Z karl $
# Copyright 2008-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -8,8 +8,8 @@
use strict; use warnings;
-my $svnrev = '$Revision: 66236 $';
-my $datrev = '$Date: 2023-02-27 22:44:33 +0100 (Mon, 27 Feb 2023) $';
+my $svnrev = '$Revision: 66378 $';
+my $datrev = '$Date: 2023-03-05 22:09:54 +0100 (Sun, 05 Mar 2023) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -896,7 +896,7 @@ sub handle_execute_actions {
my $lmtx = "$bindir/luametatex";
if (defined($localtlpdb->get_package('context'))
&& (-x "$lmtx" || -x "$lmtx.exe")
- && TeXLive::TLUtils::system_ok("$lmtx --version")
+ && (wndws() || TeXLive::TLUtils::system_ok("$lmtx --version"))
) {
$errors += do_cmd_and_check("mtxrun --generate");
$errors += do_cmd_and_check("context --luatex --generate");
@@ -10254,7 +10254,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 66236 2023-02-27 21:44:33Z karl $
+$Id: tlmgr.pl 66378 2023-03-05 21:09:54Z karl $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Master/texmf-dist/doc/latex/pagelayout/README.md b/Master/texmf-dist/doc/latex/pagelayout/README.md
index dfca3b8fd90..155360d9751 100644
--- a/Master/texmf-dist/doc/latex/pagelayout/README.md
+++ b/Master/texmf-dist/doc/latex/pagelayout/README.md
@@ -73,7 +73,7 @@ For a complete reference, read the [manual](pagelayout-manual.pdf).
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:
diff --git a/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf b/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf
index 6c8c02bfe96..85d1fb49858 100644
--- a/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf
+++ b/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex b/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex
index 4c636941e3d..abab7ba9cf0 100644
--- a/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex
+++ b/Master/texmf-dist/doc/latex/pagelayout/pagelayout-manual.tex
@@ -18,7 +18,7 @@
\usepackage{tikz}
\OnlyDescription
\hypersetup{pdfborder={0 0 0}}
-\def\pagelayoutversion{1.0.3}
+\def\pagelayoutversion{1.0.4}
\begin{document}
diff --git a/Master/texmf-dist/doc/latex/pagelayout/tests.zip b/Master/texmf-dist/doc/latex/pagelayout/tests.zip
index e8d88ca55a9..0bc10a0bf1a 100644
--- a/Master/texmf-dist/doc/latex/pagelayout/tests.zip
+++ b/Master/texmf-dist/doc/latex/pagelayout/tests.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf b/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf
index b2589ea2a6c..aafc9ea1b2d 100644
--- a/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/pagelayoutapi.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf b/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf
index d51743e017f..812b26bef67 100644
--- a/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/textestvis.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/pagelayout/pagelayoutapi b/Master/texmf-dist/scripts/pagelayout/pagelayoutapi
index 295beef2f48..4c6888a2492 100755
--- a/Master/texmf-dist/scripts/pagelayout/pagelayoutapi
+++ b/Master/texmf-dist/scripts/pagelayout/pagelayoutapi
@@ -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 @@ optimize() {
}
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
diff --git a/Master/texmf-dist/scripts/pagelayout/textestvis b/Master/texmf-dist/scripts/pagelayout/textestvis
index 36b3ff6cfbf..dba5e4c1aaa 100755
--- a/Master/texmf-dist/scripts/pagelayout/textestvis
+++ b/Master/texmf-dist/scripts/pagelayout/textestvis
@@ -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 )"
diff --git a/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls b/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls
index 2f0257de2ae..219520dc7b3 100644
--- a/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls
+++ b/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls
@@ -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@gridstartx{\pal@undefdim}-\pal@leftbleed\relax
\y=\dimexpr\pal@gridstarty{\pal@undefdim}-\pal@bottombleed\relax
- \pal@gridstartxdim=\dimexpr\pal@gridstartx{\pal@gridoptionx}\relax
- \pal@gridstartydim=\dimexpr\pal@gridstarty{\pal@gridoptiony}\relax
+ \pal@gridstartxdim=\dimexpr\pal@gridstartx{\pal@gridoptionx} - \pal@gutter / 2\relax
+ \pal@gridstartydim=\dimexpr\pal@gridstarty{\pal@gridoptiony} - \pal@gutter / 2\relax
\pal@gridwidth=\dimexpr\pal@calculatefullgridwidth\relax
\ifnum\rowsH>0
@@ -728,7 +728,7 @@
\newcommand\pal@gridstartx[1]{
\ifdim\dimexpr#1\relax=\pal@undefdim
\ifpal@isdoublepage
- (\pal@outermargin + \pal@leftbleed - \pal@gutter / 2
+ (\pal@outermargin + \pal@leftbleed
\ifpal@frontcover
\else
\ifpal@fanfold
@@ -740,11 +740,11 @@
\fi
)
\else
- (\pal@leftmargin + \pal@leftbleed - \pal@gutter / 2)
+ (\pal@leftmargin + \pal@leftbleed)
\fi
\else%
\ifpal@isdoublepage
- (#1 + \pal@leftbleed - \pal@gutter / 2
+ (#1 + \pal@leftbleed
\ifpal@frontcover
\else
\ifpal@fanfold
@@ -756,15 +756,15 @@
\fi
)
\else
- (#1 + \pal@leftbleed - \pal@gutter / 2)
+ (#1 + \pal@leftbleed)
\fi
\fi%
}
\newcommand\pal@gridstarty[1]{
\ifdim\dimexpr#1\relax=\pal@undefdim
- (\pal@bottommargin + \pal@bottombleed - \pal@gutter / 2)%
+ (\pal@bottommargin + \pal@bottombleed)%
\else%
- (#1 + \pal@bottombleed - \pal@gutter / 2)
+ (#1 + \pal@bottombleed)
\fi%
}
\newcommand\pal@setdimensions{
@@ -1532,8 +1532,20 @@
\height=\dimexpr(\pal@yy - \pal@y)\relax
\pal@x=\dimexpr(\pal@x + \width)\relax
\pal@y=\dimexpr(\pal@y + \height)\relax
- \ifdim\pal@x>\dimexpr\pal@pagewidth+\pal@innerbleed+\pal@outerbleed\relax
- \pal@x=\dimexpr\pal@pagewidth+\pal@innerbleed+\pal@outerbleed\relax
+ \ifpal@frontcover
+ \ifdim\pal@x>\dimexpr2\pal@pagewidth+2\pal@outerbleed+\spinewidth\relax
+ \pal@x=\dimexpr2\pal@pagewidth+2\pal@outerbleed+\spinewidth\relax
+ \fi
+ \else
+ \ifpal@fanfold
+ \ifdim\pal@x>\dimexpr2\pal@pagewidth+2\pal@outerbleed\relax
+ \pal@x=\dimexpr2\pal@pagewidth+2\pal@outerbleed\relax
+ \fi
+ \else
+ \ifdim\pal@x>\dimexpr\pal@pagewidth+\pal@innerbleed+\pal@outerbleed\relax
+ \pal@x=\dimexpr\pal@pagewidth+\pal@innerbleed+\pal@outerbleed\relax
+ \fi
+ \fi
\fi
\ifdim\pal@y>\dimexpr\pal@pageheight+\pal@topbleed+\pal@bottombleed\relax
\pal@y=\dimexpr\pal@pageheight+\pal@topbleed+\pal@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@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@errmsg@inkscapenotinstalled#1{
\ClassError{pagelayout}{Inkscape not installed. #1}{Make sure Inkscape is installed.\MessageBreak\MessageBreak\@ehc}