[LyX/master] Alternative approach for ed7142f8 to use pdflatex-dev

[Kornel Benko]

commit 1631330dfd4ce170028a14549c12fa20f06091bf
Author: Kornel Benko <kor...@lyx.org>
Date:   Wed Jun 4 11:06:02 2025 +0200

    Alternative approach for ed7142f8 to use pdflatex-dev
    
    The new parameter 'test-dev' to prefTest.pl in the build directory
    does the job.
---
 lib/scripts/prefTest.pl.in |  9 +++++++--
 lib/scripts/prefTest.pm    | 20 +++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/scripts/prefTest.pl.in b/lib/scripts/prefTest.pl.in
index d999b6a10b..25ffb4dc04 100755
--- a/lib/scripts/prefTest.pl.in
+++ b/lib/scripts/prefTest.pl.in
@@ -46,8 +46,13 @@ my @ctestpars = ();
 
 my $shell_escapes = 1;
 my $handle_argv = "";
-if (defined($ARGV[0]) && ($ARGV[0] =~ /^(test|default)$/)) {
+my $dev = 0;
+if (defined($ARGV[0]) && ($ARGV[0] =~ /^(test|test\-dev|default)$/)) {
   $handle_argv = $1;
+  if ($handle_argv eq "test-dev") {
+    $handle_argv = "test";
+    $dev = 1;
+  }
   shift(@ARGV);
 }
 
@@ -75,7 +80,7 @@ else {
                               "allow_geometry_session=false", @ARGV);
 }
 
-&getConverters($userdir, \%Converter, $shell_escapes);
+&getConverters($userdir, \%Converter, $shell_escapes, $dev);
 
 &applyChanges($userdir, \%Subst, \%Converter, $shell_escapes);
 
diff --git a/lib/scripts/prefTest.pm b/lib/scripts/prefTest.pm
index 8e25b7986b..3e5ad81b49 100644
--- a/lib/scripts/prefTest.pm
+++ b/lib/scripts/prefTest.pm
@@ -9,8 +9,8 @@ BEGIN {
 }
 
 sub getSubstitutes($$@);
-sub getConverters($$$);
-sub getConverter($$);
+sub getConverters($$$$);
+sub getConverter($$$);
 sub getNext($);
 sub writeConverters($$);
 sub createConvLine($$);
@@ -64,14 +64,14 @@ sub getSubstitutes($$@)
   return(@ctestpars);
 }
 
-sub getConverters($$$)
+sub getConverters($$$$)
 {
-  my ($userdir, $rConverter, $add) = @_;
+  my ($userdir, $rConverter, $add, $dev) = @_;
 
   if (open(FI, "$userdir/lyxrc.defaults")) {
     while (my $l = <FI>) {
       if ($l =~ s/^\s*\\converter\s+//) {
-       my $entry = &getConverter($l, $add);
+       my $entry = &getConverter($l, $add, $dev);
        if (defined($entry)) {
          $rConverter->{$entry->[0]} = $entry->[1];
        }
@@ -81,9 +81,9 @@ sub getConverters($$$)
   }
 }
 
-sub getConverter($$)
+sub getConverter($$$)
 {
-  my ($l, $add) = @_;
+  my ($l, $add, $dev) = @_;
   chomp($l);
   my ($from, $to, $cmd, $par);
   ($l, $from) = getNext($l);
@@ -122,6 +122,12 @@ sub getConverter($$)
   return undef if ($par !~ $extrapar);
   my $key = "\"$from\" \"$to\"";
   if ($add) {
+    if ($dev) {
+      $cmd =~ s/^([a-z]+)\s/$1-dev /;
+    }
+    else {
+      $cmd =~ s/^([a-z]+)-dev\s/$1 /;
+    }
     return([$key, [$cmd, $par]]);
   }
   else {
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs