The branch, master, has been updated. - Log -----------------------------------------------------------------
commit ecb3b7b25c1b7d25f831592a11397ea0fb8d0ec5 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue May 28 00:03:33 2013 +0200 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 f8b41e7..b6007ff 100644 --- 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 b876148..b7bef85 100644 --- 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 ----------------------------------------------------------------------- Summary of changes: lib/doc/zh_CN/Intro.lyx | 31 ++++--------------------------- lib/doc/zh_CN/Tutorial.lyx | 18 +----------------- 2 files changed, 5 insertions(+), 44 deletions(-) hooks/post-receive -- The LyX Source Repository