The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit a1934a8ef457de44507cef4683f182f7c9519c61
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Wed May 29 08:06:15 2013 +0200
Do not load xeCJK when mot running XeTeX (resolve critical xeCJK error)
diff --git a/lib/doc/zh_CN/Intro.lyx b/lib/doc/zh_CN/Intro.lyx
index b6007ff..2e86296 100644
--- a/lib/doc/zh_CN/Intro.lyx
+++ b/lib/doc/zh_CN/Intro.lyx
@@ -1,20 +1,24 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 473
\begin_document
\begin_header
\textclass article
\begin_preamble
+\usepackage{ifxetex}
+\ifxetex
\usepackage{xeCJK}
+\fi
\end_preamble
\use_default_options true
\maintain_unincluded_children false
\language chinese-simplified
\language_package default
-\inputencoding UTF8
+\inputencoding utf8-cjk
\fontencoding global
\font_roman default
\font_sans default
\font_typewriter default
+\font_math auto
\font_default_family default
\use_non_tex_fonts false
\font_sc false
@@ -22,7 +26,6 @@
\font_sf_scale 100
\font_tt_scale 100
\font_cjk gbsn
-
\graphics default
\default_output_format default
\output_sync 0
@@ -47,15 +50,24 @@
\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue,
filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ,
plainpages=false"
\papersize a4paper
\use_geometry false
-\use_amsmath 1
-\use_esint 1
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 0
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
\use_bibtopic false
\use_indices false
\paperorientation portrait
\suppress_date false
+\justification true
\use_refstyle 0
\index ç´¢å¼
\shortcut idx
@@ -599,7 +611,7 @@ sideways false
status open
\begin_layout Plain Layout
-\begin_inset Caption
+\begin_inset Caption Standard
\begin_layout Plain Layout
\begin_inset CommandInset label
@@ -624,9 +636,9 @@ name "tab:åä½"
\align center
\begin_inset Tabular
<lyxtabular version="3" rows="20" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
+<features rotate="0" tabularvalignment="middle">
+<column alignment="center" valignment="top">
+<column alignment="center" valignment="top">
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true"
leftline="true" usebox="none">
\begin_inset Text
diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index b7bef85..51bc525 100644
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -1,5 +1,5 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 473
\begin_document
\begin_header
\textclass book
@@ -9,18 +9,22 @@
%ä¸ææè¡
%\XeTeXlinebreaklocale "zh"
%\XeTeXlinebreakskip = 0pt plus 1pt
+\usepackage{ifxetex}
+\ifxetex
\usepackage{xeCJK}
+\fi
\end_preamble
\options cjk
\use_default_options true
\maintain_unincluded_children false
\language chinese-simplified
\language_package default
-\inputencoding UTF8
+\inputencoding utf8-cjk
\fontencoding global
\font_roman default
\font_sans default
\font_typewriter default
+\font_math auto
\font_default_family default
\use_non_tex_fonts false
\font_sc false
@@ -28,7 +32,6 @@
\font_sf_scale 100
\font_tt_scale 100
\font_cjk gbsn
-
\graphics default
\default_output_format default
\output_sync 0
@@ -54,15 +57,24 @@
\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue,
filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true,pdfstartview=XYZ,
plainpages=false"
\papersize a4paper
\use_geometry false
-\use_amsmath 1
-\use_esint 1
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 0
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
\use_bibtopic false
\use_indices false
\paperorientation portrait
\suppress_date false
+\justification true
\use_refstyle 0
\index ç´¢å¼
\shortcut idx
@@ -1023,7 +1035,7 @@ Additional Features
\align center
\begin_inset Tabular
<lyxtabular version="3" rows="7" columns="2">
-<features tabularvalignment="middle">
+<features rotate="0" tabularvalignment="middle">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top" width="0pt">
<row>
-----------------------------------------------------------------------
Summary of changes:
lib/doc/zh_CN/Intro.lyx | 36 ++++++++++++++++++++++++------------
lib/doc/zh_CN/Tutorial.lyx | 30 +++++++++++++++++++++---------
2 files changed, 45 insertions(+), 21 deletions(-)
hooks/post-receive
--
The LyX Source Repository
