summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.pdfbin326587 -> 212604 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.tex11
-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.def13
-rw-r--r--Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def3
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds14
15 files changed, 43 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
index 18d25606453..26a48a6cade 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 2a06a813a5c..a03587fd31e 100644
--- a/Master/texmf-dist/doc/latex/ctex/ctex.tex
+++ b/Master/texmf-dist/doc/latex/ctex/ctex.tex
@@ -33,7 +33,7 @@
\title{\bf \ctex{} 宏包说明}
\author{\it \ctexorg\thanks{http://www.ctex.org}}
-\date{\small 版本号:v0.92 \hskip 2\ccwd 修改日期:2009/06/26}
+\date{\small 版本号:v0.93 \hskip 2\ccwd 修改日期:2009/07/10}
\maketitle
@@ -255,6 +255,9 @@
\item[fancyhdr] 保持和~\texttt{fancyhdr}~宏包的兼容性。该选项将使得
~\texttt{fancyhdr}~宏包被自动调用。
+\item[hyperref] 自动判断调用~\texttt{fancyhdr}~宏包的正确参数以避免产生乱码。
+该选项将使得~\texttt{hyperref}~宏包被自动调用。
+
\item[fntef] 为~\texttt{CJKfntef}~宏包和~\texttt{CCTfntef}~宏包提供统一接口。
该选项将使得~\texttt{CJKfntef}~宏包或者~\texttt{CCTfntef}~宏包被自动调用。
\end{description}
@@ -793,6 +796,12 @@ number & 同右 & \{\cs{Alph}\marg{chapter}\} \\
\begin{description}
+\item[v0.93 2009/07/10]
+加入选项 hyperref 以支持自动用合适的参数调用 hyperref 宏包
+
+\item[v0.92 2009/06/25]
+Add backward compatibility to old ctexutf8 packages
+
\item[v0.91 2009/05/23]
调整宏包结构,增加对各种系统中文字库的支持选项:~cjkfonts, winfonts,
adobefonts
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
index 7e703145921..cf6eeab5849 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}
- [2009/06/26 v0.92 ctexartutf8
+ [2009/07/10 v0.93 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 c28b202fb9c..cbf5ffb4cda 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}
- [2009/06/26 v0.92 ctexbookutf8
+ [2009/07/10 v0.93 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 7ee25a73335..d170ef74114 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}
- [2009/06/26 v0.92 ctexcaputf8
+ [2009/07/10 v0.93 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 8c4d01aad11..1668248b377 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}
- [2009/06/26 v0.92 ctexreputf8
+ [2009/07/10 v0.93 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 7dbbe9a42a9..ac7a5466085 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}
- [2009/06/26 v0.92 ctexutf8
+ [2009/07/10 v0.93 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 6b3fa1bd34c..f52b0114dfb 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}
- [2009/06/26 v0.92 ctex
+ [2009/07/10 v0.93 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 d0db7cf44a0..4709eabbfd7 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}
- [2009/06/26 v0.92 ctexart
+ [2009/07/10 v0.93 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 4c2f5fadb6b..50e103dd09c 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}
- [2009/06/26 v0.92 ctexbook
+ [2009/07/10 v0.93 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 8ace4ce4137..c0390a99b3b 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}
- [2009/06/26 v0.92 ctexcap
+ [2009/07/10 v0.93 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 92994593374..8454a60c77e 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}
- [2009/06/26 v0.92 ctexrep
+ [2009/07/10 v0.93 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 d6d32eac64f..b1222db0e74 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,7 @@
% Load some extra packages
+\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
\RequirePackage{keyval}[1999/03/16]
\ifCTEX@indent
@@ -16,6 +17,18 @@
\ifCTEX@fancyhdr
\RequirePackage{fancyhdr}
\fi
+\ifCTEX@hyperref
+ \ifxetex\else
+ \ifpdf\else
+ \AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
+ \fi
+ \fi
+ \ifCTEX@GBK
+ \RequirePackage[CJKbookmarks]{hyperref}
+ \else
+ \RequirePackage[unicode]{hyperref}
+ \fi
+\fi
% Useful definitions
diff --git a/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def b/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def
index c9ef2d9d1d2..19612418d52 100644
--- a/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def
+++ b/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def
@@ -56,4 +56,7 @@
\newif\ifCTEX@fntef \CTEX@fnteffalse
\DeclareOption{fntef}{\CTEX@fnteftrue}
+\newif\ifCTEX@hyperref \CTEX@hyperreffalse
+\DeclareOption{hyperref}{\CTEX@hyperreftrue}
+
\endinput
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index b13610c5712..952367e225a 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1113,13 +1113,13 @@ $standardtex='\.(cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'voss-de', 'german',
'wasy2', 'fonts',
'wsuipa', 'generic',
- 'xepersian', 'xelatex',
- 'xetexfontinfo','xetex',
- 'xltxtra', 'xelatex',
- 'xq', 'fonts',
- 'xstring', 'generic',
- 'xunicode', 'xelatex',
- 'xypic-tut-pt','portuguese',
+ 'xepersian', 'xelatex',
+ 'xetexfontinfo', 'xetex',
+ 'xltxtra', 'xelatex',
+ 'xq', 'fonts',
+ 'xstring', 'generic',
+ 'xunicode', 'xelatex',
+ 'zhspacing', 'xetex',
);
$standarddocfmt='latex';