diff options
author | Karl Berry <karl@freefriends.org> | 2010-01-25 00:19:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-01-25 00:19:02 +0000 |
commit | 9d848556090ce2a72e2680ef9885fc3318d57bb6 (patch) | |
tree | 2c04500b4fc5837fddbe9ef7c12b40a484c9804c /Master/texmf-dist/tex/latex/ctex/def | |
parent | 6dcb7fa5b9322b4f6b929596985e9b73a8eeffdb (diff) |
ctex 0.97 (22jan10)
git-svn-id: svn://tug.org/texlive/trunk@16809 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/def')
-rw-r--r-- | Master/texmf-dist/tex/latex/ctex/def/ctex-common.def | 47 |
1 files changed, 25 insertions, 22 deletions
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 cbb98c21269..9d230ed038d 100644 --- a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def +++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def @@ -11,7 +11,7 @@ \RequirePackage{ifxetex} \ifxetex -\CTEX@GBKfalse % XeTeX always use UTF-8 as default encoding + \CTEX@GBKfalse % XeTeX always use UTF-8 as default encoding \fi \RequirePackage{keyval}[1999/03/16] @@ -22,26 +22,6 @@ \ifCTEX@fancyhdr \RequirePackage{fancyhdr} \fi -\ifCTEX@hyperref - \ifxetex - \RequirePackage[xetex]{hyperref} - \else - \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 @@ -384,7 +364,7 @@ \ifCTEX@caption \let\CTEX@save@refstepcounter\refstepcounter - \def\refstepcounter#1{\stepcounter{#1}% + \def\refstepcounter#1{\CTEX@save@refstepcounter{#1}% \protected@edef\@currentlabel {\csname p@#1\endcsname% \@ifundefined{CTEX@the#1}% @@ -407,5 +387,28 @@ Available today format are "old", "small", and "big".}} {\renewcommand*\today{\csname CTEX@today#1\endcsname}}} +% Put hyperref as bottom as possible, otherwise there may be page +% count issues +\ifCTEX@hyperref + \ifxetex + \RequirePackage{hyperref} + \else + \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 + \endinput |