Typo

[lyx.git] / development / autotests / useSystemFonts.pl

diff --git a/development/autotests/useSystemFonts.pl b/development/autotests/useSystemFonts.pl
index 1a344353541ad0afb1cdb94c60e6a7c3da4e2059..58006b097e1cdb55d4696fc0c9d15a51f8da90da 100644 (file)
--- a/development/autotests/useSystemFonts.pl
+++ b/development/autotests/useSystemFonts.pl
@@ -60,11 +60,12 @@ sub addNewJob($$$$$);
 sub addFileCopyJob($$$$);
 sub getNewNameOf($$);
 sub getlangs($$);
+sub simplifylangs($);
 sub getLangEntry();
 
 # convert lyx file to be compilable with xetex
 
-my ($source, $dest, $format, $fontT, $languageFile, $rest) = @ARGV;
+my ($source, $dest, $format, $fontT, $encodingT, $languageFile, $rest) = @ARGV;
 my %encodings = ();      # Encoding with TeX fonts, depending on language tag
 
 diestack("Too many arguments") if (defined($rest));
@@ -72,6 +73,7 @@ diestack("Sourcefilename not defined") if (! defined($source));
 diestack("Destfilename not defined") if (! defined($dest));
 diestack("Format (e.g. pdf4) not defined") if (! defined($format));
 diestack("Font type (e.g. texF) not defined") if (! defined($fontT));
+diestack("Encoding (e.g. ascii) not defined") if (! defined($encodingT));
 
 $source = File::Spec->rel2abs($source);
 $dest = File::Spec->rel2abs($dest);
@@ -82,16 +84,14 @@ if ($source =~ /\/([a-z][a-z](_[A-Z][A-Z])?)[\/_]/) {
   $lang = $1;
 }
 
-if (defined($languageFile)) {
-}
 my $inputEncoding = undef;
 if ($fontT eq "systemF") {
-  if ($lang =~ /^(ru|uk|sk)$/) {
+  if ($lang =~ /^(ru|uk|sk|el)$/) {
     $font{roman} = "DejaVu Serif";
     $font{sans} = "DejaVu Sans";
     $font{typewriter} = "DejaVu Sans Mono";
   }
-  elsif ($lang =~ /^(he|el|main)$/) {
+  elsif ($lang =~ /^(he)$/) {
     $font{roman} = "FreeSans";
     $font{sans} = "FreeSans";
     $font{typewriter} = "FreeSans";
@@ -119,16 +119,25 @@ if ($fontT eq "systemF") {
   }
   else {
     # default system fonts
-    $font{roman} = "FreeSans";
+    $font{roman} = "FreeSerif";
     $font{sans} = "FreeSans";
-    $font{typewriter} = "FreeSans";
+    $font{typewriter} = "FreeMono";
   }
 }
-else {
+elsif ($encodingT ne "default") {
+  # set input encoding to the requested value
+  $inputEncoding = {
+        "search" => '.*', # this will be substituted from '\inputencoding'-line
+       "out" => $encodingT,
+    };
+}
+elsif (0) { # set to '1' to enable setting of inputencoding
   # use tex font here
   my %encoding = ();
   if (defined($languageFile)) {
-    &getlangs($languageFile, \%encoding);
+    # The 2 lines below does not seem to have any effect
+    #&getlangs($languageFile, \%encoding);
+    #&simplifylangs(\%encoding);
   }
   if ($format =~ /^(pdf4)$/) { # xelatex
     # set input encoding to 'ascii' always
@@ -141,7 +150,7 @@ else {
     # when to set input encoding to 'ascii'?
     if (defined($encoding{$lang})) {
       $inputEncoding = {
-       "search" => 'auto|default', # this will be substituted from '\inputencoding'-line
+       "search" => '.*', # this will be substituted from '\inputencoding'-line
        "out" => $encoding{$lang},
       };
     }
@@ -151,7 +160,7 @@ else {
 my $sourcedir = dirname($source);
 my $destdir = dirname($dest);
 if (! -d $destdir) {
-  diestack("could not make dir \"$destdir\"") if (! mkdir $destdir);
+  diestack("could not make dir \"$destdir\"") if (! mkpath $destdir);
 }
 
 my $destdirOfSubdocuments;
@@ -164,7 +173,7 @@ my $destdirOfSubdocuments;
 if(-d $destdirOfSubdocuments) {
   rmtree($destdirOfSubdocuments);
 }
-mkdir($destdirOfSubdocuments); #  for possibly included files
+mkpath($destdirOfSubdocuments);        #  for possibly included files
 
 my %IncludedFiles = ();
 my %type2hash = (
@@ -205,7 +214,8 @@ sub interpretedCopy($$$$)
   initLyxStack(\%font, $fontT, $inputEncoding);
 
   while (my $l = <FI>) {
-    chomp($l);
+    $l =~ s/[\n\r]+$//;
+    #chomp($l);
     my $rStatus = checkLyxLine($l);
     if ($rStatus->{found}) {
       my $rF = $rStatus->{result};
@@ -417,13 +427,7 @@ sub getlangs($$)
       if ($l =~ /^Language/) {
         my ($lng, $enc) = &getLangEntry();
         if (defined($lng)) {
-          my @tag = split('_', $lng);
-          if ($tag[0] eq lc($tag[1])) {
-            $lng = $tag[0];
-          }
-          if (! defined($rencoding->{$lng})) {
-            $rencoding->{$lng} = $enc;
-          }
+          $rencoding->{$lng} = $enc;
         }
       }
     }
@@ -431,6 +435,48 @@ sub getlangs($$)
   }
 }
 
+sub simplifylangs($)
+{
+  my ($rencoding) = @_;
+  my $base = "";
+  my $enc = "";
+  my $differ = 0;
+  my @klist = ();
+  my @klist2 = ();
+  for my $k (reverse sort keys %{$rencoding}) {
+    my @tag = split('_', $k);
+    if ($tag[0] eq $base) {
+      push(@klist, $k);
+      if ($rencoding->{$k} ne $enc) {
+       $differ = 1;
+      }
+    }
+    else {
+      # new base, check that old base was OK
+      if ($base ne "") {
+       if ($differ == 0) {
+         $rencoding->{$base} = $enc;
+         push(@klist2, @klist);
+       }
+      }
+      @klist = ($k);
+      $base = $tag[0];
+      $enc = $rencoding->{$k};
+      $differ = 0;
+    }
+  }
+  if ($base ne "") {
+    # close handling for last entry too
+    if ($differ == 0) {
+      $rencoding->{$base} = $enc;
+      push(@klist2, @klist);
+    }
+  }
+  for my $k (@klist2) {
+    delete($rencoding->{$k});
+  }
+}
+
 sub getLangEntry()
 {
   my ($lng, $enc) = (undef, undef);