printable routetrades: 2-up versions; fix up tbody

[ypp-sc-tools.db-test.git] / yarrg / web / autohandler

diff --git a/yarrg/web/autohandler b/yarrg/web/autohandler
index 55b9a93695552295b4899d5a52fd0fd5ca4f3651..f69ef55a53d92529c3a68f29d673e4238504d2ed 100644 (file)
--- a/yarrg/web/autohandler
+++ b/yarrg/web/autohandler
@@ -38,10 +38,18 @@
 use CommodsWeb;
 
 my $printable= printable($m);
-if ($printable eq 'pdf' || $printable eq 'ps') {
+if ($printable =~ m/^pdf|^ps/) {
        my $output;
        my $got= $m->call_self(\$output);
        if ($got) {
+               my @htargs= qw(htmldoc --continuous --gray --size 210x279mm);
+               $printable =~ m/^[a-z]+/;
+               push @htargs, '-t',$&;
+               if ($printable =~ m/2$/) {
+                       push @htargs, qw(--nup 2);
+               }
+               push @htargs, qw(-);
+
                my $tmpfile= IO::File::new_tmpfile();
                print $tmpfile $output or die $!;
                $tmpfile->flush() or die $!;
@@ -52,8 +60,8 @@ if ($printable eq 'pdf' || $printable eq 'ps') {
                        eval {
                                $ENV{'HTMLDOC_NOCGI'}=1;
                                open STDIN, '<&', $tmpfile or die $!;
-                               exec qw(htmldoc -t),$printable,qw(
-                                   --continuous --gray --size 210x279mm -);
+
+                               exec @htargs;
                                die $!;
                        };
                        print STDERR "HTMLDOC FAILURE $@";