From d645f21775a095cea63b16fb33718904f2d12f81 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Sep 2010 22:52:17 +0000 Subject: ctex 0.99b (10sep10) git-svn-id: svn://tug.org/texlive/trunk@19645 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls | 2 +- Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls | 2 +- Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty | 2 +- Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls | 2 +- Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty | 2 +- Master/texmf-dist/tex/latex/ctex/ctex.sty | 2 +- Master/texmf-dist/tex/latex/ctex/ctexart.cls | 2 +- Master/texmf-dist/tex/latex/ctex/ctexbook.cls | 2 +- Master/texmf-dist/tex/latex/ctex/ctexcap.sty | 2 +- Master/texmf-dist/tex/latex/ctex/ctexrep.cls | 2 +- Master/texmf-dist/tex/latex/ctex/def/ctex-common.def | 6 +++++- .../texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def | 2 +- .../tex/latex/ctex/fontset/ctex-xecjk-winfonts.def | 14 ++++++++------ 13 files changed, 24 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls index bf6eb50a46c..904e7940f0d 100644 --- a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls +++ b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{ctexartutf8} - [2010/01/22 v0.97 ctexartutf8 + [2010/07/12 v0.99b ctexartutf8 document class] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexart}} diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls index 8dbaaf91f7d..2afd29a341a 100644 --- a/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls +++ b/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{ctexbookutf8} - [2010/01/22 v0.97 ctexbookutf8 + [2010/07/12 v0.99b ctexbookutf8 document class] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}} diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty b/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty index 4b1da35e782..1ebad1307bb 100644 --- a/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty +++ b/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{ctexcaputf8} - [2010/01/22 v0.97 ctexcaputf8 + [2010/07/12 v0.99b ctexcaputf8 macros package] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{ctexcap}} diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls index ccb79252161..9a57b15e999 100644 --- a/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls +++ b/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{ctexreputf8} - [2010/01/22 v0.97 ctexreputf8 + [2010/07/12 v0.99b ctexreputf8 document class] \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexrep}} diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty b/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty index ca99a6cdab1..13169f45a81 100644 --- a/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty +++ b/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{ctexutf8} - [2010/01/22 v0.97 ctexutf8 + [2010/07/12 v0.99b ctexutf8 macros package] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{ctex}} diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty index de88408e311..38d57cb11bc 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{ctex} - [2010/01/22 v0.97 ctex + [2010/07/12 v0.99b ctex macros package] \input{ctex-common-opts.def} diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls index ab653ce7352..f19e7a9153b 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{ctexart} - [2010/01/22 v0.97 ctexart + [2010/07/12 v0.99b ctexart document class] \def\CTEX@classtoload{article} diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls index cf0cc439685..8234a42c527 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{ctexbook} - [2010/01/22 v0.97 ctexbook + [2010/07/12 v0.99b ctexbook document class] \def\CTEX@classtoload{book} diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty index 89356aa8784..4cf4faa33c5 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{ctexcap} - [2010/01/22 v0.97 ctexcap + [2010/07/12 v0.99b ctexcap macros package] \input{ctex-common-opts.def} diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls index a759416b6c1..6da6a213f81 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls @@ -2,7 +2,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{ctexrep} - [2010/01/22 v0.97 ctexrep + [2010/07/12 v0.99b ctexrep document class] \def\CTEX@classtoload{report} diff --git a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def index 9d230ed038d..88b0e26378d 100644 --- a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def +++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def @@ -7,11 +7,14 @@ % Load some extra packages +\IfFileExists{expl3.sty}{% + \RequirePackage{expl3}}{} + \RequirePackage{ifpdf} \RequirePackage{ifxetex} \ifxetex - \CTEX@GBKfalse % XeTeX always use UTF-8 as default encoding + \CTEX@GBKfalse % XeTeX always uses UTF-8 as default encoding \fi \RequirePackage{keyval}[1999/03/16] @@ -359,6 +362,7 @@ \makeatother} \def\chinese#1{% \@ifundefined{cc@#1}{\CTEX@null}{\csname cc@#1\endcsname}} +\def\Chinese#1{\CTEXcounter{#1}\chinese{#1}} % About caption diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def index 8051db417ae..a9a2a952b65 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def @@ -1,7 +1,7 @@ % ctex-xecjk-engine.def: for XeTeX engine with xeCJK % vim:ft=tex -\RequirePackage[BoldFont]{xeCJK} +\RequirePackage[BoldFont,normalindentfirst]{xeCJK} \defaultfontfeatures{Mapping=tex-text} \ifCTEX@punct diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def index 13f50f3a075..a4eaeed7621 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def @@ -1,21 +1,23 @@ % ctex-xecjk-winfonts.def: Windows 的 xeCJK 字体设置,默认为六种中易字体 % vim:ft=tex -\setCJKmainfont[BoldFont={SimHei},ItalicFont={[simkai.ttf]}] +\setCJKmainfont[BoldFont={SimHei},ItalicFont={[SIMKAI.TTF]}] {SimSun} \setCJKsansfont{SimHei} -\setCJKmonofont{[simfang.ttf]} +\setCJKmonofont{[SIMFANG.TTF]} \setCJKfamilyfont{zhsong}{SimSun} \setCJKfamilyfont{zhhei}{SimHei} -\setCJKfamilyfont{zhkai}{[simkai.ttf]} -\setCJKfamilyfont{zhfs}{[simfang.ttf]} +\setCJKfamilyfont{zhkai}{[SIMKAI.TTF]} +\setCJKfamilyfont{zhfs}{[SIMFANG.TTF]} +% \setCJKfamilyfont{zhli}{LiSu} +% \setCJKfamilyfont{zhyou}{YouYuan} \newcommand*{\songti}{\CJKfamily{zhsong}} % 宋体 \newcommand*{\heiti}{\CJKfamily{zhhei}} % 黑体 \newcommand*{\kaishu}{\CJKfamily{zhkai}} % 楷书 \newcommand*{\fangsong}{\CJKfamily{zhfs}} % 仿宋 -\newcommand*{\lishu}{\CJKfamily{zhli}} % 隶书 -\newcommand*{\youyuan}{\CJKfamily{zhyou}} % 幼圆 +% \newcommand*{\lishu}{\CJKfamily{zhli}} % 隶书 +% \newcommand*{\youyuan}{\CJKfamily{zhyou}} % 幼圆 \endinput -- cgit v1.2.3