Chinese Intro and Tutorial.lyx: make files compilable wit XeTeX

- both files: remove \CJKindent which prevented the compilation with XeTeX, load the xeCJK package which is necessary to get text lines broken at the page margin
Both files are still compilable with pdfTeX because then xeCJk does simply nothing.
- Intro: replace TeX code by its LyX inset and alsoremove unnecessary document class option "cjk"

diff --git a/lib/doc/zh_CN/Intro.lyx b/lib/doc/zh_CN/Intro.lyx
index f8b41e7c006c1acd8872a4fac2e165335e892a93..b6007ff69cedce5d8e491175b2ec35fb38ee199d 100644 (file)
--- a/lib/doc/zh_CN/Intro.lyx
+++ b/lib/doc/zh_CN/Intro.lyx
@@ -3,7 +3,9 @@
 \begin_document
 \begin_header
 \textclass article
-\options cjk
+\begin_preamble
+\usepackage{xeCJK}
+\end_preamble
 \use_default_options true
 \maintain_unincluded_children false
 \language chinese-simplified
@@ -76,22 +78,6 @@
 
 \begin_body
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-CJKindent
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Title
 LyX 简介
 \end_layout
@@ -1366,16 +1352,7 @@ type "mailto:"
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-clearpage
-\end_layout
-
+\begin_inset Newpage clearpage
 \end_inset
 
 

diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index b87614878ef0e19c1f56062ddac09243744e850a..b7bef85e4546f636f4f2a2542c9374c7732ffc24 100644 (file)
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -9,7 +9,7 @@
 %中文断行 
 %\XeTeXlinebreaklocale "zh"
 %\XeTeXlinebreakskip = 0pt plus 1pt 
-\usepackage{CJK}
+\usepackage{xeCJK}
 \end_preamble
 \options cjk
 \use_default_options true
@@ -85,22 +85,6 @@
 
 \begin_body
 
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-CJKindent
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
 \begin_layout Title
 The LyX Tutorial
 \end_layout