Cmake export tests: Adapt to minted listings

1.) Handle also 'LatexCommand inputminted' in lyxStatus.pm
2.) Add '-shell-escape' to the appropriate converters.
  This applies only to the ctest-environment iff calling
  the script 'prefTest.pl' in the build directory.

diff --git a/development/autotests/lyxStatus.pm b/development/autotests/lyxStatus.pm
index 7707cec402d25722642680b1861450320bcd7dce..d1c5b56b8e4ee178b69fc8cf700c0263498fd8e6 100644 (file)
--- a/development/autotests/lyxStatus.pm
+++ b/development/autotests/lyxStatus.pm
@@ -316,7 +316,7 @@ sub checkForLatexCommand($)
        }
       }
       elsif ($stack[0]->{name} =~ /^CommandInset\s+include$/) {
-       if ($param =~ /^(verbatiminput\*?|lstinputlisting)$/) {
+       if ($param =~ /^(verbatiminput\*?|lstinputlisting|inputminted)$/) {
          my $rElem = newMatch("search" => '^filename\s+\"(.+)\"',
                                "filetype" => "copy_only",
                                "result" => ["filename \"", "", "\""]);

diff --git a/lib/scripts/prefTest.pl.in b/lib/scripts/prefTest.pl.in
index 3a4829c55caeadddf3f5d1819b2106c61bbb6f13..82c80aa8db2eaeaf3e1a1f365bb2ef226f4c81fd 100755 (executable)
--- a/lib/scripts/prefTest.pl.in
+++ b/lib/scripts/prefTest.pl.in
@@ -10,12 +10,19 @@ my $bindir = "@CMAKE_BINARY_DIR@";
 
 my $userdir = "$bindir/Testing/.lyx";
 
+sub createConvLine($);
+sub getConverters($);
+sub getConverter($);
+sub getNext($);
+
 my %allowedKeys = (
   "use_converter_needauth_forbidden" => ["true", "false"],
   "use_converter_needauth" => ["true", "false"],
   "allow_geometry_session" => ["false"],
     );
 
+my %Converter = ();
+
 chdir($bindir);
 
 # Parse Arguments for strings to substitute
@@ -24,6 +31,9 @@ my %Subst = ();
 
 my $ctestparams = 0;
 my @ctestpars = ();
+
+&getConverters($userdir);
+
 for my $arg ("allow_geometry_session=false", @ARGV) {
   if ($ctestparams) {
     push(@ctestpars, $arg);
@@ -64,6 +74,21 @@ if (%Subst) { # Try to do something only if a substitute is requested
            $l = "\\$k $Subst{$k}->[0]\n";
            $Subst{$k}->[1] = 1;
          }
+         elsif ($l =~ /^\\converter\s+(.*)$/) {
+           my $entry = &getConverter($1);
+           if (defined($entry)) {
+             my $key = $entry->[0];
+             if (defined($Converter{$key})) {
+               if (defined($Converter{$key}->[2])) {
+                 $l = "";
+               }
+               else {
+                 $Converter{$key}->[2] = 1;
+                 $l = &createConvLine($key);
+               }
+             }
+           }
+         }
        }
        print FO $l;
       }
@@ -73,6 +98,13 @@ if (%Subst) { # Try to do something only if a substitute is requested
        print FO "\\$k $Subst{$k}->[0]\n";
       }
     }
+    for my $key (keys %Converter) {
+      if (! defined($Converter{$key}->[2])) {
+       $Converter{$key}->[2] = 1;
+       my $l = &createConvLine($key);
+       print FO $l;
+      }
+    }
     rename("$userdir/preferences.tmp", "$userdir/preferences");
   }
 }
@@ -83,3 +115,67 @@ if (@ctestpars) {
 }
 
 exit($res);
+
+sub createConvLine($)
+{
+  my ($key) = @_;
+  my $l = "\\converter $key \"$Converter{$key}->[0]\" \"$Converter{$key}->[1]\"\n";
+  return($l);
+}
+
+sub getConverters($)
+{
+  my ($userdir) = @_;
+
+  if (open(FI, "$userdir/lyxrc.defaults")) {
+    while (my $l = <FI>) {
+      if ($l =~ s/^\s*\\converter\s+//) {
+       my $entry = &getConverter($l);
+       if (defined($entry)) {
+         $Converter{$entry->[0]} = $entry->[1];
+       }
+      }
+    }
+  }
+}
+
+sub getConverter($)
+{
+  my ($l) = @_;
+  chomp($l);
+  my ($from, $to, $cmd, $par);
+  ($l, $from) = getNext($l);
+  return undef if ($from !~ /tex$/);
+  ($l, $to) = getNext($l);
+  return undef if ($to !~ /^(dvi|dvi3|pdf|pdf[23456])$/);
+  ($l, $cmd) = getNext($l);
+  if ($cmd !~ /\-shell-escape/) {
+    if ($cmd =~ /^(\S+)\s*(.*)$/) {
+      $cmd = "$1 -shell-escape $2";
+      $cmd =~ s/\s+$//;
+    }
+  }
+  ($l, $par) = getNext($l);
+  return undef if ($par !~ /^latex/);
+  my $key = "\"$from\" \"$to\"";
+  return([$key, [$cmd, $par]]);
+}
+
+sub getNext($)
+{
+  my ($l) = @_;
+  my $val = undef;
+
+  if ($l =~ /^\s*\"([^\"]*)\"\s*(.*)$/) {
+    $val = $1;
+    $l = $2;
+  }
+  elsif ($l =~ /^\s*(\S+)\s*(.*)$/) {
+    $val = $1;
+    $l = $2;
+  }
+  else {
+    exit(7);
+  }
+  return($l, $val);
+}