Implement forced local layouts

[lyx.git] / src / tex2lyx / test / CJK.lyx.lyx

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 43ece811731d387062ca7ddbe4b8c5ed22ce31a1..014de532324a72770b16deadb707ff64bfa95469 100644 (file)
--- 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 458
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article
 \begin_preamble
-
 \usepackage{babel}
 
 
@@ -14,6 +13,7 @@
 
 
 \end_preamble
+\options english
 \use_default_options false
 \maintain_unincluded_children false
 \language japanese-cjk
@@ -42,6 +42,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
@@ -120,7 +121,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
 
@@ -150,10 +166,6 @@ status collapsed
 % The following Bg5 encoded text cannot be processed as is by latex.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -164,10 +176,6 @@ status collapsed
 % It needs to be preprocessed by bg5conv or bg5latex needs to be used.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -178,10 +186,6 @@ status collapsed
 % See the documentation of CJK.sty for details.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -208,10 +212,6 @@ status collapsed
 % The following SJIS encoded text cannot be processed as is by latex.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -222,10 +222,6 @@ status collapsed
 % It needs to be preprocessed by sjisconv or sjislatex needs to be used.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -236,10 +232,6 @@ status collapsed
 % See the documentation of CJK.sty for details.
 \end_layout
 
-\begin_layout Plain Layout
-
-\end_layout
-
 \end_inset
 
 
@@ -269,7 +261,7 @@ begin{CJK}{JIS}{}
 \end_inset
 
 
-JIS-code \e
+ JIS-code \e
 \begin_inset ERT
 status collapsed