From fdb2934c84e3036f7ee3e582dc5704d71c377795 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnter=20Milde?= <milde@lyx.org>
Date: Thu, 9 May 2019 21:56:16 +0200
Subject: [PATCH] Update documentation for Japanese with other languages.

---
 development/autotests/ignoredTests            |  4 +-
 lib/Makefile.am                               |  4 +-
 ...Multilingual_Typesetting_with_CJKutf8.lyx} | 37 +++++++++++++++----
 ... Multilingual_Typesetting_with_platex.lyx} |  0
 4 files changed, 34 insertions(+), 11 deletions(-)
 rename lib/examples/ja/{Multilingual_Typesetting_%28CJKutf8%29.lyx => Multilingual_Typesetting_with_CJKutf8.lyx} (93%)
 rename lib/examples/ja/{Multilingual_Typesetting_%28platex%29.lyx => Multilingual_Typesetting_with_platex.lyx} (100%)

diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index 7a0b0a709a..9b65b37523 100644
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -89,8 +89,8 @@ export/export/latex/languages/ja[-_].*_(pdf2|texF)
 # Exceptions: 
 # The "!" means: "Protect these tests from being matched by future patterns in this file".
 # Export by plain- and pdflatex engines works with language "japanese-cjk", e.g.
-!export/examples/ja/Multilingual_Typesetting_.*CJK.*(dvi|pdf[23]?)
-!export/examples/ja/Multilingual_Typesetting_.*CJK.*systemF
+!export/examples/ja/Multilingual_Typesetting_with_CJK_(dvi|pdf[23]?)
+!export/examples/ja/Multilingual_Typesetting_with_CJK_.*systemF
 # the rest:
 export/.*/ja/.*_(pdf2|texF)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cb6c8e642c..44d30f3229 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -235,8 +235,8 @@ dist_itinsetexamples_DATA = \
 
 jaexamplesdir = $(pkgdatadir)/examples/ja
 dist_jaexamples_DATA = \
-	examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx \
-	examples/ja/Multilingual_Typesetting_%28platex%29.lyx \
+	examples/ja/Multilingual_Typesetting_with_CJKutf8.lyx \
+	examples/ja/Multilingual_Typesetting_with_platex.lyx \
 	examples/ja/Welcome.lyx
 
 jainsetexamplesdir = $(pkgdatadir)/examples/ja/Graphics_and_Insets
diff --git a/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx b/lib/examples/ja/Multilingual_Typesetting_with_CJKutf8.lyx
similarity index 93%
rename from lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx
rename to lib/examples/ja/Multilingual_Typesetting_with_CJKutf8.lyx
index 52572bd683..fbd220e1a1 100644
--- a/lib/examples/ja/Multilingual_Typesetting_%28CJKutf8%29.lyx
+++ b/lib/examples/ja/Multilingual_Typesetting_with_CJKutf8.lyx
@@ -144,17 +144,25 @@ For multi-lingual documents with parts in European languages, you can use
 \begin_layout Itemize
 
 \lang english
-Use one of the Japanese 
+Use one of the 
+\begin_inset Quotes bld
+\end_inset
+
+Japanese (
 \begin_inset CommandInset href
 LatexCommand href
-name "BXjscls"
+name "BXJS"
 target "https://www.ctan.org/pkg/bxjscls"
 literal "false"
 
+\end_inset
+
+)
+\begin_inset Quotes brd
 \end_inset
 
  classes or a standard document class.
- The other document classes starting with 
+ The other 
 \begin_inset Quotes bld
 \end_inset
 
@@ -162,7 +170,7 @@ Japanese
 \begin_inset Quotes brd
 \end_inset
 
- require pLaTeX.
+ document classes require pLaTeX.
 \end_layout
 
 \begin_layout Itemize
@@ -198,11 +206,11 @@ status collapsed
 \begin_layout Plain Layout
 
 \lang english
-\begin_inset Quotes sld
+\begin_inset Quotes bld
 \end_inset
 
 min
-\begin_inset Quotes srd
+\begin_inset Quotes brd
 \end_inset
 
 
@@ -239,7 +247,22 @@ Libertine
 \noindent
 
 \lang english
-Alternatively, you can use non-TeX fonts with xeCJK (XeTeX) or luatexja
+Alternatively, you can use non-TeX fonts with 
+\begin_inset Quotes bld
+\end_inset
+
+xeCJK
+\begin_inset Quotes brd
+\end_inset
+
+ (XeTeX) or 
+\begin_inset Quotes bld
+\end_inset
+
+luatexja
+\begin_inset Quotes brd
+\end_inset
+
  (LuaTeX).
  See the document preamble for an example.
 \end_layout
diff --git a/lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx b/lib/examples/ja/Multilingual_Typesetting_with_platex.lyx
similarity index 100%
rename from lib/examples/ja/Multilingual_Typesetting_%28platex%29.lyx
rename to lib/examples/ja/Multilingual_Typesetting_with_platex.lyx
-- 
2.39.5