summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-05 19:40:44 +0000
committerKarl Berry <karl@freefriends.org>2023-10-05 19:40:44 +0000
commitf4d0a9cfba30f6982febe7dd08be23573b0e1c55 (patch)
tree581514d5c4b66e18d0728bcce94a780c1ace8f96 /Master
parent9872f149048296ab207386f967697abb5b30450c (diff)
pdfjam (5oct23)
git-svn-id: svn://tug.org/texlive/trunk@68457 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/man/man1/pdfjam.man1.pdfbin13840 -> 13846 bytes
-rw-r--r--Master/texmf-dist/doc/support/pdfjam/VERSION2
-rw-r--r--Master/texmf-dist/doc/support/pdfjam/pdfjam.conf2
-rw-r--r--Master/texmf-dist/doc/support/pdfjam/tests.zipbin148378 -> 94791 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/pdfjam/pdfjam6
5 files changed, 5 insertions, 5 deletions
diff --git a/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf b/Master/texmf-dist/doc/man/man1/pdfjam.man1.pdf
index 63da1925209..5dd3295b03d 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 824e1853a49..093797fc7e1 100644
--- a/Master/texmf-dist/doc/support/pdfjam/VERSION
+++ b/Master/texmf-dist/doc/support/pdfjam/VERSION
@@ -1 +1 @@
-This is pdfjam 3.08 \ No newline at end of file
+This is pdfjam 3.09
diff --git a/Master/texmf-dist/doc/support/pdfjam/pdfjam.conf b/Master/texmf-dist/doc/support/pdfjam/pdfjam.conf
index b33ac97582f..c1a14a1266e 100644
--- a/Master/texmf-dist/doc/support/pdfjam/pdfjam.conf
+++ b/Master/texmf-dist/doc/support/pdfjam/pdfjam.conf
@@ -100,7 +100,7 @@ twoside='false' ## overridden by '--twoside' in the call
##
preamble='' ## concatenate other strings to this by using '--preamble'
##
-# enc='utf8' ## overridden by '--enc ENC' in the call
+# enc='UTF-8' ## overridden by '--enc ENC' in the call
# ## ENC must be one of iconv encodings
##
###############################################################
diff --git a/Master/texmf-dist/doc/support/pdfjam/tests.zip b/Master/texmf-dist/doc/support/pdfjam/tests.zip
index 719c14b8ddb..ab150d06196 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 cd6ea75cbe3..04099e3917b 100755
--- a/Master/texmf-dist/scripts/pdfjam/pdfjam
+++ b/Master/texmf-dist/scripts/pdfjam/pdfjam
@@ -1,5 +1,5 @@
#!/bin/sh
-version=3.08
+version=3.09
#########################################################################
## ##
## pdfjam: A shell-script interface to the "pdfpages" LaTeX package ##
@@ -1151,7 +1151,7 @@ select_pdfinfo () {
}
echo_hex_iconv_utf16be () {
printf '%s' "$1" | \
- "$iconv" -f utf8 -t utf16be | \
+ "$iconv" -f UTF-8 -t UTF-16BE | \
od -An -v -tx1 | \
tr -d '[:space:]'
}
@@ -1172,7 +1172,7 @@ if test "$keepinfo" = true ; then
fi
echo_iconv_from_enc () {
printf '%s' "$2" | \
- "$iconv" -f "$1" -t utf8
+ "$iconv" -f "$1" -t UTF-8
}
if test -n "$pdfTitle" ; then
pdftitl=$(echo_iconv_from_enc "$enc" "$pdfTitle")