X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftest%2FCJK.lyx.lyx;h=a113614ef5b78ed47c7eb90ac8b078552ccde5b4;hb=3c1b79dd5bd9d6d79a83254075a65a61d46317e2;hp=a2b9f63b9da4724171d8a91c4cb0e13f5a9227a3;hpb=8c0ca33295ef4ee77d418b3d1f9361de55ce2fed;p=lyx.git

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index a2b9f63b9d..a113614ef5 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,10 +1,9 @@
-#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 452
+#LyX file created by tex2lyx 2.2
+\lyxformat 475
 \begin_document
 \begin_header
 \textclass article
 \begin_preamble
-
 \usepackage{babel}
 
 
@@ -14,9 +13,10 @@
 
 
 \end_preamble
+\options english
 \use_default_options false
 \maintain_unincluded_children false
-\language english
+\language japanese-cjk
 \language_package default
 \inputencoding utf8
 \fontencoding T1
@@ -42,13 +42,16 @@
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 0
+\use_package cancel 0
 \use_package esint 1
 \use_package mathdots 0
 \use_package mathtools 0
 \use_package mhchem 0
+\use_package stackrel 0
+\use_package stmaryrd 0
 \use_package undertilde 0
 \cite_engine basic
-\cite_engine_type numerical
+\cite_engine_type default
 \biblio_style plain
 \use_bibtopic false
 \use_indices false
@@ -110,7 +113,7 @@ Chinese simplified
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 begin{CJK}{EUC-JP}{hei}
@@ -118,11 +121,26 @@ begin{CJK}{EUC-JP}{hei}
 
 \end_inset
 
- Japanese 
+ Japanese
+ (this CJK environment will be put in ERT because LyX supports only one CJK
+ font mapping per document, this environment uses the 
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
+
+\backslash
+
+\end_layout
+
+\end_inset
+
+texttt{hei} mapping,
+ and the first mapping is empty.
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
 
 \backslash
 end{CJK}
@@ -144,24 +162,28 @@ Chinese simplified
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-\backslash
-begin{CJK}{Bg5}{}
+\begin_layout Plain Layout
+% The following Bg5 encoded text cannot be processed as is by latex.
 \end_layout
 
 \end_inset
 
 
-Big5 文鼎楷書
-
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
+% It needs to be preprocessed by bg5conv or bg5latex needs to be used.
+\end_layout
 
-\backslash
-end{CJK}
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+% See the documentation of CJK.sty for details.
 \end_layout
 
 \end_inset
@@ -171,6 +193,12 @@ end{CJK}
 
 \begin_layout Standard
 
+\lang chinese-traditional
+ Big5 文鼎楷書 
+\end_layout
+
+\begin_layout Standard
+
 \lang english
 English
 \end_layout
@@ -180,24 +208,28 @@ English
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-\backslash
-begin{CJK}{SJIS}{}
+\begin_layout Plain Layout
+% The following SJIS encoded text cannot be processed as is by latex.
 \end_layout
 
 \end_inset
 
 
-Shift_JIS 日本語の文章
-
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
+% It needs to be preprocessed by sjisconv or sjislatex needs to be used.
+\end_layout
 
-\backslash
-end{CJK}
+\end_inset
+
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+% See the documentation of CJK.sty for details.
 \end_layout
 
 \end_inset
@@ -205,6 +237,12 @@ end{CJK}
 
 \end_layout
 
+\begin_layout Standard
+
+\lang japanese-cjk
+ Shift_JIS 日本語の文章 
+\end_layout
+
 \begin_layout Standard
 hello
 \end_layout
@@ -214,7 +252,7 @@ hello
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 begin{CJK}{JIS}{}
@@ -223,11 +261,11 @@ begin{CJK}{JIS}{}
 \end_inset
 
 
-JIS-code 
+ JIS-code 
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 $
 \end_layout
 
@@ -237,7 +275,7 @@ BF|K
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 
@@ -249,7 +287,7 @@ status collapsed
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 $
 \end_layout
 
@@ -260,7 +298,7 @@ NJ8>O(B
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\begin_layout Plain Layout
 
 \backslash
 end{CJK}