texlive[48528] Build/source/texk/psutils: enable -W and -H options

[commits+kakuto at tug.org]

Revision: 48528
          http://tug.org/svn/texlive?view=revision&revision=48528
Author:   kakuto
Date:     2018-09-01 01:32:15 +0200 (Sat, 01 Sep 2018)
Log Message:
-----------
enable -W and -H options

Modified Paths:
--------------
    trunk/Build/source/texk/psutils/ChangeLog
    trunk/Build/source/texk/psutils/TLpatches/ChangeLog
    trunk/Build/source/texk/psutils/psutils-src/psnup.c

Added Paths:
-----------
    trunk/Build/source/texk/psutils/TLpatches/patch-40-W-H

Modified: trunk/Build/source/texk/psutils/ChangeLog
===================================================================
--- trunk/Build/source/texk/psutils/ChangeLog	2018-08-31 23:11:41 UTC (rev 48527)
+++ trunk/Build/source/texk/psutils/ChangeLog	2018-08-31 23:32:15 UTC (rev 48528)
@@ -1,3 +1,7 @@
+2018-09-01  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* psnup.c: Enable -W and -H options.
+
 2016-02-23  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* Makefile.am, configure.ac: New convention.

Modified: trunk/Build/source/texk/psutils/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/texk/psutils/TLpatches/ChangeLog	2018-08-31 23:11:41 UTC (rev 48527)
+++ trunk/Build/source/texk/psutils/TLpatches/ChangeLog	2018-08-31 23:32:15 UTC (rev 48528)
@@ -1,3 +1,7 @@
+2018-09-01  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* patch-40-W-H (new): Enable -W and -H options.
+
 2014-06-19  Peter Breitenlohner  <peb at mppmu.mpg.de>
 
 	* patch-30-unsigned (new): Avoid undefined behaviour.

Added: trunk/Build/source/texk/psutils/TLpatches/patch-40-W-H
===================================================================
--- trunk/Build/source/texk/psutils/TLpatches/patch-40-W-H	                        (rev 0)
+++ trunk/Build/source/texk/psutils/TLpatches/patch-40-W-H	2018-08-31 23:32:15 UTC (rev 48528)
@@ -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

Modified: trunk/Build/source/texk/psutils/psutils-src/psnup.c
===================================================================
--- trunk/Build/source/texk/psutils/psutils-src/psnup.c	2018-08-31 23:11:41 UTC (rev 48527)
+++ trunk/Build/source/texk/psutils/psutils-src/psnup.c	2018-08-31 23:32:15 UTC (rev 48528)
@@ -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