From e2563575092c95566d543e8c1409f99b22f2354f Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 15 Sep 2024 15:21:46 +0200
Subject: [PATCH] Fixup polyglossia-languages test file

* Workaround for churchslavonic
---
 .../supported-languages_polyglossia.lyx       | 66 ++++++++-----------
 1 file changed, 29 insertions(+), 37 deletions(-)

diff --git a/autotests/export/latex/languages/supported-languages_polyglossia.lyx b/autotests/export/latex/languages/supported-languages_polyglossia.lyx
index aa1e50f738..f0448581b8 100644
--- a/autotests/export/latex/languages/supported-languages_polyglossia.lyx
+++ b/autotests/export/latex/languages/supported-languages_polyglossia.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
@@ -24,34 +24,19 @@
 \newfontfamily\thaanafont{FreeSerif}  % missing script tag in FreeSerif
 %\newfontfamily\thaanafont{Noto Sans Thaana} % works, too
 \newfontfamily\tibetanfont{Noto Sans Tibetan}
+\newfontfamily\CJKfont{IPAexMincho}
+\newfontfamily\CJKfontsf{IPAexGothic}
+\newfontfamily\japanesefont[script=CJK]{IPAexMincho}
 
-% 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
+% Needed for churchslavonic which is an extra package
+% and not yet adapted to the new polyglossia keyval interface
+\usepackage{xkeyval}
 \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 utf8
@@ -111,72 +96,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 0
 \filename_suffix 0
-\color #faf0e6
+\color background background
 \end_branch
 \branch conflict-ko
 \selected 0
 \filename_suffix 0
-\color #faf0e6
+\color background background
 \end_branch
 \index Stichwortverzeichnis
 \shortcut idx
@@ -196,9 +182,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
@@ -211,8 +201,10 @@ Languages supported by LyX
 With language examples that work with 
 \emph on
 Polyglossia,
+
 \emph default
- XeTeX or LuaTeX, and 
+ XeTeX or LuaTeX,
+ and 
 \begin_inset Quotes eld
 \end_inset