X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftest%2FCJK.lyx.lyx;h=97845522f06cc727a761bf719a52ecb14858a9c4;hb=3628ceec480c3d8fa9673f80f781eb1153fb9e1f;hp=60bf6fa0bd3916812e165527259dcf6dbeac2df7;hpb=45fd75fe967208d3be614375dcf527d79cf367a2;p=lyx.git

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 60bf6fa0bd..97845522f0 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.0svn
-\lyxformat 433
+#LyX file created by tex2lyx 2.2
+\lyxformat 508
 \begin_document
 \begin_header
+\save_transient_properties true
+\origin roundtrip
 \textclass article
 \begin_preamble
-
 \usepackage{babel}
 
 
@@ -14,21 +15,23 @@
 
 
 \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_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
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -36,18 +39,21 @@
 \index_command default
 \paperfontsize default
 \spacing single
-\use_hyperref 0
+\use_hyperref false
 \papersize default
 \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
@@ -55,6 +61,10 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
@@ -75,44 +85,37 @@
 \begin_layout Standard
 
 \lang japanese-cjk
-
 Japanese 
 \end_layout
 
 \begin_layout Standard
 
 \lang chinese-traditional
-
 Chinese traditional
 \end_layout
 
 \begin_layout Standard
 
 \lang japanese-cjk
-
  Japanese 
 \end_layout
 
 \begin_layout Standard
-
 hello 
 \end_layout
 
 \begin_layout Standard
 
 \lang chinese-simplified
-
 Chinese simplified 
 \end_layout
 
 \begin_layout Standard
 
-
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
+\begin_layout Plain Layout
 
 \backslash
 begin{CJK}{EUC-JP}{hei}
@@ -120,12 +123,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}
@@ -139,36 +156,44 @@ end{CJK}
 \begin_layout Standard
 
 \lang chinese-simplified
-
 Chinese simplified 
 \end_layout
 
 \begin_layout Standard
 
-
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\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 Standard
+\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
@@ -178,6 +203,11 @@ end{CJK}
 
 \begin_layout Standard
 
+\lang chinese-traditional
+ Big5 文鼎楷書 
+\end_layout
+
+\begin_layout Standard
 
 \lang english
 English
@@ -185,30 +215,39 @@ English
 
 \begin_layout Standard
 
-
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
+\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 Standard
+\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
@@ -218,17 +257,20 @@ end{CJK}
 
 \begin_layout Standard
 
-hello
+\lang japanese-cjk
+ Shift_JIS 日本語の文章 
 \end_layout
 
 \begin_layout Standard
+hello
+\end_layout
 
+\begin_layout Standard
 
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
+\begin_layout Plain Layout
 
 \backslash
 begin{CJK}{JIS}{}
@@ -237,12 +279,11 @@ begin{CJK}{JIS}{}
 \end_inset
 
 
-JIS-code 
+ JIS-code 
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
+\begin_layout Plain Layout
 $
 \end_layout
 
@@ -252,8 +293,7 @@ BF|K
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
+\begin_layout Plain Layout
 
 \backslash
 
@@ -265,8 +305,7 @@ status collapsed
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
+\begin_layout Plain Layout
 $
 \end_layout
 
@@ -277,8 +316,7 @@ NJ8>O(B
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
+\begin_layout Plain Layout
 
 \backslash
 end{CJK}
@@ -292,7 +330,6 @@ end{CJK}
 \begin_layout Standard
 
 \lang korean
-
 Korean 
 \end_layout