X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftest%2FCJK.lyx.lyx;h=c1087e09ac3bd8925f5940c54f6cc30bce6f8e26;hb=e69124ab76ba12bd4e9598fa8d25eafce0c9b8a1;hp=c8c1a7e7b609ef8d19525d23d11291145baf8f1f;hpb=de5e34872740363afbf058dac9bd71c0b31209ad;p=lyx.git

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index c8c1a7e7b6..c1087e09ac 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,10 +1,10 @@
-#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+#LyX file created by tex2lyx 2.2
+\lyxformat 495
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
-
 \usepackage{babel}
 
 
@@ -14,9 +14,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,6 +43,7 @@
 \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
@@ -50,7 +52,7 @@
 \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
@@ -120,7 +122,22 @@ 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 Plain Layout
+
+\backslash
+
+\end_layout
+
+\end_inset
+
+texttt{hei} mapping,
+ and the first mapping is empty.
 \begin_inset ERT
 status collapsed
 
@@ -147,23 +164,27 @@ Chinese simplified
 status collapsed
 
 \begin_layout Plain Layout
-
-\backslash
-begin{CJK}{Bg5}{}
+% The following Bg5 encoded text cannot be processed as is by latex.
 \end_layout
 
 \end_inset
 
 
-Big5 文鼎楷書
-
 \begin_inset ERT
 status collapsed
 
 \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
@@ -173,6 +194,12 @@ end{CJK}
 
 \begin_layout Standard
 
+\lang chinese-traditional
+ Big5 文鼎楷書 
+\end_layout
+
+\begin_layout Standard
+
 \lang english
 English
 \end_layout
@@ -183,23 +210,27 @@ English
 status collapsed
 
 \begin_layout Plain Layout
-
-\backslash
-begin{CJK}{SJIS}{}
+% 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 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
@@ -207,6 +238,12 @@ end{CJK}
 
 \end_layout
 
+\begin_layout Standard
+
+\lang japanese-cjk
+ Shift_JIS 日本語の文章 
+\end_layout
+
 \begin_layout Standard
 hello
 \end_layout
@@ -225,7 +262,7 @@ begin{CJK}{JIS}{}
 \end_inset
 
 
-JIS-code 
+ JIS-code 
 \begin_inset ERT
 status collapsed