From 6727cd30ee7f5b0b96c45a110af7f11c1c50873f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 May 2011 22:19:47 +0000 Subject: ctex 1.02c (14may11) git-svn-id: svn://tug.org/texlive/trunk@22488 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ctex/ctex.pdf | Bin 241466 -> 226401 bytes Master/texmf-dist/doc/latex/ctex/ctex.tex | 16 +++++++++++++--- Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex | 2 +- .../doc/latex/ctex/test/test-cjkutf8.tex | 17 ++++------------- .../texmf-dist/doc/latex/ctex/test/test-xetex.tex | 4 ++-- .../doc/latex/ctex/test/test-xetexgbk.tex | 4 ++-- 6 files changed, 22 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/doc/latex/ctex') diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf index 66805cca2e2..af0e0c5d6ca 100644 Binary files a/Master/texmf-dist/doc/latex/ctex/ctex.pdf and b/Master/texmf-dist/doc/latex/ctex/ctex.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.tex b/Master/texmf-dist/doc/latex/ctex/ctex.tex index eb7ce5f153f..d860808d083 100644 --- a/Master/texmf-dist/doc/latex/ctex/ctex.tex +++ b/Master/texmf-dist/doc/latex/ctex/ctex.tex @@ -38,7 +38,7 @@ \title{\bf \ctex{} 宏包说明} \author{\it \ctexorg\thanks{\url{http://www.ctex.org}}} -\date{\small 版本号:v1.02 \hskip 2\ccwd 修改日期:2010/10/17} +\date{\small 版本号:v1.02c \hskip 2\ccwd 修改日期:2011/03/11} \maketitle @@ -266,8 +266,11 @@ \item[fancyhdr] 保持和 \texttt{fancyhdr} 宏包的兼容性。该选项将使得 \texttt{fancyhdr} 宏包被自动调用。 -\item[hyperref] 自动判断调用 \texttt{fancyhdr} 宏包的正确参数以避免产生乱码。 -该选项将使得 \texttt{hyperref} 宏包被自动调用。 +\item[hyperref] 自动判断 \texttt{hyperref} 宏包的正确参数以避免产生乱码。如果在 + 导言区用户没有自己调用 \texttt{hyperref},则该选项将使得 \texttt{hyperref} 宏 + 包在导言区末尾被自动调用;如果需要对 \texttt{hyperref} 宏包做进一步的设置,则 + 用户可以自己在 \texttt{ctex} 宏包后调用 \texttt{hyperref},并使用适当的选项或 + 设置。 \item[fntef] 为 \texttt{CJKfntef} 宏包和 \texttt{CCTfntef} 宏包提供统一接口。 该选项将使得 \texttt{CJKfntef} 宏包或者 \texttt{CCTfntef} 宏包被自动调用。 @@ -816,6 +819,13 @@ number & 同右 & \{\cs{Alph}\marg{chapter}\} \\ \begin{description} +\item[v1.02c 2011/03/11] +修改 \texttt{hyperref} 选项的行为,使 \texttt{hyperref} 宏包可以在用户指定的位 +置被调用,以解决个别兼容性问题。修正 XeTeX 编译书签中百分号出错的 BUG。 + +\item[v1.02b 2011/01/21] +修正使用一个中文书签 BUG,恢复依赖 expl3。 + \item[v1.02 2010/10/17] 采用新的 hook 机制,去掉对 expl3 宏包的依赖性 diff --git a/Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex b/Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex index 739eff35cac..1711594d9e3 100644 --- a/Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex +++ b/Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex @@ -496,7 +496,7 @@ This is an English example \end{CTEXfilltwosides} -\chapter{} +\chapter{⺺\%ٷֺ\%} diff --git a/Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex b/Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex index c5e1070b95d..444de0e6ae6 100644 --- a/Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex +++ b/Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex @@ -1,17 +1,8 @@ %# -*- coding: utf-8 -*- % $Id$ -\documentclass[cs4size,a4paper,fancyhdr,fntef,UTF8,winfonts]{ctexbook} -\usepackage{ifpdf} -\usepackage{ifxetex} -\ifxetex - \usepackage[xetex]{hyperref} -\else - \ifpdf - \usepackage[pdftex,unicode]{hyperref} - \else% Assuming dvipdfm(x) - \usepackage[dvipdfm,unicode]{hyperref} - \fi -\fi +\documentclass[cs4size,a4paper,fancyhdr,fntef,UTF8,winfonts,hyperref]{ctexbook} + +\usepackage{hyperref} \usepackage{shortvrb, makeidx} @@ -508,7 +499,7 @@ This is an English example。 \end{CTEXfilltwosides} -\chapter{其他测试} +\chapter{标题汉字与\%百分号\%} 其他测试 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 6b9a37f3440..e2e2257fa6a 100644 --- a/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex +++ b/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex @@ -2,7 +2,7 @@ % $Id$ % test-xetex.tex: XeTeX only test case, use xelatex to run -\documentclass[cs4size,a4paper,fancyhdr,fntef,UTF8,adobefonts]{ctexbook} +\documentclass[cs4size,a4paper,fancyhdr,fntef,UTF8,adobefonts,hyperref]{ctexbook} \usepackage{hyperref} @@ -496,7 +496,7 @@ This is an English example。 \end{CTEXfilltwosides} -\chapter{其他测试} +\chapter{标题汉字与\%百分号\%} 其他测试 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 84a03a5ef8f..a7c3b10c01c 100644 --- a/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex +++ b/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex @@ -2,7 +2,7 @@ % $Id$ % test-xetex.tex: XeTeX only test case, use xelatex to run \XeTeXinputencoding "GBK" -\documentclass[cs4size,a4paper,fancyhdr,fntef,GBK,winfonts]{ctexbook} +\documentclass[cs4size,a4paper,fancyhdr,fntef,GBK,winfonts,hyperref]{ctexbook} % ˵ʵ GBK ڴ˲á % Դļֹ \XeTeXinputencoding "GBK" @@ -498,7 +498,7 @@ This is an English example \end{CTEXfilltwosides} -\chapter{} +\chapter{⺺\%ٷֺ\%} -- cgit v1.2.3