summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-12 20:15:36 +0000
committerKarl Berry <karl@freefriends.org>2023-09-12 20:15:36 +0000
commitb3b4281aff18f35e1bc8fc6a639ea1949c1e392c (patch)
tree17ae34b4cea37f30ec11e2118f0630b40f18ae2c
parent6f1ac555187b9d372b0427ba6928460bd32f306f (diff)
pdfjam (12sep23)
git-svn-id: svn://tug.org/texlive/trunk@68257 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pdfjam/pdfjam4
-rw-r--r--Master/texmf-dist/doc/man/man1/pdfjam.man1.pdfbin13840 -> 13840 bytes
-rw-r--r--Master/texmf-dist/doc/support/pdfjam/VERSION2
-rw-r--r--Master/texmf-dist/doc/support/pdfjam/tests.zipbin148380 -> 148378 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfjam4
5 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/pdfjam/pdfjam b/Build/source/texk/texlive/linked_scripts/pdfjam/pdfjam
index 455d2cbeca1..cd6ea75cbe3 100755
--- a/Build/source/texk/texlive/linked_scripts/pdfjam/pdfjam
+++ b/Build/source/texk/texlive/linked_scripts/pdfjam/pdfjam
@@ -1,5 +1,5 @@
#!/bin/sh
-version=3.07
+version=3.08
#########################################################################
## ##
## pdfjam: A shell-script interface to the "pdfpages" LaTeX package ##
@@ -943,7 +943,7 @@ fi
## A function to check if using non-Cygwin "${latex}" from Cygwin
using_non_cygwin_latex_from_cygwin () {
if [ -z "${__cache__using_non_cygwin_latex_from_cygwin}" ]; then
- if [ "$(uname -o)" = "Cygwin" ] \
+ if uname | grep -q CYGWIN \
&& "${latex}" -version | head -1 | grep -qv Cygwin; then
__cache__using_non_cygwin_latex_from_cygwin=0
else
diff --git a/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf b/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf
index 22c26624358..63da1925209 100644
--- a/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/pdfjam/VERSION b/Master/texmf-dist/doc/support/pdfjam/VERSION
index 1de2ea467fb..824e1853a49 100644
--- a/Master/texmf-dist/doc/support/pdfjam/VERSION
+++ b/Master/texmf-dist/doc/support/pdfjam/VERSION
@@ -1 +1 @@
-This is pdfjam 3.07 \ No newline at end of file
+This is pdfjam 3.08 \ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/pdfjam/tests.zip b/Master/texmf-dist/doc/support/pdfjam/tests.zip
index 958fdf322b3..719c14b8ddb 100644
--- a/Master/texmf-dist/doc/support/pdfjam/tests.zip
+++ b/Master/texmf-dist/doc/support/pdfjam/tests.zip
Binary files differ
diff --git a/Master/texmf-dist/scripts/pdfjam/pdfjam b/Master/texmf-dist/scripts/pdfjam/pdfjam
index 455d2cbeca1..cd6ea75cbe3 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfjam
+++ b/Master/texmf-dist/scripts/pdfjam/pdfjam
@@ -1,5 +1,5 @@
#!/bin/sh
-version=3.07
+version=3.08
#########################################################################
## ##
## pdfjam: A shell-script interface to the "pdfpages" LaTeX package ##
@@ -943,7 +943,7 @@ fi
## A function to check if using non-Cygwin "${latex}" from Cygwin
using_non_cygwin_latex_from_cygwin () {
if [ -z "${__cache__using_non_cygwin_latex_from_cygwin}" ]; then
- if [ "$(uname -o)" = "Cygwin" ] \
+ if uname | grep -q CYGWIN \
&& "${latex}" -version | head -1 | grep -qv Cygwin; then
__cache__using_non_cygwin_latex_from_cygwin=0
else