Fix line breaking, punctuation kerning and font switching with non-tex-fonts

[lyx.git] / lib / doc / zh_CN / Tutorial.lyx

diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index 4414e72fd8a40f9595b405bdb9099baa4bf01778..9300934551df3da91f426ec9fa2d85f23aa84dad 100644 (file)
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -1,5 +1,5 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 544
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 566
 \begin_document
 \begin_header
 \save_transient_properties true
@@ -13,7 +13,19 @@
 %\XeTeXlinebreakskip = 0pt plus 1pt 
 \usepackage{ifxetex}
 \ifxetex
-\usepackage{xeCJK}
+  \usepackage{xeCJK}
+  %\setCJKmainfont{WenQuanYi Micro Hei}
+  %\setCJKmonofont{WenQuanYi Micro Hei Mono}
+\fi
+
+% proper line breaking, punctuation kerning and font switching
+% features with LuaTeX
+% see https://tex.stackexchange.com/questions/222980/how-to-use-chinese-with-lualatex
+\usepackage{ifluatex}
+\ifluatex
+  \usepackage{luatexja-fontspec}
+  \setmainjfont[Mapping=tex-text]{WenQuanYi Micro Hei}
+  \setsansjfont[Mapping=tex-text]{WenQuanYi Micro Hei}
 \fi
 \end_preamble
 \options cjk
@@ -22,10 +34,10 @@
 \language chinese-simplified
 \language_package default
 \inputencoding utf8-cjk
-\fontencoding global
-\font_roman "default" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
+\fontencoding auto
+\font_roman "lmodern" "WenQuanYi Micro Hei"
+\font_sans "default" "WenQuanYi Micro Hei"
+\font_typewriter "default" "WenQuanYi Micro Hei Mono"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
@@ -37,11 +49,12 @@
 \use_microtype false
 \use_dash_ligatures false
 \graphics default
-\default_output_format pdf2
+\default_output_format default
 \output_sync 0
 \bibtex_command default
 \index_command default
 \float_placement th
+\float_alignment class
 \paperfontsize 12
 \spacing onehalf
 \use_hyperref true