summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-14 00:45:46 +0000
committerKarl Berry <karl@freefriends.org>2009-09-14 00:45:46 +0000
commit1c467aabf1a2f6e96c1cb2ef4d54e30696dbe10d (patch)
tree71512b766afbff99cbeafad38034f3d3cd3d757e /Master/texmf-dist/tex/latex/ctex
parent70cdedb6d90925ebd4540d77a6b9efc3f0a19b9e (diff)
ctex 0.94 (13sep09)
git-svn-id: svn://tug.org/texlive/trunk@15273 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex')
-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.def29
-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-adobefonts.def2
13 files changed, 33 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
index cf6eeab5849..406d92e2f81 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/07/10 v0.93 ctexartutf8
+ [2009/09/13 v0.94 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 cbf5ffb4cda..1c2d037d2bb 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/07/10 v0.93 ctexbookutf8
+ [2009/09/13 v0.94 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 d170ef74114..a3fdabd8d8f 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/07/10 v0.93 ctexcaputf8
+ [2009/09/13 v0.94 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 1668248b377..1f2cbf5046a 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/07/10 v0.93 ctexreputf8
+ [2009/09/13 v0.94 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 ac7a5466085..6057b96e9a6 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/07/10 v0.93 ctexutf8
+ [2009/09/13 v0.94 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 f52b0114dfb..044644c2ac2 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/07/10 v0.93 ctex
+ [2009/09/13 v0.94 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 4709eabbfd7..ce70777fe94 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/07/10 v0.93 ctexart
+ [2009/09/13 v0.94 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 50e103dd09c..53b037e5ab6 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/07/10 v0.93 ctexbook
+ [2009/09/13 v0.94 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 c0390a99b3b..7ab3b831253 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/07/10 v0.93 ctexcap
+ [2009/09/13 v0.94 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 8454a60c77e..93203ed3596 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/07/10 v0.93 ctexrep
+ [2009/09/13 v0.94 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 b1222db0e74..cbb98c21269 100644
--- a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
+++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
@@ -9,6 +9,11 @@
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
+
+\ifxetex
+\CTEX@GBKfalse % XeTeX always use UTF-8 as default encoding
+\fi
+
\RequirePackage{keyval}[1999/03/16]
\ifCTEX@indent
\RequirePackage{indentfirst}
@@ -18,16 +23,24 @@
\RequirePackage{fancyhdr}
\fi
\ifCTEX@hyperref
- \ifxetex\else
- \ifpdf\else
- \AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
- \fi
- \fi
- \ifCTEX@GBK
- \RequirePackage[CJKbookmarks]{hyperref}
+ \ifxetex
+ \RequirePackage[xetex]{hyperref}
\else
- \RequirePackage[unicode]{hyperref}
+ \ifpdf % pdftex
+ \RequirePackage[pdftex]{hyperref}
+ \else % dvipdfmx
+ \ifCTEX@GBK
+ \AtBeginDvi{\special{pdf:tounicode GBK-EUC-UCS2}}
+ \fi
+ \RequirePackage[dvipdfmx]{hyperref}
+ \fi
+ \ifCTEX@GBK
+ \hypersetup{CJKbookmarks=true}
+ \else
+ \hypersetup{unicode=true}
+ \fi
\fi
+ \hypersetup{colorlinks=true}
\fi
% Useful definitions
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 2ccbf1d2dba..2d63b686a0b 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,8 +1,6 @@
% ctex-xecjk-engine.def: for XeTeX engine with xeCJK
% vim:ft=tex
-\CTEX@GBKfalse % XeTeX always use UTF-8 as default encoding
-
\RequirePackage[BoldFont,CJKnumber]{xeCJK}
\defaultfontfeatures{Mapping=tex-text}
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def
index d3af98f1225..747f5601799 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def
@@ -15,5 +15,7 @@
\newcommand*{\heiti}{\CJKfamily{hei}} % 黑体
\newcommand*{\kaishu}{\CJKfamily{kai}} % 楷书
\newcommand*{\fangsong}{\CJKfamily{fs}} % 仿宋
+\newcommand*{\lishu}{\CJKfamily{li}} % 隶书
+\newcommand*{\youyuan}{\CJKfamily{you}} % 幼圆
\endinput