From bc01f50955536e66cda80ad1bb4b02488b1e5a59 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sun, 30 May 2021 20:24:42 +0200 Subject: [PATCH] Cmake export tests: Select "-dALLOWPSTRANSPARENCY" flag for ps2pdf converter Add parameter "-dALLOWPSTRANSPARENCY" for call to ps2pdf. Used only in test environment. The fix is proposed by Scott. Here his comment: "Interestingly, the flag fixes the English Powerdot tests but not the French ones." --- lib/scripts/prefTest.pm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/scripts/prefTest.pm b/lib/scripts/prefTest.pm index e98ac4ad2f..8e25b7986b 100644 --- a/lib/scripts/prefTest.pm +++ b/lib/scripts/prefTest.pm @@ -87,17 +87,24 @@ sub getConverter($$) chomp($l); my ($from, $to, $cmd, $par); ($l, $from) = getNext($l); - return undef if ($from !~ /(tex|dvi)$/); + return undef if ($from !~ /(ps|tex|dvi)$/); ($l, $to) = getNext($l); return undef if ($to !~ /^((dvi3?|pdf[23456]?)(log)?)$/); - my ($checkfor, $substitute); + my ($checkfor, $substitute, $extrapar); if ($from =~ /tex/) { $checkfor = qr/\s+\-shell\-(escape|restricted)/; $substitute = "-shell-escape"; + $extrapar = qr/^latex/; + } + elsif ($from =~ /ps$/) { + $checkfor = qr/\s+\-dALLOWPSTRANSPARENCY/; + $substitute = "-dALLOWPSTRANSPARENCY"; + $extrapar = qr/hyperref-driver=dvips/; } else { $checkfor = qr/\s+-i\s+dvipdfmx-unsafe.cfg/; $substitute = "-i dvipdfmx-unsafe.cfg"; + $extrapar = qr/^hyperref-driver=dvipdfm/; } ($l, $cmd) = getNext($l); if ($add) { @@ -112,7 +119,7 @@ sub getConverter($$) $cmd =~ s/$checkfor//; } ($l, $par) = getNext($l); - return undef if ($par !~ /^(latex|hyperref-driver=dvipdfm)/); + return undef if ($par !~ $extrapar); my $key = "\"$from\" \"$to\""; if ($add) { return([$key, [$cmd, $par]]);