anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Handle this this new sets of font selections properly.
This commit is contained in:
Kornel Benko 2015-11-09 12:20:57 +01:00
parent 2fc430d5ae
commit b71991f0cc
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
development/autotests/lyxStatus.pm
View File

@ -196,10 +196,19 @@ sub checkForHeader($)
"result" => ["\\master ", ""]); "result" => ["\\master ", ""]);
if (keys %{$rFont}) { if (keys %{$rFont}) {
for my $ff ( 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", "filetype" => "replace_only",
"result" => ["\\font_$ff ", $rFont->{$ff}]); "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)', my $elemntf = newMatch("search" => '^\\\\use_non_tex_fonts\s+(false|true)',

5
development/autotests/useSystemFonts.pl
View File

@ -75,11 +75,12 @@ $dest = File::Spec->rel2abs($dest);
my %font = (); my %font = ();
my $lang = "main"; 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; $lang = $1;
} }
if ($fontT eq "systemF") { if ($fontT eq "systemF") {
if ($lang =~ /^(ru|uk)$/) { if ($lang =~ /^(ru|uk|sk)$/) {
$font{roman} = "DejaVu Serif"; $font{roman} = "DejaVu Serif";
$font{sans} = "DejaVu Sans"; $font{sans} = "DejaVu Sans";
$font{typewriter} = "DejaVu Sans Mono"; $font{typewriter} = "DejaVu Sans Mono";