Cmake export tests: Adapt the test machinery to the commit 2fc430d.

Handle this this new sets of font selections properly.

diff --git a/development/autotests/lyxStatus.pm b/development/autotests/lyxStatus.pm
index 8a031840e9d070299638c8f7cb13397f39ebd36f..c9a45830d686f68d736edd0722d769501b376564 100644 (file)
--- a/development/autotests/lyxStatus.pm
+++ b/development/autotests/lyxStatus.pm
@@ -196,10 +196,19 @@ sub checkForHeader($)
                           "result" => ["\\master ", ""]);
     if (keys %{$rFont}) {
       for my $ff ( keys %{$rFont}) {
-       my $elem = newMatch("search" => '^\\\\font_' . $ff . '\s+',
+       # fontentry of type '\font_roman default'
+       my $elem = newMatch("search" => '^\\\\font_' . $ff . '\s+[^"]*\s*$',
                             "filetype" => "replace_only",
                             "result" => ["\\font_$ff ", $rFont->{$ff}]);
-       push(@rElems, $elem);
+       # fontentry of type '\font_roman "default"'
+       my $elem1 = newMatch("search" => '^\\\\font_' . $ff . '\s+"[^"]*"\s*$',
+                            "filetype" => "replace_only",
+                            "result" => ["\\font_$ff \"", $rFont->{$ff}, '"']);
+       # fontentry of type '\font_roman "default" "default"'
+       my $elem2 = newMatch("search" => '^\\\\font_' . $ff . '\s+"(.*)"\s+"(.*)"\s*$',
+                            "filetype" => "replace_only",
+                            "result" => ["\\font_$ff ", '"', "1", '" "', $rFont->{$ff}, '"']);
+       push(@rElems, $elem, $elem1, $elem2);
       }
     }
     my $elemntf = newMatch("search" => '^\\\\use_non_tex_fonts\s+(false|true)',

diff --git a/development/autotests/useSystemFonts.pl b/development/autotests/useSystemFonts.pl
index 0c48880746354fa404a674e66667f88fa28689b4..ebd057ce104d0c06c4d39855527a845f63203e16 100644 (file)
--- a/development/autotests/useSystemFonts.pl
+++ b/development/autotests/useSystemFonts.pl
@@ -75,11 +75,12 @@ $dest = File::Spec->rel2abs($dest);
 
 my %font = ();
 my $lang = "main";
-if ($source =~ /\/([a-z][a-z](_[A-Z][A-Z])?)\//) {
+if ($source =~ /\/([a-z][a-z](_[A-Z][A-Z])?)[\/_]/) {
   $lang = $1;
 }
+
 if ($fontT eq "systemF") {
-  if ($lang =~ /^(ru|uk)$/) {
+  if ($lang =~ /^(ru|uk|sk)$/) {
     $font{roman} = "DejaVu Serif";
     $font{sans} = "DejaVu Sans";
     $font{typewriter} = "DejaVu Sans Mono";