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 68a8fe1a2f2b2a9be2e8e6a2aa6f89b919808d3c..9300934551df3da91f426ec9fa2d85f23aa84dad 100644 (file)
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -1,8 +1,9 @@
-#LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 503
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 566
 \begin_document
 \begin_header
-\origin unavailable
+\save_transient_properties true
+\origin /systemlyxdir/doc/zh_CN/
 \textclass book
 \begin_preamble
 %\usepackage{fontspec}
@@ -12,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
@@ -21,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
@@ -33,12 +46,15 @@
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \font_cjk gbsn
+\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
@@ -60,14 +76,14 @@
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
-\use_package cancel 0
+\use_package cancel 1
 \use_package esint 1
 \use_package mathdots 1
-\use_package mathtools 0
+\use_package mathtools 1
 \use_package mhchem 1
-\use_package stackrel 0
-\use_package stmaryrd 0
-\use_package undertilde 0
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
 \cite_engine basic
 \cite_engine_type default
 \biblio_style plain
@@ -77,6 +93,7 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\use_minted 0
 \index 索引
 \shortcut idx
 \color #008000
@@ -85,7 +102,10 @@
 \tocdepth 3
 \paragraph_separation indent
 \paragraph_indentation default
-\quotes_language english
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
 \papercolumns 1
 \papersides 2
 \paperpagestyle default
@@ -117,6 +137,7 @@ status collapsed
 LatexCommand href
 target "lyx-docs@lists.lyx.org"
 type "mailto:"
+literal "false"
 
 \end_inset
 
@@ -211,10 +232,6 @@ reference "sec:LaTeX-用户必读"
 \begin_layout Itemize
 \SpecialChar LyX
  全部特性的详细解释。
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -228,10 +245,6 @@ User's Guide。
 \begin_layout Itemize
 \SpecialChar LaTeX
  的详细解释。
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -422,10 +435,6 @@ arg   "redo"
 \end_inset
 
 ）恢复。 
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_deeper
@@ -1108,10 +1117,6 @@ status collapsed
 Additional Features
 \emph default
 。
-\begin_inset Separator parbreak
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -2312,25 +2317,25 @@ Columns 或数学工具栏按钮
 
 \begin_inset Info
 type  "icon"
-arg   "inset-modify tabular append-row"
+arg   "tabular-feature append-row"
 \end_inset
 
 、
 \begin_inset Info
 type  "icon"
-arg   "inset-modify tabular delete-row"
+arg   "tabular-feature delete-row"
 \end_inset
 
 、
 \begin_inset Info
 type  "icon"
-arg   "inset-modify tabular append-column"
+arg   "tabular-feature append-column"
 \end_inset
 
  和 
 \begin_inset Info
 type  "icon"
-arg   "inset-modify tabular delete-column"
+arg   "tabular-feature delete-column"
 \end_inset
 
  改变矩阵的维数。 
@@ -2974,6 +2979,5 @@ clearpage
 
 \end_layout
 
-
 \end_body
 \end_document