From: Günter Milde <milde@lyx.org>
Date: Mon, 28 Jan 2019 21:11:43 +0000 (+0100)
Subject: Fix line breaking, punctuation kerning and font switching with non-tex-fonts
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~2631
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d6aec0dd33d791ae24124bbc8f354190904f81c3;p=features.git

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

Use "luatexja" or "xeCJK" with non-tex fonts in
Japanese and Chinese example documents.
---

diff --git a/lib/doc/zh_CN/Intro.lyx b/lib/doc/zh_CN/Intro.lyx
index 93c2341830..8e17f5383b 100644
--- a/lib/doc/zh_CN/Intro.lyx
+++ b/lib/doc/zh_CN/Intro.lyx
@@ -10,6 +10,16 @@
 \ifxetex
 \usepackage{xeCJK}
 \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
 \use_default_options true
 \maintain_unincluded_children false
@@ -17,9 +27,9 @@
 \language_package default
 \inputencoding utf8-cjk
 \fontencoding auto
-\font_roman "default" "Noto Serif CJK SC"
-\font_sans "default" "Noto Sans CJK SC"
-\font_typewriter "default" "Noto Sans Mono CJK SC"
+\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
diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index 10d1265442..9300934551 100644
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -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
@@ -23,9 +35,9 @@
 \language_package default
 \inputencoding utf8-cjk
 \fontencoding auto
-\font_roman "default" "Noto Serif CJK SC"
-\font_sans "default" "Noto Sans CJK SC"
-\font_typewriter "default" "Noto Sans Mono CJK SC"
+\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
diff --git a/lib/examples/ja/multilingual.lyx b/lib/examples/ja/multilingual.lyx
index 072465d25e..1aecc8d9d8 100644
--- a/lib/examples/ja/multilingual.lyx
+++ b/lib/examples/ja/multilingual.lyx
@@ -6,9 +6,26 @@
 \origin /systemlyxdir/examples/ja/
 \textclass article
 \begin_preamble
-% CJKutf8 (4.8.4) maps the Greek letter mu to a mathematical (italic)
-% symbol $\mu$ unless the package "textcomp" is loaded.
-\usepackage{textcomp}
+\usepackage{ifxetex}
+\ifxetex
+  \usepackage{xeCJK}
+  \setCJKmainfont{IPAexMincho}
+  \setCJKsansfont{IPAexGothic}
+\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}
+  % use Mainfont (DejaVu) for Greek and Cyrillic:
+  \ltjsetparameter{jacharrange={-2}}
+  %\usepackage[match]{luatexja-fontspec}
+  %\setmainjfont[Mapping=tex-text]{WenQuanYi Micro Hei}
+  %\setsansjfont[Mapping=tex-text]{WenQuanYi Micro Hei}
+  %\setmonojfont{WenQuanYi Micro Hei Mono}
+\fi
 \end_preamble
 \use_default_options false
 \begin_modules
@@ -19,9 +36,9 @@ logicalmkup
 \language_package auto
 \inputencoding utf8-cjk
 \fontencoding auto
-\font_roman "DejaVuSerif" "IPAMincho"
-\font_sans "default" "IPAGothic"
-\font_typewriter "default" "default"
+\font_roman "DejaVuSerif" "DejaVu Serif"
+\font_sans "DejaVuSans" "DejaVu Sans"
+\font_typewriter "DejaVuSansMono" "DejaVu Sans Mono"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
@@ -194,6 +211,15 @@ Libertine
  work).
 \end_layout
 
+\begin_layout Itemize
+\noindent
+
+\lang english
+Alternatively, you can use non-TeX fonts with xeCJK (XeTeX) or luatexja
+ (LuaTeX).
+ See the document preamble for an example.
+\end_layout
+
 \begin_layout Standard
 
 \lang english