commit 0e119149290a7d895d41f18fc6b81fac2171711a
Author: Günter Milde <[email protected]>
Date: Fri Apr 12 17:57:46 2019 +0200
Set non-TeX fonts supporting Japanese in Japanese documents.
---
lib/doc/ja/Additional.lyx | 4 +-
lib/doc/ja/Customization.lyx | 4 +-
lib/doc/ja/DummyDocument1.lyx | 4 +-
lib/doc/ja/DummyDocument2.lyx | 4 +-
lib/doc/ja/EmbeddedObjects.lyx | 4 +-
lib/doc/ja/Formula-numbering.lyx | 6 +-
lib/doc/ja/Intro.lyx | 4 +-
lib/doc/ja/LaTeXConfig.lyx | 4 +-
lib/doc/ja/Math.lyx | 4 +-
lib/doc/ja/MergedManuals.lyx | 4 +-
lib/doc/ja/Shortcuts.lyx | 6 +-
lib/doc/ja/Tutorial.lyx | 6 +-
lib/doc/ja/UserGuide.lyx | 4 +-
.../ja/Graphics_and_Insets/Feynman_Diagrams.lyx | 4 +-
lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx | 4 +-
lib/examples/ja/Modules/Braille.lyx | 6 +-
lib/examples/ja/Modules/LilyPond_Book.lyx | 4 +-
lib/examples/ja/Modules/Linguistics.lyx | 4 +-
lib/examples/ja/Modules/Multilingual_Captions.lyx | 4 +-
lib/examples/ja/Modules/Rnw_%28knitr%29.lyx | 4 +-
lib/examples/ja/Modules/Sweave.lyx | 4 +-
.../ja/Multilingual_Typesetting_%28CJKutf8%29.lyx | 4 +-
.../ja/Multilingual_Typesetting_%28platex%29.lyx | 138 +++++++++++++++++---
lib/examples/ja/Presentations/Beamer.lyx | 4 +-
lib/examples/ja/Welcome.lyx | 6 +-
lib/templates/ja/Presentations/Beamer.lyx | 4 +-
26 files changed, 175 insertions(+), 73 deletions(-)
diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index 7c34b3d..5e355f1 100644
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -94,8 +94,8 @@ End
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx
index ae8199d..a2766b7 100644
--- a/lib/doc/ja/Customization.lyx
+++ b/lib/doc/ja/Customization.lyx
@@ -89,8 +89,8 @@ End
\language_package default
\inputencoding jis-platex
\fontencoding auto
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx
index 946d90e..e71e4fc 100644
--- a/lib/doc/ja/DummyDocument1.lyx
+++ b/lib/doc/ja/DummyDocument1.lyx
@@ -11,8 +11,8 @@
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx
index 3ecd089..a122e76 100644
--- a/lib/doc/ja/DummyDocument2.lyx
+++ b/lib/doc/ja/DummyDocument2.lyx
@@ -11,8 +11,8 @@
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 97ff0c1..a020431 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -207,8 +207,8 @@ End
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/Formula-numbering.lyx b/lib/doc/ja/Formula-numbering.lyx
index e4f1087..3792420 100644
--- a/lib/doc/ja/Formula-numbering.lyx
+++ b/lib/doc/ja/Formula-numbering.lyx
@@ -4,7 +4,7 @@
\begin_header
\save_transient_properties true
\origin /systemlyxdir/doc/ja/
-\textclass jsbook
+\textclass bxjsbook
\begin_preamble
\usepackage{ifpdf}
@@ -49,8 +49,8 @@
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/Intro.lyx b/lib/doc/ja/Intro.lyx
index f69e16c..3ab2556 100644
--- a/lib/doc/ja/Intro.lyx
+++ b/lib/doc/ja/Intro.lyx
@@ -58,8 +58,8 @@ End
\language_package auto
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx
index eecbd82..4fa5914 100644
--- a/lib/doc/ja/LaTeXConfig.lyx
+++ b/lib/doc/ja/LaTeXConfig.lyx
@@ -11,8 +11,8 @@
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx
index 2501f74..e3042fe 100644
--- a/lib/doc/ja/Math.lyx
+++ b/lib/doc/ja/Math.lyx
@@ -178,8 +178,8 @@ End
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/MergedManuals.lyx b/lib/doc/ja/MergedManuals.lyx
index e840d99..1958f05 100644
--- a/lib/doc/ja/MergedManuals.lyx
+++ b/lib/doc/ja/MergedManuals.lyx
@@ -21,8 +21,8 @@ initials
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/Shortcuts.lyx b/lib/doc/ja/Shortcuts.lyx
index c1593e8..272e804 100644
--- a/lib/doc/ja/Shortcuts.lyx
+++ b/lib/doc/ja/Shortcuts.lyx
@@ -4,7 +4,7 @@
\begin_header
\save_transient_properties true
\origin /systemlyxdir/doc/ja/
-\textclass jsarticle
+\textclass bxjsarticle
\use_default_options false
\maintain_unincluded_children false
\begin_local_layout
@@ -38,8 +38,8 @@ End
\language_package auto
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/Tutorial.lyx b/lib/doc/ja/Tutorial.lyx
index 11554e8..6024aae 100644
--- a/lib/doc/ja/Tutorial.lyx
+++ b/lib/doc/ja/Tutorial.lyx
@@ -4,7 +4,7 @@
\begin_header
\save_transient_properties false
\origin /systemlyxdir/doc/ja/
-\textclass jsbook
+\textclass bxjsbook
\use_default_options false
\maintain_unincluded_children false
\begin_local_layout
@@ -38,8 +38,8 @@ End
\language_package auto
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 1907566..fdcad87 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -86,8 +86,8 @@ End
\language_package auto
\inputencoding jis-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx
b/lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx
index df1150c..32b448a 100644
--- a/lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx
+++ b/lib/examples/ja/Graphics_and_Insets/Feynman_Diagrams.lyx
@@ -36,8 +36,8 @@
\language_package default
\inputencoding utf8-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
b/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
index 17e6cbd..02a2172 100644
--- a/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
+++ b/lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx
@@ -35,8 +35,8 @@
\language_package default
\inputencoding utf8-platex
\fontencoding global
-\font_roman "ae" "default"
-\font_sans "default" "default"
+\font_roman "ae" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Modules/Braille.lyx
b/lib/examples/ja/Modules/Braille.lyx
index 3c7c50e..2ab431f 100644
--- a/lib/examples/ja/Modules/Braille.lyx
+++ b/lib/examples/ja/Modules/Braille.lyx
@@ -4,7 +4,7 @@
\begin_header
\save_transient_properties true
\origin /systemlyxdir/examples/ja/Modules/
-\textclass jarticle
+\textclass bxjsarticle
\begin_preamble
% color greyed-out notes blue
\renewenvironment{lyxgreyedout}
@@ -19,8 +19,8 @@ braille
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "default" "default"
-\font_sans "default" "default"
+\font_roman "default" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Modules/LilyPond_Book.lyx
b/lib/examples/ja/Modules/LilyPond_Book.lyx
index 5e76505..ea67dcb 100644
--- a/lib/examples/ja/Modules/LilyPond_Book.lyx
+++ b/lib/examples/ja/Modules/LilyPond_Book.lyx
@@ -14,8 +14,8 @@ lilypond
\language_package default
\inputencoding utf8-platex
\fontencoding global
-\font_roman "lmodern" "default"
-\font_sans "lmss" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "lmss" "IPAexGothic"
\font_typewriter "lmtt" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Modules/Linguistics.lyx
b/lib/examples/ja/Modules/Linguistics.lyx
index dc1fba4..3d7a7dc 100644
--- a/lib/examples/ja/Modules/Linguistics.lyx
+++ b/lib/examples/ja/Modules/Linguistics.lyx
@@ -19,8 +19,8 @@ linguistics
\language_package default
\inputencoding utf8-platex
\fontencoding global
-\font_roman "lmodern" "FreeSerif"
-\font_sans "default" "FreeSans"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "FreeMono"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Modules/Multilingual_Captions.lyx
b/lib/examples/ja/Modules/Multilingual_Captions.lyx
index 242f8f7..3da7cf6 100644
--- a/lib/examples/ja/Modules/Multilingual_Captions.lyx
+++ b/lib/examples/ja/Modules/Multilingual_Captions.lyx
@@ -30,8 +30,8 @@ bicaption
\language_package default
\inputencoding utf8-platex
\fontencoding global
-\font_roman "default" "default"
-\font_sans "default" "default"
+\font_roman "default" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Modules/Rnw_%28knitr%29.lyx
b/lib/examples/ja/Modules/Rnw_%28knitr%29.lyx
index 5f1e83a..ec2e435 100644
--- a/lib/examples/ja/Modules/Rnw_%28knitr%29.lyx
+++ b/lib/examples/ja/Modules/Rnw_%28knitr%29.lyx
@@ -14,8 +14,8 @@ knitr
\language_package default
\inputencoding utf8-platex
\fontencoding global
-\font_roman "palatino" "default"
-\font_sans "lmss" "default"
+\font_roman "palatino" "IPAexMincho"
+\font_sans "lmss" "IPAexGothic"
\font_typewriter "lmtt" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Modules/Sweave.lyx
b/lib/examples/ja/Modules/Sweave.lyx
index a6b7588..709d2d0 100644
--- a/lib/examples/ja/Modules/Sweave.lyx
+++ b/lib/examples/ja/Modules/Sweave.lyx
@@ -26,8 +26,8 @@ sweave
\language_package none
\inputencoding utf8-platex
\fontencoding global
-\font_roman "palatino" "default"
-\font_sans "lmss" "default"
+\font_roman "palatino" "IPAexMincho"
+\font_sans "lmss" "IPAexGothic"
\font_typewriter "lmtt" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx
b/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx
index 2d24804..06f3df6 100644
--- a/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx
+++ b/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx
@@ -4,7 +4,7 @@
\begin_header
\save_transient_properties true
\origin /systemlyxdir/examples/ja/
-\textclass article
+\textclass bxjsarticle
\begin_preamble
% line breaking, punctuation kerning and font switching features
% for CJK with non-TeX fonts requires additional packages
@@ -143,7 +143,7 @@ Japanese
\begin_inset Quotes brd
\end_inset
- use platex).
+ use pLaTeX).
\end_layout
\begin_layout Itemize
diff --git a/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
b/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
index cb4af5a..71c8921 100644
--- a/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
+++ b/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
@@ -4,16 +4,16 @@
\begin_header
\save_transient_properties true
\origin /systemlyxdir/examples/ja/
-\textclass jarticle
+\textclass bxjsarticle
\use_default_options false
\maintain_unincluded_children false
\language japanese
\language_package auto
\inputencoding utf8
\fontencoding auto
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
+\font_roman "DejaVuSerif" "IPAexMincho"
+\font_sans "DejaVuSans" "IPAexGothic"
+\font_typewriter "DejaVuSansMono" "default"
\font_math "auto" "auto"
\font_default_family default
\use_non_tex_fonts false
@@ -91,7 +91,27 @@
\end_layout
\begin_layout Standard
-Text in other languages:
+You can write text in other scripts and languages inside Japanese documents.
+ With non-TeX fonts, make sure to use document classes that support XeTeX
+ or LuaTeX.
+ (e.g.
+ document classes
+\begin_inset Quotes eld
+\end_inset
+
+Japanese … (BXJS Class)
+\begin_inset Quotes erd
+\end_inset
+
+ or non-Japaneses standard classes).
+\end_layout
+
+\begin_layout Subsection*
+Examples
+\end_layout
+
+\begin_layout Standard
+Text in Latin script:
\end_layout
\begin_layout Quotation
@@ -105,27 +125,109 @@ Deutsch: Grüße aus Österreich!
\begin_layout Standard
Some Japanese fonts contain Greek and Cyrillic characters, however they
- are are considerabely wider than characters in Latin, Greek, and Cyrillic
- TeX fonts.
- Therefore, LyX converts them to LaTeX macros, so that the output matches
- other non-Japanese text:
+ are considerabely wider than characters in Latin, Greek, and Cyrillic TeX
+ fonts.
+
\end_layout
-\begin_layout Quotation
-Griechisch: χαιρετισμός!
+\begin_layout Itemize
+With
+\emph on
+TeX fonts
+\emph default
+, LyX converts them to LaTeX macros, so that the output matches other
non-Japane
+se text.
+\end_layout
+
+\begin_layout Itemize
+With
+\emph on
+non-TeX fonts
+\emph default
+and
+\emph on
+ Xe/LuaTeX
+\emph default
+, there is no native support for use of specific fonts for different
scripts/lan
+guages.
+ Some Unicode fonts provide a large range of characters, but quality is
+ not always best and
+\begin_inset Quotes eld
+\end_inset
+
+exotic
+\begin_inset Quotes erd
+\end_inset
+
+ characters (like accented Greek) lead to
+\emph on
+missing character
+\emph default
+errors.
+\end_layout
+
+\begin_layout Standard
+Text in Cyrillic and Greek script:
\end_layout
\begin_layout Quotation
Russisch: Привет с
-\series bold
+\emph on
новым
-\series default
+\emph default
годом!
\end_layout
+\begin_layout Quotation
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+ifdefined
+\backslash
+fontspec
+\end_layout
+
+\end_inset
+
+Griechisch: χαιρετισμος!
+\end_layout
+
+\begin_layout Quotation
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+else
+\end_layout
+
+\end_inset
+
+Griechisch: χαιρετισμός!
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+fi
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
Text in some other languages with correct language setting (not all languages
- supported by LyX are compatible with pLaTeX, try
+ supported by LyX are compatible with Japanese (you may try
\begin_inset Quotes eld
\end_inset
@@ -169,17 +271,17 @@ French: «Bonsoir à vous.»
\begin_layout Standard
-\lang greek
-Griechisch: χαιρετισμός!
+\lang afrikaans
+Griechisch: χαιρετισμος!
\end_layout
\begin_layout Standard
\lang russian
Russisch: Привет с
-\series bold
+\emph on
новым
-\series default
+\emph default
годом!
\end_layout
diff --git a/lib/examples/ja/Presentations/Beamer.lyx
b/lib/examples/ja/Presentations/Beamer.lyx
index 23649bc..5bbc3eb 100644
--- a/lib/examples/ja/Presentations/Beamer.lyx
+++ b/lib/examples/ja/Presentations/Beamer.lyx
@@ -24,8 +24,8 @@
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "default" "default"
-\font_sans "default" "default"
+\font_roman "default" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/examples/ja/Welcome.lyx b/lib/examples/ja/Welcome.lyx
index 1355b39..d3fb668 100644
--- a/lib/examples/ja/Welcome.lyx
+++ b/lib/examples/ja/Welcome.lyx
@@ -4,15 +4,15 @@
\begin_header
\save_transient_properties true
\origin /systemlyxdir/examples/ja/
-\textclass jarticle
+\textclass bxjsarticle
\use_default_options false
\maintain_unincluded_children false
\language japanese
\language_package auto
\inputencoding utf8
\fontencoding auto
-\font_roman "lmodern" "default"
-\font_sans "default" "default"
+\font_roman "lmodern" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
diff --git a/lib/templates/ja/Presentations/Beamer.lyx
b/lib/templates/ja/Presentations/Beamer.lyx
index 4241180..976508c 100644
--- a/lib/templates/ja/Presentations/Beamer.lyx
+++ b/lib/templates/ja/Presentations/Beamer.lyx
@@ -23,8 +23,8 @@
\language_package default
\inputencoding jis-platex
\fontencoding global
-\font_roman "times" "default"
-\font_sans "default" "default"
+\font_roman "times" "IPAexMincho"
+\font_sans "default" "IPAexGothic"
\font_typewriter "default" "default"
\font_math "auto" "auto"
\font_default_family default
