X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftest%2FCJK.lyx.lyx;h=d6cceb748d6d8b5c7fb24e7ccb796e5ef12cd8b2;hb=0d6c64a4eb0a3b6f1e27ba7fd342bf5cff0314a8;hp=02d8bd4148f5ddc561db945b374a6809caba7432;hpb=1c0bd0132c605d18229085c42cd2fba1b30151a8;p=lyx.git

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 02d8bd4148..d6cceb748d 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,11 +1,12 @@
-#LyX file created by tex2lyx 2.1.0svn
-\lyxformat 430
+#LyX file created by tex2lyx 2.3
+\lyxformat 535
 \begin_document
 \begin_header
+\save_transient_properties true
+\origin roundtrip
 \textclass article
 \begin_preamble
-
-\usepackage{CJK}\usepackage{babel}
+\usepackage{babel}
 
 
 % It is impossible to get the document language because the document could start with a command,
@@ -14,34 +15,46 @@
 
 
 \end_preamble
+\options english
 \use_default_options false
-\language english
+\maintain_unincluded_children false
+\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
+\use_microtype 0
 \graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\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
@@ -49,11 +62,15 @@
 \suppress_date false
 \justification true
 \use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
 \paragraph_indentation default
-\quotes_language english
+\quotes_style english
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
@@ -68,305 +85,65 @@
 
 \begin_layout Standard
 
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{CJK}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-{
-\end_layout
-
-\end_inset
-
-EUC-JP
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-{}
-\end_layout
-
-\end_inset
-
+\lang japanese-cjk
 Japanese 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-end{CJK}
 \end_layout
 
-\end_inset
-
- 
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
 
-
-\backslash
-begin{CJK}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-{
-\end_layout
-
-\end_inset
-
-UTF8
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-{}
-\end_layout
-
-\end_inset
-
+\lang chinese-traditional
 Chinese traditional
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-end{CJK}
-\end_layout
-
-\end_inset
-
- 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-begin{CJK}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-{
-\end_layout
-
-\end_inset
-
-EUC-JP
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-}
 \end_layout
 
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
 
-{}
-\end_layout
-
-\end_inset
-
+\lang japanese-cjk
  Japanese 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-end{CJK}
 \end_layout
 
-\end_inset
-
- hello 
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
-
-
-\backslash
-begin{CJK}
+hello 
 \end_layout
 
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
 
-{
+\lang chinese-simplified
+Chinese simplified 
 \end_layout
 
-\end_inset
-
-GB
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
 
-}
-\end_layout
-
-\end_inset
-
-
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-{}
-\end_layout
-
-\end_inset
-
-Chinese simplified 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
+\begin_layout Plain Layout
 
 \backslash
-end{CJK}
+begin{CJK}{EUC-JP}{hei}
 \end_layout
 
 \end_inset
 
-
+ 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
-begin{CJK}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
 
-{
 \end_layout
 
 \end_inset
 
-EUC-JP
+texttt{hei} mapping,
+ and the first mapping is empty.
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-{
-\end_layout
-
-\end_inset
-
-hei
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-}
-\end_layout
-
-\end_inset
-
- Japanese 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
+\begin_layout Plain Layout
 
 \backslash
 end{CJK}
@@ -374,79 +151,40 @@ end{CJK}
 
 \end_inset
 
- 
-\begin_inset ERT
-status collapsed
 
-\begin_layout Standard
-
-
-\backslash
-begin{CJK}
 \end_layout
 
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
 
-{
+\lang chinese-simplified
+Chinese simplified 
 \end_layout
 
-\end_inset
-
-GB
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
 
-}
-\end_layout
-
-\end_inset
-
-
 \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
 
-\end_inset
+\begin_layout Plain Layout
 
-Chinese simplified 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-end{CJK}
 \end_layout
 
 \end_inset
 
 
-\end_layout
-
-\begin_layout Standard
-
-
 \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
-begin{CJK}
 \end_layout
 
 \end_inset
@@ -455,69 +193,38 @@ begin{CJK}
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-{
+\begin_layout Plain Layout
+% See the documentation of CJK.sty for details.
 \end_layout
 
 \end_inset
 
-Bg5
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
 
-}
 \end_layout
 
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
 
-{}
-\end_layout
-
-\end_inset
-
+\lang chinese-traditional
  Big5 文鼎楷書 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-end{CJK}
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
 
-
 \lang english
 English
 \end_layout
 
 \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}
 \end_layout
 
 \end_inset
@@ -526,20 +233,12 @@ begin{CJK}
 \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
 
-\end_inset
-
-SJIS
-\begin_inset ERT
-status collapsed
+\begin_layout Plain Layout
 
-\begin_layout Standard
-
-}
 \end_layout
 
 \end_inset
@@ -548,164 +247,91 @@ status collapsed
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-{}
+\begin_layout Plain Layout
+% See the documentation of CJK.sty for details.
 \end_layout
 
 \end_inset
 
- ShiftJIS 日本語の文章 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
 
-\backslash
-end{CJK}
 \end_layout
 
-\end_inset
-
+\begin_layout Standard
 
+\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}
+begin{CJK}{JIS}{}
 \end_layout
 
 \end_inset
 
 
+ JIS-code 
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-{
+\begin_layout Plain Layout
+$
 \end_layout
 
 \end_inset
 
-JIS
+BF|K
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
+\begin_layout Plain Layout
 
-\begin_layout Standard
+\backslash
 
-{}
 \end_layout
 
 \end_inset
 
- JIS-code 
-\begin_inset Formula $BF|K\8l$
-\end_inset
-
-NJ8>O(B 
+8l
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
-
-\backslash
-end{CJK}
+\begin_layout Plain Layout
+$
 \end_layout
 
 \end_inset
 
-
-\end_layout
-
-\begin_layout Standard
-
+NJ8>O(B
 
 \begin_inset ERT
 status collapsed
 
-\begin_layout Standard
-
+\begin_layout Plain Layout
 
 \backslash
-begin{CJK}
+end{CJK}
 \end_layout
 
 \end_inset
 
 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-{
 \end_layout
 
-\end_inset
-
-KS
-\begin_inset ERT
-status collapsed
-
 \begin_layout Standard
 
-}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-{}
-\end_layout
-
-\end_inset
-
+\lang korean
 Korean 
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-end{CJK}
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \end_body