From b01eb6c6a4b0ee04c262fcbdab4b431906ba79eb Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnter=20Milde?= <milde@lyx.org>
Date: Wed, 30 Jan 2019 00:53:31 +0100
Subject: [PATCH] ctests: fix/update CJK tests.

---
 .../export/latex/CJK/en-de-el-ru-ja_utf8.tex  |  54 ------
 .../zh_CN-en-de-el-ru_language-default.lyx    | 177 ++++++++++++++++++
 autotests/export/latex/CJK/zh_CN_default.lyx  |  88 ---------
 development/autotests/invertedTests           |   3 +-
 4 files changed, 178 insertions(+), 144 deletions(-)
 delete mode 100644 autotests/export/latex/CJK/en-de-el-ru-ja_utf8.tex
 create mode 100644 autotests/export/latex/CJK/zh_CN-en-de-el-ru_language-default.lyx
 delete mode 100644 autotests/export/latex/CJK/zh_CN_default.lyx

diff --git a/autotests/export/latex/CJK/en-de-el-ru-ja_utf8.tex b/autotests/export/latex/CJK/en-de-el-ru-ja_utf8.tex
deleted file mode 100644
index 29f615b06b..0000000000
--- a/autotests/export/latex/CJK/en-de-el-ru-ja_utf8.tex
+++ /dev/null
@@ -1,54 +0,0 @@
-%% LyX 2.4.0dev created this file.  For more info, see https://www.lyx.org/.
-%% Do not edit unless you really know what you are doing.
-\documentclass[ngerman,greek,russian,english]{article}
-\usepackage{CJKutf8}
-\usepackage{DejaVuSerif}
-\usepackage[T2A,LGR,T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage{textcomp}
-
-\makeatletter
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LyX specific LaTeX commands.
-\providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
-\DeclareRobustCommand*{\lyxarrow}{%
-\@ifstar
-{\leavevmode\,$\triangleleft$\,\allowbreak}
-{\leavevmode\,$\triangleright$\,\allowbreak}}
-
-\makeatother
-
-\usepackage{babel}
-\begin{document}
-For a multi-lingual document, with parts in European languages, you
-can use the CJK LaTeX bundle.
-\begin{enumerate}
-\item \begin{CJK}{UTF8}{min}\LyX ¤ÏÍ¥½¨¤Ê¼è°·ÀâÌÀ½ñ¤òƱº­¤·¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢¤³¤ì¤ò¤ª»È¤¤¤¯¤À¤µ¤¤¡ª¤Þ¤º¤Ï\textsf{¥Ø¥ë¥×\lyxarrow ¤Ï¤¸¤á¤Î°ìÊâ}¤«¤é»Ï¤á¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤Ï¡¢³Æ¼è°·ÀâÌÀ½ñ¤ò´Ê·é¤Ë¾Ò²ð¤·¤Æ¤¤¤Þ¤¹¡£¤Ä¤®¤Ë\textsf{¥Ø¥ë¥×\lyxarrow ÆþÌçÊÓ}¤ò¤ªÆɤߤˤʤì¤Ð¡¢\LyX ¤Î»È¤¤Êý¤ò³Ø¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-\item \end{CJK}\inputencoding{latin9}Short texts may be written without
-setting the language (hyphenation will be missing and spell-checking
-complain): Greetings; Grüße; \textcyrillic{\CYRP\cyrr\cyri\cyrv\cyre\cyrt\cyrery};
-\textgreek{\textLambda\textomicron\textgamma\textomicron\textfinalsigma}
-\item For longer text parts, it is recommended to set the correct language:
-\begin{description}
-\item [{English:}] Greetings from Österreich 5~\textmu m snow.
-\selectlanguage{ngerman}%
-\item [{Deutsch:}] Grüße aus Österreich 5~\textmu m Schnee.
-\item [{Griechisch:}] \foreignlanguage{greek}{\textEta \textbf{\textEpsilon\textlambda\textlambda\'\textalpha\textdelta\textalpha}
-(\textsigma\texttau\texteta\textnu \textkappa\textalpha\texttheta\textalpha\textrho\textepsilon\'\textupsilon\textomicron\textupsilon\textsigma\textalpha
-\textEpsilon\textlambda\textlambda\'\textalpha\textfinalsigma), \textsigma\textupsilon\textnu\texttau\textalpha\textgamma\textmu\textalpha\texttau\textiota\textkappa\'\textomicron
-\'\textomicron\textnu\textomicron\textmu\textalpha \textEpsilon\textlambda\textlambda\texteta\textnu\textiota\textkappa\'\texteta
-\textDelta\texteta\textmu\textomicron\textkappa\textrho\textalpha\texttau\'\textiota\textalpha,
-\textepsilon\'\textiota\textnu\textalpha\textiota \textchi\'\textomega\textrho\textalpha
-\texttau\texteta\textfinalsigma \textnu\textomicron\texttau\textiota\textomicron\textalpha\textnu\textalpha\texttau\textomicron\textlambda\textiota\textkappa\'\texteta\textfinalsigma
-\textEpsilon\textupsilon\textrho\'\textomega\textpi\texteta\textfinalsigma
-\textsigma\texttau\textomicron \textnu\textomicron\texttau\textiota\'\textomicron\texttau\textepsilon\textrho\textomicron
-\'\textalpha\textkappa\textrho\textomicron \texttau\texteta\textfinalsigma
-\textBeta\textalpha\textlambda\textkappa\textalpha\textnu\textiota\textkappa\'\texteta\textfinalsigma
-\textchi\textepsilon\textrho\textsigma\textomicron\textnu\'\texteta\textsigma\textomicron\textupsilon.}
-\item [{Russisch:}] \foreignlanguage{russian}{\CYRP\cyrr\cyri\cyrv\cyre\cyrt
-\cyrs \textbf{\cyrn\cyro\cyrv\cyrery\cyrm} \cyrg\cyro\cyrd\cyro\cyrm!
-\CYRU \cyrn\cyra\cyrs \cyrerev\cyrs\cyrt\cyrsftsn 5~\textmu m \CYRS\cyrn\cyre\cyrg.}\selectlanguage{english}%
-\end{description}
-\end{enumerate}
-
-\end{document}
diff --git a/autotests/export/latex/CJK/zh_CN-en-de-el-ru_language-default.lyx b/autotests/export/latex/CJK/zh_CN-en-de-el-ru_language-default.lyx
new file mode 100644
index 0000000000..270b820dfd
--- /dev/null
+++ b/autotests/export/latex/CJK/zh_CN-en-de-el-ru_language-default.lyx
@@ -0,0 +1,177 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 566
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options false
+\maintain_unincluded_children false
+\language chinese-simplified
+\language_package auto
+\inputencoding auto
+\fontencoding auto
+\font_roman "DejaVuSerif" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\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
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 0
+\use_minted 0
+\index 索引
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+
+\lang english
+For multi-lingual documents with parts in European languages, you can use
+ the CJK LaTeX bundle.
+\end_layout
+
+\begin_layout Enumerate
+Chinesisch: 就是说我们都已经习惯于关心字符排版的细枝末节，几乎所有的字处理软件也都是这种理念。人们还在使用 Tab 键创建空白；你还需要关心什么东西
+应该出现在页面上的什么位置；强调某处文本就是改变一下字体
+\end_layout
+
+\begin_layout Enumerate
+Short texts may be written without setting the language (non-ASCII characters
+ may be ugly, hyphenation is missing and spell-checking may complain): Greetings
+; Grüße; Приветы; χαιρετισμός
+\end_layout
+
+\begin_layout Enumerate
+To avoid these problems, it is recommended to set the correct language:
+\lang english
+
+\begin_inset Note Note
+status collapsed
+
+\begin_layout Plain Layout
+Start Englisch text here to prevent nesting errors with 
+\begin_inset Quotes eld
+\end_inset
+
+language default
+\begin_inset Quotes erd
+\end_inset
+
+ (8-bit) input encodings.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_deeper
+\begin_layout Description
+
+\lang english
+English: Greetings from Österreich 5
+\begin_inset space ~
+\end_inset
+
+µm snow.
+\end_layout
+
+\begin_layout Description
+
+\lang ngerman
+Deutsch: Grüße aus Österreich 5
+\begin_inset space ~
+\end_inset
+
+µm Schnee.
+\end_layout
+
+\begin_layout Description
+
+\lang ngerman
+Griechisch:
+\lang greek
+ Η 
+\series bold
+Ελλάδα
+\series default
+ (στην καθαρεύουσα Ελλάς), συνταγματικό όνομα Ελληνική Δημοκρατία, είναι
+ χώρα της νοτιοανατολικής Ευρώπης στο νοτιότερο άκρο της Βαλκανικής χερσονήσου.
+\end_layout
+
+\begin_layout Description
+
+\lang ngerman
+Russisch:
+\lang russian
+ Привет с 
+\series bold
+новым
+\series default
+ годом! У нас эсть 5
+\begin_inset space ~
+\end_inset
+
+µm Снег.
+\end_layout
+
+\end_deeper
+\end_body
+\end_document
diff --git a/autotests/export/latex/CJK/zh_CN_default.lyx b/autotests/export/latex/CJK/zh_CN_default.lyx
deleted file mode 100644
index 0d31864a33..0000000000
--- a/autotests/export/latex/CJK/zh_CN_default.lyx
+++ /dev/null
@@ -1,88 +0,0 @@
-#LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 566
-\begin_document
-\begin_header
-\save_transient_properties true
-\origin unavailable
-\textclass article
-\use_default_options true
-\maintain_unincluded_children false
-\language chinese-simplified
-\language_package default
-\inputencoding auto
-\fontencoding auto
-\font_roman "default" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
-\font_math "auto" "auto"
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\font_osf false
-\font_sf_scale 100 100
-\font_tt_scale 100 100
-\font_cjk bsmi
-\use_microtype false
-\use_dash_ligatures true
-\graphics default
-\default_output_format pdf2
-\output_sync 0
-\bibtex_command default
-\index_command default
-\float_placement class
-\float_alignment class
-\paperfontsize default
-\spacing single
-\use_hyperref false
-\papersize default
-\use_geometry false
-\use_package amsmath 1
-\use_package amssymb 1
-\use_package cancel 1
-\use_package esint 1
-\use_package mathdots 1
-\use_package mathtools 1
-\use_package mhchem 1
-\use_package stackrel 1
-\use_package stmaryrd 1
-\use_package undertilde 1
-\cite_engine basic
-\cite_engine_type default
-\biblio_style plain
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\justification true
-\use_refstyle 1
-\use_minted 0
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\paragraph_indentation default
-\is_math_indent 0
-\math_numbering_side default
-\quotes_style english
-\dynamic_quotes 0
-\papercolumns 1
-\papersides 1
-\paperpagestyle default
-\tracking_changes false
-\output_changes false
-\html_math_output 0
-\html_css_as_file 0
-\html_be_strict false
-\end_header
-
-\begin_body
-
-\begin_layout Standard
-Chinesisch: 是一文作
-\end_layout
-
-\end_body
-\end_document
diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index b9ce179b3e..7cfda67442 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -86,9 +86,8 @@ export/export/latex/fa-OT1_pdf2
 # but that is not so easy if the main language does not require CJK:
 export/export/latex/CJK/en-de-el-ru-.*_utf8_pdf2
 #
-# "language default" legacy encodings fail (missing fonts)
+# some "language default" legacy encodings fail (missing fonts)
 export/export/latex/CJK/ko_default_pdf2
-export/export/latex/CJK/zh_CN_default_pdf2
 
 
 # input encoding tests
-- 
2.39.2