commit e7c5b8aeccb11f3c083591345897599430e7e6cb
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Sun Sep 15 15:09:08 2024 +0200
Fixup polyglossia-languages test file
* Branch Kazakh as it is now babel-only
* Setup fonts for Chinese via fontspec
* Setup proper fonts for Japanese
* Use proper Japanese language variant
---
.../export/latex/languages/supported-languages.lyx | 14 ++++-
.../supported-languages_polyglossia-XeTeX.lyx | 60 +++++++++-------------
2 files changed, 35 insertions(+), 39 deletions(-)
diff --git a/autotests/export/latex/languages/supported-languages.lyx
b/autotests/export/latex/languages/supported-languages.lyx
index e7de5f84cb..0a707f011b 100644
--- a/autotests/export/latex/languages/supported-languages.lyx
+++ b/autotests/export/latex/languages/supported-languages.lyx
@@ -3402,7 +3402,7 @@ status open
\begin_layout Quote
\series bold
-\lang japanese-cjk
+\lang japanese
日本語
\series default
（にほんご、にっぽんご[注 1]）は、主に日本国内や日本人同士の間で使用されている言語である。
@@ -3548,6 +3548,11 @@ Script Kannada
LangCode kn_IN
\end_layout
+\begin_layout Standard
+\begin_inset Branch babel-only
+inverted 0
+status open
+
\begin_layout Subsection*
Kazakh
\end_layout
@@ -3581,7 +3586,7 @@ LangCode kk_KZ
\end_layout
\begin_layout Itemize
-Not supported by Babel nor Polyglossia.
+Not supported by Polyglossia.
\end_layout
\begin_layout Itemize
@@ -3638,6 +3643,11 @@ As of 2018,
and Afghanistan also use an Arabic-derived alphabet.
\end_layout
+\end_inset
+
+
+\end_layout
+
\begin_layout Subsection*
Khmer
\end_layout
diff --git
a/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
b/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
index 4d96ef02c4..719d8a6396 100644
--- a/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
+++ b/autotests/export/latex/languages/supported-languages_polyglossia-XeTeX.lyx
@@ -1,5 +1,5 @@
#LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 589
+\lyxformat 620
\begin_document
\begin_header
\save_transient_properties true
@@ -23,34 +23,15 @@
\newfontfamily\thaanafont{FreeSerif} % prevent "missing script tag" error
%\newfontfamily\thaanafont{Noto Sans Thaana} % works, too
\newfontfamily\tibetanfont{Noto Serif Tibetan}
-
-% Font setup for Japanese (not supported by Polyglossia)
-\usepackage{ifxetex}
-\ifxetex
- \usepackage{xeCJK} % https://ctan.org/pkg/xecjk
- \setCJKmainfont{IPAexMincho}
- \setCJKsansfont{IPAexGothic}
-\else
-% with LuaTeX, https://www.ctan.org/pkg/luatexja
-% see
https://tex.stackexchange.com/questions/222980/how-to-use-chinese-with-lualatex
-% Unfortunately, this conflicts with Korean font setup via Polyglossia
-% and leads to missing glyphs: (church slavonic ⁙ (U+2059)) and
-% typographical quotes).
-% \ifdefined\luatexversion
-% %\usepackage{luatexja-fontspec}
-% \usepackage[match]{luatexja-fontspec}
-% % use Mainfont for Greek and Cyrillic:
-% \ltjsetparameter{jacharrange={-2}}
-% \setmainjfont{IPAexMincho}
-% \setsansjfont{IPAexGothic}
-% %\setmonojfont{WenQuanYi Micro Hei Mono}
-\fi
+\newfontfamily\CJKfont{IPAexMincho}
+\newfontfamily\CJKfontsf{IPAexGothic}
+\newfontfamily\japanesefont[script=CJK]{IPAexMincho}
\end_preamble
\use_default_options false
\begin_modules
enumitem
\end_modules
-\maintain_unincluded_children false
+\maintain_unincluded_children no
\language english
\language_package auto
\inputencoding auto-legacy
@@ -110,72 +91,73 @@ enumitem
\suppress_date false
\justification false
\use_refstyle 0
+\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\branch only-as-document-language
\selected 0
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch babel-only
\selected 0
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch non-TeX-fonts-only
\selected 1
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch polyglossia-only
\selected 1
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch CJK
\selected 0
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch debug
\selected 0
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch conflict-rus-belarus
\selected 1
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch conflict-es-gl
\selected 0
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch conflict-bg-mk
\selected 1
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch conflict-babel-non-TeX-fonts
\selected 1
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch standalone
\selected 0
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch conflict-luatex
\selected 1
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\branch conflict-ko
\selected 1
\filename_suffix 0
-\color #faf0e6
+\color background background
\end_branch
\index Stichwortverzeichnis
\shortcut idx
@@ -195,9 +177,13 @@ enumitem
\tablestyle default
\tracking_changes false
\output_changes false
+\change_bars false
+\postpone_fragile_content false
\html_math_output 0
\html_css_as_file 0
\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
\end_header
\begin_body
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
