From 67ed1ec03a8fee8618b96d81389264e04c8b185c Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnter=20Milde?= Date: Fri, 25 Jan 2019 16:48:16 +0100 Subject: [PATCH] ctests: fix system font setup for some CJK documents --- development/autotests/invertedTests | 6 ------ lib/doc/zh_CN/Intro.lyx | 2 +- lib/doc/zh_CN/Tutorial.lyx | 4 ++-- lib/examples/ko/splash.lyx | 8 ++++---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index d87ca6835a..df0a94b13d 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -82,12 +82,6 @@ export/export/latex/fa-OT1_pdf2 # -> Missing character (Greek letter omikron with tonos), # suboptimal character spacing in non-Japanese text parts. export/examples/ja/multilingual_.*_systemF -# -# Noto Fonts not found with LuaTeX. -export/doc/zh_CN/Intro_(dvi3|pdf5)_systemF -export/doc/zh_CN/Tutorial_(dvi3|pdf5)_systemF -# "Hand-compiling" with XeTeX works but the test fails here (G.Milde) -#export/doc/zh_CN/Tutorial_pdf4_systemF # CJK for multilingual documents: # diff --git a/lib/doc/zh_CN/Intro.lyx b/lib/doc/zh_CN/Intro.lyx index 4a0ed510b6..93c2341830 100644 --- a/lib/doc/zh_CN/Intro.lyx +++ b/lib/doc/zh_CN/Intro.lyx @@ -17,7 +17,7 @@ \language_package default \inputencoding utf8-cjk \fontencoding auto -\font_roman "default" "Noto Serif" +\font_roman "default" "Noto Serif CJK SC" \font_sans "default" "Noto Sans CJK SC" \font_typewriter "default" "Noto Sans Mono CJK SC" \font_math "auto" "auto" diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx index c900232e68..10d1265442 100644 --- a/lib/doc/zh_CN/Tutorial.lyx +++ b/lib/doc/zh_CN/Tutorial.lyx @@ -23,9 +23,9 @@ \language_package default \inputencoding utf8-cjk \fontencoding auto -\font_roman "default" "Noto Serif" +\font_roman "default" "Noto Serif CJK SC" \font_sans "default" "Noto Sans CJK SC" -\font_typewriter "default" "default" +\font_typewriter "default" "Noto Sans Mono CJK SC" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/examples/ko/splash.lyx b/lib/examples/ko/splash.lyx index ca01186ef0..7506f0ace2 100644 --- a/lib/examples/ko/splash.lyx +++ b/lib/examples/ko/splash.lyx @@ -1,4 +1,4 @@ -#LyX 2.3 created this file. For more info see http://www.lyx.org/ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ \lyxformat 544 \begin_document \begin_header @@ -11,9 +11,9 @@ \language_package default \inputencoding utf8-cjk \fontencoding OT1 -\font_roman "default" "NanumMyeongjo" -\font_sans "default" "NanumGothic" -\font_typewriter "default" "NanumGothicCoding" +\font_roman "default" "Noto Serif CJK KR" +\font_sans "default" "Noto Sans CJK KR" +\font_typewriter "default" "Noto Sans Mono CJK KR" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false -- 2.39.2