From 3b0d4121fbdaa8b4dc48c1aeab08bd63d71d0307 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Dec 2006 01:23:33 +0000 Subject: tex4ht-1.0.2006_12_04_1651 git-svn-id: svn://tug.org/texlive/trunk@2598 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht | 26 ++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht b/Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht index 797b15589ae..66c594fa5c0 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% hyperref.4ht 2005-10-23-04:19 % -% Copyright (C) 1999--2005 Eitan M. Gurari % +% hyperref.4ht 2006-12-01-16:02 % +% Copyright (C) 1999--2006 Eitan M. Gurari % % % % This work may be distributed and/or modified under the % % conditions of the LaTeX Project Public License, either % @@ -24,7 +24,7 @@ % gurari@cse.ohio-state.edu % % http://www.cse.ohio-state.edu/~gurari % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2005-10-23-04:19} +\immediate\write-1{version 2006-12-01-16:02} \csname end:hyperref\endcsname \expandafter\ifx \csname ifHy@texht\endcsname\relax @@ -116,11 +116,15 @@ \def\hyperlink#1#2{\Link{#1}{}#2\EndLink} \def\hypertarget#1#2{\Link{}{#1}#2\EndLink} \ifx \hyperpage\:UnDef \let\hyperpage=\empty \fi -\pend:defII\setkeys{% - \expandafter\ifx \csname ##1:keys\endcsname\relax - \expandafter\def\csname ##1:keys\endcsname{##2}% - \else \expandafter\append:def\csname ##1:keys\endcsname{##2}% - \fi } +\def\:temp#12->#2//{\def\:temp{#2}} +\expandafter\:temp\meaning\setkeys2->// +\ifx\:temp\empty \else + \pend:defII\setkeys{% + \expandafter\ifx \csname ##1:keys\endcsname\relax + \expandafter\def\csname ##1:keys\endcsname{##2}% + \else \expandafter\append:def\csname ##1:keys\endcsname{##2}% + \fi } +\fi \def\:choices#1,#2//#3#4{% \def\AttributeVal{#1}#3\AttributeVal#4% \def\:temp{#2}\ifx \:temp\empty \else @@ -179,13 +183,14 @@ \endgroup } \AtBeginDocument{% % \pend:defI\hyper@normalise{\let\hyper:normalise\def}% + \expandafter\pend:def\csname hyperref + \endcsname{\let\hyper:normalise\def}% \expandafter\pend:def\csname href \endcsname{\let\hyper:normalise\def}% \pend:defI\T@ref{\edef\RefArg{##1}}} \def\label@hyperref[#1]#2{{% \def\hyperrefLabel{#2}% \Configure{ref} {\Link}{\EndLink}{\Configure{ref}{}{}{}#2}\ref{#1}}} -\def\@@hyperref#1#2#3{\Link[#2]{}{}#1\EndLink} \expandafter\ifx \csname sectionautorefname\endcsname\relax \let\:temp=\def \def\def#1{\expandafter @@ -332,7 +337,7 @@ \csname c:ChoiceMenu::\:textarea\endcsname } \def\hyper@linkstart#1#2{% - \Hy@colorlink{\csname @#1color\endcsname}% + \expandafter\Hy@colorlink\expandafter{\csname @#1color\endcsname}% \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \Link[#2]{}{}% @@ -356,6 +361,7 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } +\def\hyper@anchor#1{\hyper@anchorstart{#1}\hyper@anchorend} \expandafter\ifx\csname ifHy@hyperindex\endcsname\relax \else \Hy@hyperindexfalse -- cgit v1.2.3