layout: support fractional page numbers

diff --git a/layout/README.layout b/layout/README.layout
index 32bbae7bf91da5d9c3fc3088a1d6cbbde2ca0558..a5011ac80bc598e501fc4465e513b23cd658ed14 100644 (file)
--- a/layout/README.layout
+++ b/layout/README.layout
@@ -222,7 +222,7 @@ Command-line options
               output is 1/7 actual size)
 
  -P<xp>x<yp>  output physical page (<xp>,<yp>).  xp and yp are
-              integers specifying the number of pages to shift by
+              numbers specifying the number of pages to shift by
               in each direction.  xp is multiplied by 270mm; yp
               is multiplied by 190mm.
 

diff --git a/layout/layout b/layout/layout
index d1ba71732618281b34855835e5a793e1866869c5..f373f0d5e89bef40b817e138f452a9ee0f525fd6 100755 (executable)
--- a/layout/layout
+++ b/layout/layout
@@ -125,7 +125,7 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
        elsif (s/^q//) { $quiet=1; }
        elsif (s/^l(\d+|\*)//) { $output_layer=$1; }
        elsif (s/^S([0-9.]+)$//) { $scale= $1 * 1.0; }
-       elsif (s/^P(\d+)x(\d+)$//) { $page_x= $1; $page_y= $2; }
+       elsif (s/^P(\d+(?:\.\d+)?)x(\d+(?:\.\d+)?)$//) { $page_x= $1; $page_y= $2; }
        elsif (s/^Lsubseglw(\w)\=(\d+)$//) {
            exists $psu_subseglw{$1} or die "unknown -L<spec> spec";
            $psu_subseglw{$1}= $2*0.1;