summaryrefslogtreecommitdiff
path: root/Build/source/texk/psutils
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-08-31 23:32:15 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2018-08-31 23:32:15 +0000
commit27f19f79dc3cd957b82062b609a6b0bf5e3fa484 (patch)
tree5c4fb1cac69d38ced81b90562a8fc1d26edb60bf /Build/source/texk/psutils
parent8ba2cf02688200d56e4fe0839a451ef832ce15b6 (diff)
enable -W and -H options
git-svn-id: svn://tug.org/texlive/trunk@48528 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/psutils')
-rw-r--r--Build/source/texk/psutils/ChangeLog4
-rw-r--r--Build/source/texk/psutils/TLpatches/ChangeLog4
-rw-r--r--Build/source/texk/psutils/TLpatches/patch-40-W-H15
-rw-r--r--Build/source/texk/psutils/psutils-src/psnup.c4
4 files changed, 25 insertions, 2 deletions
diff --git a/Build/source/texk/psutils/ChangeLog b/Build/source/texk/psutils/ChangeLog
index 07dcf340564..02995ad253a 100644
--- a/Build/source/texk/psutils/ChangeLog
+++ b/Build/source/texk/psutils/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-01 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * psnup.c: Enable -W and -H options.
+
2016-02-23 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* Makefile.am, configure.ac: New convention.
diff --git a/Build/source/texk/psutils/TLpatches/ChangeLog b/Build/source/texk/psutils/TLpatches/ChangeLog
index 7cab60f9ce3..b126db0e202 100644
--- a/Build/source/texk/psutils/TLpatches/ChangeLog
+++ b/Build/source/texk/psutils/TLpatches/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-01 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * patch-40-W-H (new): Enable -W and -H options.
+
2014-06-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-30-unsigned (new): Avoid undefined behaviour.
diff --git a/Build/source/texk/psutils/TLpatches/patch-40-W-H b/Build/source/texk/psutils/TLpatches/patch-40-W-H
new file mode 100644
index 00000000000..1ca6675ee56
--- /dev/null
+++ b/Build/source/texk/psutils/TLpatches/patch-40-W-H
@@ -0,0 +1,15 @@
+diff -ur psutils-1.23.orig/psnup.c psutils-1.23/psnup.c
+--- psutils-1.23.orig/psnup.c Thu Jan 16 19:20:54 2014
++++ psutils-1.23/psnup.c Sat Sep 01 08:17:34 2018
+@@ -195,9 +195,9 @@
+ scanpages(sizeheaders);
+
+ /* set default values of input height & width */
+- if ( iwidth > 0 && width == -1 )
++ if ( iwidth > 0 )
+ width = iwidth ;
+- if ( iheight > 0 && height == -1 )
++ if ( iheight > 0 )
+ height = iheight ;
+
+ /* Finding the best layout is an optimisation problem. We try all of the
diff --git a/Build/source/texk/psutils/psutils-src/psnup.c b/Build/source/texk/psutils/psutils-src/psnup.c
index 5efb2c13385..79e280a31f3 100644
--- a/Build/source/texk/psutils/psutils-src/psnup.c
+++ b/Build/source/texk/psutils/psutils-src/psnup.c
@@ -195,9 +195,9 @@ main(int argc, char *argv[])
scanpages(sizeheaders);
/* set default values of input height & width */
- if ( iwidth > 0 && width == -1 )
+ if ( iwidth > 0 )
width = iwidth ;
- if ( iheight > 0 && height == -1 )
+ if ( iheight > 0 )
height = iheight ;
/* Finding the best layout is an optimisation problem. We try all of the