From 1879fbedfb67cc6e3d63d5c993a754d872543028 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnter=20Milde?= Date: Wed, 13 Feb 2019 10:34:18 +0100 Subject: [PATCH] ctest update: Set non-TeX fonts in documents, update comments and tags. --- development/autotests/invertedTests | 7 +++--- development/autotests/unreliableTests | 30 ++++++++++++++-------- development/autotests/useSystemFonts.pl | 33 +++---------------------- lib/doc/he/Intro.lyx | 6 ++--- lib/doc/he/Tutorial.lyx | 6 ++--- lib/doc/ru/Intro.lyx | 6 ++--- lib/doc/ru/Tutorial.lyx | 6 ++--- lib/doc/sk/Intro.lyx | 6 ++--- lib/doc/sk/Tutorial.lyx | 6 ++--- lib/doc/uk/Intro.lyx | 6 ++--- lib/examples/el/splash.lyx | 6 ++--- lib/examples/fa/splash.lyx | 6 ++--- lib/examples/he/example_lyxified.lyx | 6 ++--- lib/examples/he/example_raw.lyx | 6 ++--- lib/examples/he/splash.lyx | 6 ++--- lib/examples/ru/example_lyxified.lyx | 6 ++--- lib/examples/ru/example_raw.lyx | 6 ++--- lib/examples/ru/splash.lyx | 6 ++--- lib/examples/sk/splash.lyx | 6 ++--- lib/examples/uk/splash.lyx | 6 ++--- 20 files changed, 79 insertions(+), 93 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 9c5cb516a5..cc5ea0f7ef 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -230,12 +230,13 @@ export/.*/he/.*pdf4_texF export/doc/ru/(Intro|Tutorial)_(dvi3|pdf[45])_texF export/examples/ru/(example_lyxified|splash)_(dvi3|pdf[45])_texF -# Babel-Spanish uses UTF-8 for auto-strings if it detects Xe/LuaTeX. -# This leads to wrong output (see unreliableTests) and fails in some cases -# unless the inputencoding is set to utf-8, too. +# Babel-Spanish uses UTF-8 for auto-strings if it detects Xe/LuaTeX. +# This leads to wrong output and fails in some cases with LyX's "language +# default" ("latin9"). # ! Undefined control sequence. # ...art {link}{\Hy@tocdestname }{\nonumberline Í # ndice alfabético}\hyper... +# See also unreliableTests. export/doc/es/EmbeddedObjects_(dvi3|pdf5)_texF # Gives the following error: diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests index dcaf77aaf6..5a56f5f561 100644 --- a/development/autotests/unreliableTests +++ b/development/autotests/unreliableTests @@ -83,24 +83,34 @@ Sublabel: wrong_output # For details see Troubleshooting and the Appendix in examples/seminar.lyx. export/examples/(|fr/)seminar_(dvi|pdf).* -# Babel-Spanish uses UTF-8 encoded "unicode" strings if it detects LuaTeX -# (with TeXLive 2016 also for XeTeX). -# With LuaTeX and 8-bit TeX-fonts, e.g., the toc heading becomes -# ÃŊndice instead of Índice. -# The problem is generic to all Spanish documents but only manifests itself -# if Babel strings with non-ASCII chars are deployed. -# In some cases, export fails unless the inputencoding is set to utf-8, too -# (see invertedTests, some more tests fail with TeXLive versions < 18). -# Set inputenc to utf8? (Changing the default in lib/languages -# requires more tests for utf8 first.) +# Babel-Spanish uses UTF-8 encoded strings if it detects Xe/LuaTeX. +# With "language default" (=="latin9"), Babel strings come out wrong +# when compiling with Xe/LuaTeX and TeX-fonts. +# - The problem is generic to all Spanish documents but only manifests itself +# if Babel strings with non-ASCII chars are actually used +# (the ToC heading, e.g., becomes "ÃŊndice" instead of "Índice"). +# - In some cases, export fails +# (see invertedTests, some more tests fail with TeXLive versions < 18). +# Should we set inputenc to utf8 in the documents to work around the problem? +# (Changing the default in lib/languages requires more tests for utf8 first.) export/examples/es/(ejemplo_con_lyx|tufte_book)_(pdf5|dvi3)_texF export/doc/es/.*_(pdf5|dvi3)_texF +# LyX issues +# ********** + #6197: „amssymb” with Polish babel: name clash \lll ("<<<" vs. "ł") # Wrong output with pdflatex # missing character with XeTeX/LuaTeX and Babel (-> invertedTests) export/export/latex/6197-polish-amssymb_(dvi|pdf).? +#9681 Run-together words if language is set to Greek +# if inputenc is 8-bit "language default". +# See https://www.lyx.org/trac/ticket/9681#comment:6 +# TODO: add separate bug for: +# Definition of "\LyX" needs "\textlatin" in Greek (printed as "ΛΨΞ"). +export/.*/el/.*(_texF|(dvi|pdf.?)) + # Non-ASCII char in verbatim environment is dropped (with a warning when # doing this interactively) with ASCII (and hence also with XeTeX). export/doc/(|de/|es/|fr/)EmbeddedObjects_pdf4_texF diff --git a/development/autotests/useSystemFonts.pl b/development/autotests/useSystemFonts.pl index eca4508d27..e9bbd08a1b 100644 --- a/development/autotests/useSystemFonts.pl +++ b/development/autotests/useSystemFonts.pl @@ -7,7 +7,7 @@ # 2a.) searches for relative references to files and # replaces them with absolute ones # 2b.) Changes default fonts to use non-tex-fonts -# 2c.) Changes the non-tex fonts setting if it is "default" (see below). +# 2c.) Changes the non-tex fonts setting if it is "default". # # Syntax: perl useSystemFonts.pl sourceFile destFile format # Each param represents a path to a file @@ -86,34 +86,9 @@ if ($source =~ /\/([a-z][a-z](_[A-Z][A-Z])?)[\/_]/) { my $inputEncoding = undef; if ($fontT eq "systemF") { - if ($lang =~ /^(ru|uk|sk|el)$/) { - $font{roman} = "DejaVu Serif"; - $font{sans} = "DejaVu Sans"; - $font{typewriter} = "DejaVu Sans Mono"; - } - elsif ($lang =~ /^(he)$/) { - $font{roman} = "FreeSans"; - $font{sans} = "FreeSans"; - $font{typewriter} = "FreeSans"; - } - elsif ($lang eq "fa") { - $font{roman} = "FreeFarsi"; - $font{sans} = "FreeFarsi"; - $font{typewriter} = "FreeFarsi Monospace"; - } - # elsif ($lang eq "ko" ) { - # $font{roman} = "NanumGothic"; # NanumMyeongjo, NanumGothic Eco, NanumGothicCoding - # $font{sans} = "NanumGothic"; - # $font{typewriter} = "NanumGothic"; - # } - elsif ($lang eq "ar" ) { - # available in 'fonts-sil-scheherazade' package - $font{roman} = "Scheherazade"; - $font{sans} = "Scheherazade"; - $font{typewriter} = "Scheherazade"; - } - else { - # default system fonts + if ($font{roman} eq "default") { + # Change non-tex fonts setting if it is "default". + # TODO: set in document (if required). $font{roman} = "FreeSerif"; $font{sans} = "FreeSans"; $font{typewriter} = "FreeMono"; diff --git a/lib/doc/he/Intro.lyx b/lib/doc/he/Intro.lyx index a86698b17e..4728a47d4d 100644 --- a/lib/doc/he/Intro.lyx +++ b/lib/doc/he/Intro.lyx @@ -44,9 +44,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "FreeSerif" +\font_sans "default" "FreeSans" +\font_typewriter "default" "FreeMono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/he/Tutorial.lyx b/lib/doc/he/Tutorial.lyx index 78901998d1..7102e733fc 100644 --- a/lib/doc/he/Tutorial.lyx +++ b/lib/doc/he/Tutorial.lyx @@ -54,9 +54,9 @@ logicalmkup \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "FreeSerif" +\font_sans "default" "FreeSans" +\font_typewriter "default" "FreeMono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ru/Intro.lyx b/lib/doc/ru/Intro.lyx index 2eec134064..e236bffc6a 100644 --- a/lib/doc/ru/Intro.lyx +++ b/lib/doc/ru/Intro.lyx @@ -31,9 +31,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "DejaVu Serif" +\font_sans "default" "DejaVu Sans" +\font_typewriter "default" "DejaVu Sans Mono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ru/Tutorial.lyx b/lib/doc/ru/Tutorial.lyx index 11ae48015d..65f499565a 100644 --- a/lib/doc/ru/Tutorial.lyx +++ b/lib/doc/ru/Tutorial.lyx @@ -14,9 +14,9 @@ logicalmkup \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "DejaVu Serif" +\font_sans "default" "DejaVu Sans" +\font_typewriter "default" "DejaVu Sans Mono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/sk/Intro.lyx b/lib/doc/sk/Intro.lyx index 069413e63b..44d1059d65 100644 --- a/lib/doc/sk/Intro.lyx +++ b/lib/doc/sk/Intro.lyx @@ -31,9 +31,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "palatino" "default" -\font_sans "helvet" "default" -\font_typewriter "courier" "default" +\font_roman "palatino" "TeX Gyre Pagella" +\font_sans "helvet" "TeX Gyre Heros" +\font_typewriter "courier" "TeX Gyre Cursor" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/sk/Tutorial.lyx b/lib/doc/sk/Tutorial.lyx index 2c3c2b2c28..646378f1ad 100644 --- a/lib/doc/sk/Tutorial.lyx +++ b/lib/doc/sk/Tutorial.lyx @@ -30,9 +30,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "palatino" "default" -\font_sans "helvet" "default" -\font_typewriter "courier" "default" +\font_roman "palatino" "TeX Gyre Pagella" +\font_sans "helvet" "TeX Gyre Heros" +\font_typewriter "courier" "TeX Gyre Cursor" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/uk/Intro.lyx b/lib/doc/uk/Intro.lyx index e4751dcd44..0f56ad186c 100644 --- a/lib/doc/uk/Intro.lyx +++ b/lib/doc/uk/Intro.lyx @@ -31,9 +31,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "DejaVu Serif" +\font_sans "default" "DejaVu Sans" +\font_typewriter "default" "DejaVu Sans Mono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/el/splash.lyx b/lib/examples/el/splash.lyx index 5254561781..cb9674613f 100644 --- a/lib/examples/el/splash.lyx +++ b/lib/examples/el/splash.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding auto \fontencoding OT1 -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "DejaVu Serif" +\font_sans "default" "DejaVu Sans" +\font_typewriter "default" "DejaVu Sans Mono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/fa/splash.lyx b/lib/examples/fa/splash.lyx index d754657e89..44d2680376 100644 --- a/lib/examples/fa/splash.lyx +++ b/lib/examples/fa/splash.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding utf8 \fontencoding auto -\font_roman "lmodern" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "lmodern" "FreeSerif" +\font_sans "default" "FreeSans" +\font_typewriter "default" "FreeMono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/he/example_lyxified.lyx b/lib/examples/he/example_lyxified.lyx index 14cb7046d0..d364fee4e8 100644 --- a/lib/examples/he/example_lyxified.lyx +++ b/lib/examples/he/example_lyxified.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "FreeSerif" +\font_sans "default" "FreeSans" +\font_typewriter "default" "FreeMono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/he/example_raw.lyx b/lib/examples/he/example_raw.lyx index 86fb3b53eb..fe3aec7761 100644 --- a/lib/examples/he/example_raw.lyx +++ b/lib/examples/he/example_raw.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "FreeSerif" +\font_sans "default" "FreeSans" +\font_typewriter "default" "FreeMono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/he/splash.lyx b/lib/examples/he/splash.lyx index 1df7e837a3..9633df7981 100644 --- a/lib/examples/he/splash.lyx +++ b/lib/examples/he/splash.lyx @@ -14,9 +14,9 @@ \language_package default \inputencoding auto \fontencoding OT1 -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "FreeSerif" +\font_sans "default" "FreeSans" +\font_typewriter "default" "FreeMono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/ru/example_lyxified.lyx b/lib/examples/ru/example_lyxified.lyx index 766e8215fc..d8e9c21f5f 100644 --- a/lib/examples/ru/example_lyxified.lyx +++ b/lib/examples/ru/example_lyxified.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "DejaVu Serif" +\font_sans "default" "DejaVu Sans" +\font_typewriter "default" "DejaVu Sans Mono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/ru/example_raw.lyx b/lib/examples/ru/example_raw.lyx index 9681132af5..8ee82616ca 100644 --- a/lib/examples/ru/example_raw.lyx +++ b/lib/examples/ru/example_raw.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "DejaVu Serif" +\font_sans "default" "DejaVu Sans" +\font_typewriter "default" "DejaVu Sans Mono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/ru/splash.lyx b/lib/examples/ru/splash.lyx index 010ccc22cf..a89f8bb108 100644 --- a/lib/examples/ru/splash.lyx +++ b/lib/examples/ru/splash.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "default" "default" +\font_roman "default" "DejaVu Serif" +\font_sans "default" "DejaVu Sans" +\font_typewriter "default" "DejaVu Sans Mono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/sk/splash.lyx b/lib/examples/sk/splash.lyx index 9ddc270401..9a99c9a5df 100644 --- a/lib/examples/sk/splash.lyx +++ b/lib/examples/sk/splash.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "palatino" "default" -\font_sans "helvet" "default" -\font_typewriter "courier" "default" +\font_roman "palatino" "TeX Gyre Pagella" +\font_sans "helvet" "TeX Gyre Heros" +\font_typewriter "courier" "TeX Gyre Cursor" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/uk/splash.lyx b/lib/examples/uk/splash.lyx index 51f075b74d..a029999333 100644 --- a/lib/examples/uk/splash.lyx +++ b/lib/examples/uk/splash.lyx @@ -11,9 +11,9 @@ \language_package default \inputencoding auto \fontencoding global -\font_roman "default" "default" -\font_sans "default" "default" -\font_typewriter "courier" "default" +\font_roman "default" "DejaVu Serif" +\font_sans "default" "DejaVu Sans" +\font_typewriter "courier" "DejaVu Sans Mono" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false -- 2.39.2