summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-10 22:52:17 +0000
committerKarl Berry <karl@freefriends.org>2010-09-10 22:52:17 +0000
commitd645f21775a095cea63b16fb33718904f2d12f81 (patch)
tree663e371e4cb621b61d3e9db865d470204906432a /Master
parent243b2ad3109380c958cb4869ef9da316d4b1b363 (diff)
ctex 0.99b (10sep10)
git-svn-id: svn://tug.org/texlive/trunk@19645 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.pdfbin362130 -> 262308 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.tex36
-rw-r--r--Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex4
-rw-r--r--Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexart.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexcap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexrep.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/def/ctex-common.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def14
17 files changed, 59 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
index 660c58ca2ce..99eae7480a3 100644
--- a/Master/texmf-dist/doc/latex/ctex/ctex.pdf
+++ b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.tex b/Master/texmf-dist/doc/latex/ctex/ctex.tex
index 5458cbf52d0..d1ac448ce35 100644
--- a/Master/texmf-dist/doc/latex/ctex/ctex.tex
+++ b/Master/texmf-dist/doc/latex/ctex/ctex.tex
@@ -3,6 +3,7 @@
\documentclass{ltxdoc}
\usepackage[fntef,hyperref,UTF8]{ctexcap}
+\hypersetup{pdfstartview=FitH}
\usepackage{texnames}
\topmargin 0.5 true cm
\oddsidemargin 1 true cm
@@ -21,7 +22,7 @@
\newcommand{\ctexdefault}{\emph{这个是 \ctex{} 宏包的缺省模式。}}
\setlength{\parskip}{0.75ex plus .2ex minus .5ex}
-\renewcommand{\baselinestretch}{1.2}
+\linespread{1.2}
\makeatletter
\def\parg#1{\mbox{$\langle${\it #1\/}$\rangle$}}
@@ -37,7 +38,7 @@
\title{\bf \ctex{} 宏包说明}
\author{\it \ctexorg\thanks{\url{http://www.ctex.org}}}
-\date{\small 版本号:v0.96 \hskip 2\ccwd 修改日期:2009/11/24}
+\date{\small 版本号:v0.99b \hskip 2\ccwd 修改日期:2010/07/12}
\maketitle
@@ -206,7 +207,8 @@
\item[nofonts] 没有中文字库,此时没有中文字体命令可用。
\item[winfonts] 使用 Windows 的字体设置,默认为六种中易字体:宋体、仿宋、黑体、
-楷体、隶书、幼圆。该选项的结果将和老版本 \ctex{} 宏包完全一致。这是默认设置。
+楷体、隶书、幼圆(在使用 Xe\TeX{} 时只有前四种)。该选项的结果将和老版本
+\ctex{} 宏包完全一致。这是默认设置。
\item[adobefonts] 在 xeCJK 模式中使用 Adobe 的四套字体:宋体、仿宋、黑体、楷体。
在 CJK 模式(即不使用 Xe\TeX{} 时)下,该选项将使用 winfonts 选项的设置。
@@ -315,7 +317,9 @@
上面的字体命令和 CCT 中的一致,但传统的 CCT 字库中没有隶书和
仿宋两种字体,需要用户自行安装定义。如果使用 CCT 时选择 CJK 字库方式,
-则可以使用这两种中文字体。}
+则可以使用这两种中文字体。
+
+上面的字体在不同的字体选项下有不同的设置,不一定都有定义。}
\subsubsection{字号、字距、字宽和缩进}
@@ -385,7 +389,7 @@
其中 \parg{result} 必须是一个 \TeX{} 宏的名字,不需要预先定义。
例如
\begin{quote}
-|\CTEXnumber{\test}{100002005}|
+|\CTEXdigits{\test}{100002005}|
\end{quote}
\CTEXdigits{\test}{100002005}
则 |\test| 中的内容就是“\test{}”(不包括引号)。
@@ -400,6 +404,14 @@
其中 \parg{counter} 是一个 \LaTeX{} 计数器(counter),即由
|\newcounter| 命令产生的,例如 |section|, |figure| 等。
+\DescribeMacro{\Chinese}
+\ctex{} 宏包会在每次使用 |\setcounter|, |\stepcounter| 或
+|\addtocounter| 时利用 |\CTEXcounter{|\parg{counter}|}|
+更新 |\chinese| 命令产生的汉字,如果计数器的修改没有用到上述命令
+(如页码),就需要在 |\chinese| 前手工使用 |\CTEXcounter| 命令
+更新。为此,\ctex{} 宏包提供了大写的 |\Chinese| 命令,作为
+上述过程的简写。例如 |\Chinese{page}| 产生“\Chinese{page}”。
+该命令不宜用在 |\section| 等命令的参数中。
\subsection{高级设置}
@@ -804,6 +816,20 @@ number & 同右 & \{\cs{Alph}\marg{chapter}\} \\
\begin{description}
+\item[v0.99b 2010/07/11]
+发现 BUG,把 |\chinese*| 改为 |\Chinese|。
+
+\item[v0.99a 2010/07/11]
+增加 |\chinese*| 命令,作为 |\CTEXcounter| 和 |\chinese| 混合体的
+简写形式。
+
+\item[v0.99 2010/07/08]
+提早引入 expl3 宏包,解决 |\chinese| 命令在 expl3 下的不能正确使用的问题。
+
+\item[v0.98 2010/06/19]
+解决 xeCJK 默认代替 indentfirst 功能的问题。修正 xeCJK 模式下 winfonts
+的中文字体。
+
\item[v0.97 2010/01/22]
修正 pdf\LaTeX{} 与 Xe\LaTeX{} 中生成 PDF 书签的问题。
diff --git a/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex b/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex
index 1b430e728d1..6b9a37f3440 100644
--- a/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex
+++ b/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex
@@ -249,8 +249,8 @@ This is an English example。
|\heiti| & {\heiti 黑体} \\
|\fangsong| & {\fangsong 仿宋} \\
|\kaishu| & {\kaishu 楷书} \\
- |\lishu| & {\lishu 隶书} \\
- |\youyuan| & {\youyuan 幼圆}
+ |\lishu| & (无效) \\ %{\lishu 隶书} \\
+ |\youyuan| & (无效) \\ %{\youyuan 幼圆}
\end{tabular}
\index{songti} \index{heiti} \index{fangsong} \index{kaishu} \index{lishu} \index{youyuan}
diff --git a/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex b/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex
index 0ed490321e4..84a03a5ef8f 100644
--- a/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex
+++ b/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex
@@ -251,8 +251,8 @@ This is an English example
|\heiti| & {\heiti } \\
|\fangsong| & {\fangsong } \\
|\kaishu| & {\kaishu } \\
- |\lishu| & {\lishu } \\
- |\youyuan| & {\youyuan Բ}
+ |\lishu| & Ч \\ %{\lishu } \\
+ |\youyuan| & Ч %{\youyuan Բ}
\end{tabular}
\index{songti} \index{heiti} \index{fangsong} \index{kaishu} \index{lishu} \index{youyuan}
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