X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftest%2FCJK.lyx.lyx;h=aedb90c846f387923efc714b149b33fa78bf4494;hb=2ebd535e99ebd1578209bf3e5890b06871e1dfeb;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..aedb90c846 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,10 +1,11 @@
-#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 457
+#LyX file created by tex2lyx 2.3
+\lyxformat 522
 \begin_document
 \begin_header
+\save_transient_properties true
+\origin roundtrip
 \textclass article
 \begin_preamble
-
 \usepackage{babel}
 
 
@@ -14,22 +15,24 @@
 
 
 \end_preamble
+\options english
 \use_default_options false
 \maintain_unincluded_children false
-\language english
+\language japanese-cjk
 \language_package default
 \inputencoding utf8
 \fontencoding T1
-\font_roman default
-\font_sans default
-\font_typewriter default
-\font_math 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
-\font_tt_scale 100
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype 0
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -42,6 +45,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 +54,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
@@ -66,7 +70,7 @@
 \tocdepth 3
 \paragraph_separation indent
 \paragraph_indentation default
-\quotes_language english
+\quotes_style english
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
@@ -120,7 +124,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
 
@@ -146,29 +165,47 @@ Chinese simplified
 \begin_inset ERT
 status collapsed
 
+\begin_layout Plain Layout
+% The following Bg5 encoded text cannot be processed as is by latex.
+\end_layout
+
 \begin_layout Plain Layout
 
-\backslash
-begin{CJK}{Bg5}{}
 \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
+
 \begin_layout Plain Layout
 
-\backslash
-end{CJK}
 \end_layout
 
 \end_inset
 
 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+% See the documentation of CJK.sty for details.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang chinese-traditional
+ Big5 文鼎楷書 
 \end_layout
 
 \begin_layout Standard
@@ -182,29 +219,47 @@ English
 \begin_inset ERT
 status collapsed
 
+\begin_layout Plain Layout
+% The following SJIS encoded text cannot be processed as is by latex.
+\end_layout
+
 \begin_layout Plain Layout
 
-\backslash
-begin{CJK}{SJIS}{}
 \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
+
 \begin_layout Plain Layout
 
-\backslash
-end{CJK}
 \end_layout
 
 \end_inset
 
 
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+% See the documentation of CJK.sty for details.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang japanese-cjk
+ Shift_JIS 日本語の文章 
 \end_layout
 
 \begin_layout Standard
@@ -225,7 +280,7 @@ begin{CJK}{JIS}{}
 \end_inset
 
 
-JIS-code 
+ JIS-code 
 \begin_inset ERT
 status collapsed