Uee a more accesible JP mono font

Fixup polyglossia-languages test file
* Workaround for churchslavonic
2024-11-22 10:00:33 +00:00 · 2024-09-15 17:34:28 +02:00 · 2024-09-15 15:21:46 +02:00 · 2024-09-15 15:09:08 +02:00 · 2024-09-15 13:53:41 +02:00 · 2024-09-15 13:32:10 +02:00
8 changed files with 83 additions and 92 deletions
--- a/autotests/export/latex/CJK/zh_CN-toc.lyx
+++ b/autotests/export/latex/CJK/zh_CN-toc.lyx
@ -13,7 +13,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexMincho"
-\font_typewriter "default" "Source Han Code JP"
+\font_typewriter "default" "Noto Sans Mono CJK SC"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
--- a/autotests/export/latex/languages/ja-listings-uncodable-error.lyx
+++ b/autotests/export/latex/languages/ja-listings-uncodable-error.lyx
@ -13,7 +13,7 @@
 \fontencoding auto
 \font_roman "lmodern" "IPAexMincho"
 \font_sans "default" "IPAexGothic"
-\font_typewriter "default" "Source Han Code JP"
+\font_typewriter "default" "Noto Sans Mono CJK JP"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
--- 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
--- 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
--- 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

--- a/lib/doc/zh_CN/Intro.lyx
+++ b/lib/doc/zh_CN/Intro.lyx
@ -11,9 +11,9 @@
 \language_package default
 \inputencoding utf8-cjk
 \fontencoding auto
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
+\font_roman "lmodern" "Noto Serif CJK SC"
+\font_sans "default" "Noto Sans CJK SC"
+\font_typewriter "default" "Noto Sans Mono CJK SC"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
@ -71,6 +71,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index 索引
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@ -12,9 +12,9 @@
 \language_package default
 \inputencoding utf8-cjk
 \fontencoding auto
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
+\font_roman "lmodern" "Noto Serif CJK SC"
+\font_sans "default" "Noto Sans CJK SC"
+\font_typewriter "default" "Noto Sans Mono CJK SC"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
@ -72,6 +72,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index 索引
--- a/lib/examples/es/Curricula_Vitae/Modern_CV.lyx
+++ b/lib/examples/es/Curricula_Vitae/Modern_CV.lyx
@ -1,19 +1,17 @@
-#LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 620
+#LyX 2.5 created this file. For more info see https://www.lyx.org/
+\lyxformat 630
 \begin_document
 \begin_header
 \save_transient_properties true
 \origin /systemlyxdir/examples/es/Curricula_Vitae/
 \textclass moderncv
 \begin_preamble
-\PassOptionsToPackage{es-lcroman}{babel}
-% Added by lyx2lyx
-\setlength{\parskip}{\medskipamount}
-\setlength{\parindent}{0pt}
+
 \end_preamble
 \use_default_options false
 \maintain_unincluded_children no
 \language spanish
+\language_options_babel spanish "notilde, noquoting, nodecimaldot, lcroman"
 \language_package default
 \inputencoding utf8
 \fontencoding auto
@ -36,6 +34,8 @@
 \output_sync 0
 \bibtex_command bibtex
 \index_command default
+\float_placement class
+\float_alignment class
 \paperfontsize 12
 \spacing single
 \use_hyperref false
@ -60,6 +60,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_formatted_ref 0
 \use_minted 0
 \use_lineno 0
 \index Index
@ -70,8 +71,8 @@
 \rightmargin 2.5cm
 \secnumdepth 0
 \tocdepth -1
-\paragraph_separation indent
-\paragraph_indentation default
+\paragraph_separation skip
+\defskip medskip
 \is_math_indent 0
 \math_numbering_side default
 \quotes_style swiss
Author	SHA1	Message	Date
Juergen Spitzmueller	649c5e9b0a	Uee a more accesible JP mono font	2024-09-15 17:34:28 +02:00
Juergen Spitzmueller	e256357509	Fixup polyglossia-languages test file * Workaround for churchslavonic	2024-09-15 15:21:46 +02:00
Juergen Spitzmueller	e7c5b8aecc	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	2024-09-15 15:09:08 +02:00
Juergen Spitzmueller	5c5b488c88	Fix Spanish ModernCV example	2024-09-15 13:53:41 +02:00
Juergen Spitzmueller	08c5b8b8b2	Set appropriate system fonts for Chinese docs	2024-09-15 13:32:10 +02:00