anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not load xeCJK when mot running XeTeX (resolve critical xeCJK error)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2013-05-29 08:06:15 +02:00
parent 6c0bc842b7
commit a1934a8ef4
2 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/doc/zh_CN/Intro.lyx
View File

@ -1,20 +1,24 @@
#LyX 2.0 created this file. For more info see http://www.lyx.org/ #LyX 2.1 created this file. For more info see http://www.lyx.org/
\lyxformat 413 \lyxformat 473
\begin_document \begin_document
\begin_header \begin_header
\textclass article \textclass article
\begin_preamble \begin_preamble
\usepackage{ifxetex}
\ifxetex
\usepackage{xeCJK} \usepackage{xeCJK}
\fi
\end_preamble \end_preamble
\use_default_options true \use_default_options true
\maintain_unincluded_children false \maintain_unincluded_children false
\language chinese-simplified \language chinese-simplified
\language_package default \language_package default
\inputencoding UTF8 \inputencoding utf8-cjk
\fontencoding global \fontencoding global
\font_roman default \font_roman default
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_math auto
\font_default_family default \font_default_family default
\use_non_tex_fonts false \use_non_tex_fonts false
\font_sc false \font_sc false
@ -22,7 +26,6 @@
\font_sf_scale 100 \font_sf_scale 100
\font_tt_scale 100 \font_tt_scale 100
\font_cjk gbsn \font_cjk gbsn
\graphics default \graphics default
\default_output_format default \default_output_format default
\output_sync 0 \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" \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
\papersize a4paper \papersize a4paper
\use_geometry false \use_geometry false
\use_amsmath 1 \use_package amsmath 1
\use_esint 1 \use_package amssymb 1
\use_mhchem 1 \use_package cancel 0
\use_mathdots 1 \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 basic
\cite_engine_type default
\biblio_style plain
\use_bibtopic false \use_bibtopic false
\use_indices false \use_indices false
\paperorientation portrait \paperorientation portrait
\suppress_date false \suppress_date false
\justification true
\use_refstyle 0 \use_refstyle 0
\index 索引 \index 索引
\shortcut idx \shortcut idx
@ -599,7 +611,7 @@ sideways false
status open status open
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset Caption \begin_inset Caption Standard
\begin_layout Plain Layout \begin_layout Plain Layout
\begin_inset CommandInset label \begin_inset CommandInset label
@ -624,9 +636,9 @@ name "tab:单位"
\align center \align center
\begin_inset Tabular \begin_inset Tabular
<lyxtabular version="3" rows="20" columns="2"> <lyxtabular version="3" rows="20" columns="2">
<features tabularvalignment="middle"> <features rotate="0" tabularvalignment="middle">
<column alignment="center" valignment="top" width="0"> <column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0"> <column alignment="center" valignment="top">
<row> <row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none"> <cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text \begin_inset Text

30
lib/doc/zh_CN/Tutorial.lyx
View File

@ -1,5 +1,5 @@
#LyX 2.0 created this file. For more info see http://www.lyx.org/ #LyX 2.1 created this file. For more info see http://www.lyx.org/
\lyxformat 413 \lyxformat 473
\begin_document \begin_document
\begin_header \begin_header
\textclass book \textclass book
@ -9,18 +9,22 @@
%中文断行 %中文断行
%\XeTeXlinebreaklocale "zh" %\XeTeXlinebreaklocale "zh"
%\XeTeXlinebreakskip = 0pt plus 1pt %\XeTeXlinebreakskip = 0pt plus 1pt
\usepackage{ifxetex}
\ifxetex
\usepackage{xeCJK} \usepackage{xeCJK}
\fi
\end_preamble \end_preamble
\options cjk \options cjk
\use_default_options true \use_default_options true
\maintain_unincluded_children false \maintain_unincluded_children false
\language chinese-simplified \language chinese-simplified
\language_package default \language_package default
\inputencoding UTF8 \inputencoding utf8-cjk
\fontencoding global \fontencoding global
\font_roman default \font_roman default
\font_sans default \font_sans default
\font_typewriter default \font_typewriter default
\font_math auto
\font_default_family default \font_default_family default
\use_non_tex_fonts false \use_non_tex_fonts false
\font_sc false \font_sc false
@ -28,7 +32,6 @@
\font_sf_scale 100 \font_sf_scale 100
\font_tt_scale 100 \font_tt_scale 100
\font_cjk gbsn \font_cjk gbsn
\graphics default \graphics default
\default_output_format default \default_output_format default
\output_sync 0 \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" \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true,pdfstartview=XYZ, plainpages=false"
\papersize a4paper \papersize a4paper
\use_geometry false \use_geometry false
\use_amsmath 1 \use_package amsmath 1
\use_esint 1 \use_package amssymb 1
\use_mhchem 1 \use_package cancel 0
\use_mathdots 1 \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 basic
\cite_engine_type default
\biblio_style plain
\use_bibtopic false \use_bibtopic false
\use_indices false \use_indices false
\paperorientation portrait \paperorientation portrait
\suppress_date false \suppress_date false
\justification true
\use_refstyle 0 \use_refstyle 0
\index 索引 \index 索引
\shortcut idx \shortcut idx
@ -1023,7 +1035,7 @@ Additional Features
\align center \align center
\begin_inset Tabular \begin_inset Tabular
<lyxtabular version="3" rows="7" columns="2"> <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">
<column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt">
<row> <row>