summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.pdfbin241466 -> 226401 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.tex16
-rw-r--r--Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex2
-rw-r--r--Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex17
-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.def39
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def14
19 files changed, 58 insertions, 62 deletions
diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
index 66805cca2e2..af0e0c5d6ca 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 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{⺺\%ٷֺ\%}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
index 54910aea8fa..8a309879c08 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/10/17 v1.02 ctexartutf8
+ [2011/03/11 v1.02c 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 a220db13fd5..b4cc20f292c 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/10/17 v1.02 ctexbookutf8
+ [2011/03/11 v1.02c 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 313c2ca9353..f0f2234525b 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/10/17 v1.02 ctexcaputf8
+ [2011/03/11 v1.02c 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 6f8da36bc97..f7b25ef5d8c 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/10/17 v1.02 ctexreputf8
+ [2011/03/11 v1.02c 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 b12facc942d..f4c3a829f62 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/10/17 v1.02 ctexutf8
+ [2011/03/11 v1.02c 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 8622086d3f6..2fa7c4a90e8 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/10/17 v1.02 ctex
+ [2011/03/11 v1.02c 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 453d6656ebc..0665cb9bc04 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/10/17 v1.02 ctexart
+ [2011/03/11 v1.02c 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 d642b723f1b..89c54060ae5 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/10/17 v1.02 ctexbook
+ [2011/03/11 v1.02c 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 a9c5c9c4b24..b13556dff44 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/10/17 v1.02 ctexcap
+ [2011/03/11 v1.02c 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 a75abc7d631..f627f861f5b 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/10/17 v1.02 ctexrep
+ [2011/03/11 v1.02c 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 3229c41c82d..5b2f0857341 100644
--- a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
+++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
@@ -7,6 +7,10 @@
% Load some extra packages
+\IfFileExists{expl3.sty}{%
+ \RequirePackage{expl3}}{}
+
+\RequirePackage{etoolbox}
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
@@ -45,18 +49,6 @@
\csname #2#3\expandafter\endcsname
{\csname #1#3\endcsname}}
-% Set our hooks
-\let\CTEX@begindocumenthook\@empty
-\let\CTEX@enddocumenthook\@empty
-\let\CTEX@save@begindocumenthook\@begindocumenthook
-\let\CTEX@save@enddocumenthook\@enddocumenthook
-\def\@begindocumenthook{\CTEX@save@begindocumenthook\CTEX@begindocumenthook}
-\def\@enddocumenthook{\CTEX@enddocumenthook\CTEX@save@enddocumenthook}
-\def\AtBeginDocument{\g@addto@macro\CTEX@save@begindocumenthook}
-\def\AtEndDocument{\g@addto@macro\CTEX@save@enddocumenthook}
-\def\CTEX@AtBeginDocument{\g@addto@macro\CTEX@begindocumenthook}
-\def\CTEX@AtEndDocument{\g@addto@macro\CTEX@enddocumenthook}
-
% Select engine: xetex has the highest priority, if not,
% then try cct, otherwise we use traditional cjk.
@@ -81,7 +73,7 @@
\newcommand*\CTEXindent{\CTEXsetfont\parindent2\ccwd}
\newcommand*\CTEXnoindent{\parindent\z@}
\ifCTEX@indent
- \CTEX@AtBeginDocument{\CTEXindent}
+ \AtBeginDocument{\CTEXindent}
\fi
\def\CTEX@spaceChar{\hskip \f@size \p@}
\def\baselinestretch{1.3}
@@ -351,7 +343,7 @@
\expandafter\expandafter\expandafter\def%
\expandafter\expandafter\csname cc@#1\endcsname%
\expandafter{\reserved@a}}}
-\CTEX@AtBeginDocument{%
+\AtBeginDocument{%
\makeatletter%
\@ifundefined{CTEX@save@setcounter}{%
\let\CTEX@save@setcounter\setcounter%
@@ -402,27 +394,32 @@
% Put hyperref as bottom as possible, otherwise there may be page
% count issues
-\AtEndOfPackage{%
\ifCTEX@hyperref
+\providecommand\hypersetup[1]{%
+ \PassOptionsToPackage{#1}{hyperref}}
+\AtEndPreamble{%
+ \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}}
+\AtEndOfPackage{%
\ifxetex
- \RequirePackage{hyperref}
+ \hypersetup{xetex,unicode}
\else
\ifpdf % pdftex
- \RequirePackage[pdftex]{hyperref}
+ \hypersetup{pdftex}
\else % dvipdfmx
+ \hypersetup{dvipdfmx}
\ifCTEX@GBK
\AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
\fi
- \RequirePackage[dvipdfmx]{hyperref}
\fi
\ifCTEX@GBK
- \hypersetup{CJKbookmarks=true}
+ \hypersetup{CJKbookmarks}
\else
- \hypersetup{unicode=true}
+ \hypersetup{unicode}
\fi
\fi
\hypersetup{colorlinks=true}
-\fi}
+}
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def
index 528a2b7c323..cd54033ed97 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cct-engine.def
@@ -16,9 +16,9 @@
\normalem
\fi
\ifCTEX@space
- \CTEX@AtBeginDocument{\CCTspace}
+ \AtBeginDocument{\CCTspace}
\else
- \CTEX@AtBeginDocument{\CCTnospace}
+ \AtBeginDocument{\CCTnospace}
\fi
\def\CTEXspace{\CCTspace}
\def\CTEXnospace{\CCTnospace}
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def
index d0ed28a8996..05634b7663b 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def
@@ -29,14 +29,12 @@
\def\CTEX@endCJK{\clearpage\end{CJK*}}
\fi
-\def\@begindocumenthook{%
- \CTEX@save@begindocumenthook%
- \CTEX@begindocumenthook%
- \CTEX@beginCJK}
-\def\@enddocumenthook{%
- \CTEX@endCJK
- \CTEX@enddocumenthook%
- \CTEX@save@enddocumenthook}
+\let\CTEX@begindocumenthook\@begindocumenthook
+\let\CTEX@enddocumenthook\@enddocumenthook
+\def\AtBeginDocument{\g@addto@macro\CTEX@begindocumenthook}
+\def\AtEndDocument{\g@addto@macro\CTEX@enddocumenthook}
+\def\@begindocumenthook{\CTEX@begindocumenthook\CTEX@beginCJK}
+\def\@enddocumenthook{\CTEX@endCJK\CTEX@enddocumenthook}
\input{ctex-cjk-common.def}