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
+ --left 1cm --right 1cm);
+ $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 $!;
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 $@";