From 7e49d11660643b3159ded5dbbfa66c4bd6b392be Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 18 Jul 2010 22:31:13 +0000 Subject: bug#132 fix from cvr git-svn-id: svn://tug.org/texlive/trunk@19518 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht | 92 ++++++++++------------- 1 file changed, 39 insertions(+), 53 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht index 55480ce7ba3..b955a7d0383 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% biblatex.4ht 2010-03-22-08:58 % +% biblatex.4ht 2010-03-31-15:16 % % Copyright (C) 2007--2010 Eitan M. Gurari % % % % This work may be distributed and/or modified under the % @@ -24,30 +24,14 @@ % tex4ht@tug.org % % http://www.tug.org/tex4ht % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2010-03-22-08:58} -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either -% version 1.3c of this license or (at your option) any -% later version. The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions -% of LaTeX version 2005/12/01 or later. -% -% This work has the LPPL maintenance status "maintained". -% -% The Current Maintainer of this work -% is the TeX4ht Project . -% -% If you modify this program, changing the -% version identification would be appreciated. +\immediate\write-1{version 2010-03-31-15:16} \ifx \blx@startbib\:UnDef \pend:def\blx@shorthands{% \pend:def\blx@bibinit{% \HAssign\shorthands:cnt=0 \NewConfigure{printfield-shorthand}{2}% - \Configure{printfield-shorthand} + \Configure{printfield-shorthand}% {\gHAdvance\shorthands:cnt by 1\relax \ifnum \shorthands:cnt=1 \a:printshorthands \else \c:printshorthands \fi @@ -66,10 +50,10 @@ \@nameuse {blx@rerun}} \pend:def\blx@bibliography{% \pend:def\blx@bibinit{% - \ConfigureList{thebibliography} - {\a:thebibliography} - {\b:thebibliography} - {\c:thebibliography} + \ConfigureList{thebibliography}% + {\a:thebibliography}% + {\b:thebibliography}% + {\c:thebibliography}% {\d:thebibliography}% \csname onthebibliography:list\endcsname }% @@ -91,8 +75,8 @@ \NewConfigure{printfield-#2}{2}% \a:printfield{printfield-#2}% \fi - \Configure{blx@unit} - {\csname a:printfield-#2\endcsname} + \Configure{blx@unit}% + {\csname a:printfield-#2\endcsname}% {\csname b:printfield-#2\endcsname}% \csname o:\string\blx@printfield:\endcsname[#1]{#2}% } @@ -108,8 +92,8 @@ \NewConfigure{bibstring-#2}{2}% \a:printfield{bibstring-#2}% \fi - \Configure{blx@unit} - {\csname a:bibstring-#2\endcsname} + \Configure{blx@unit}% + {\csname a:bibstring-#2\endcsname}% {\csname b:bibstring-#2\endcsname}% \csname o:\string\blx@bibstring:\endcsname[#1]{#2}% } @@ -119,8 +103,8 @@ \NewConfigure{bibcpstring-#2}{2}% \a:printfield{bibcpstring-#2}% \fi - \Configure{blx@unit} - {\csname a:bibcpstring-#2\endcsname} + \Configure{blx@unit}% + {\csname a:bibcpstring-#2\endcsname}% {\csname b:bibcpstring-#2\endcsname}% \csname o:\string\blx@bibcpstring:\endcsname[#1]{#2}% } @@ -130,8 +114,8 @@ \NewConfigure{biblcstring-#2}{2}% \a:printfield{biblcstring-#2}% \fi - \Configure{blx@unit} - {\csname a:biblcstring-#2\endcsname} + \Configure{blx@unit}% + {\csname a:biblcstring-#2\endcsname}% {\csname b:biblcstring-#2\endcsname}% \csname o:\string\blx@biblcstring:\endcsname[#1]{#2}% } @@ -141,13 +125,13 @@ \NewConfigure{bibucstring-#2}{2}% \a:printfield{bibucstring-#2}% \fi - \Configure{blx@unit} - {\csname a:bibucstring-#2\endcsname} + \Configure{blx@unit}% + {\csname a:bibucstring-#2\endcsname}% {\csname b:bibucstring-#2\endcsname}% \csname o:\string\blx@bibucstring:\endcsname[#1]{#2}% } \expandafter\HLet\csname\string\blx@bibucstring\endcsname\:tempc -\NewConfigure{biblatex-style}[2]{ +\NewConfigure{biblatex-style}[2]{% \def\:temp{#1}% \ifx \:temp\blx@cbxfile #2% @@ -169,8 +153,8 @@ \let\blx@csq@ifkernmark\@empty \def\blx@begunit{% \toggletrue{blx@tempa}% - \iftoggle{blx@insert} - {\iftoggle{blx@unit} + \iftoggle{blx@insert}% + {\iftoggle{blx@unit}% {\begingroup \let\blx@begunit\@empty \let\blx@endunit\@empty @@ -179,25 +163,25 @@ \global\togglefalse{blx@unit}% \togglefalse{blx@tempa}} {\blx@postpunct}% - \iftoggle{blx@block} + \iftoggle{blx@block}% {\begingroup \let\blx@begunit\@empty \let\blx@endunit\@empty \newblockpunct \endgroup \global\togglefalse{blx@block}% - \togglefalse{blx@tempa}} - {}} + \togglefalse{blx@tempa}}% + {}}% {}% \blx@postpunct \blx@resetpuncthook - \iftoggle{blx@tempa} - {} + \iftoggle{blx@tempa}% + {}% {\global\togglefalse{blx@insert}}% \csname a:blx@unit\endcsname \blx@leavevmode \blx@csq@ifkernmark - {} + {}% {\penalty\@M \hskip-\blx@unitmark\relax \hskip\blx@unitmark\relax}% @@ -222,14 +206,16 @@ \fi \NewConfigure{thebibliography}{4} -\append:def\blx@bibinit{\a:bibinit} -\NewConfigure{bibinit}{1} +\append:def\blx@bibinit{\a:bibinit}% +\NewConfigure{bibinit}{1}% + +\def\bib@field@entrykey{\thefield{entrykey}} \let\blx@anchors\@empty \protected\def\blx@anchor{% \xifinlist{X\the\c@refsection -%@ -\bib@field@entrykey}{\blx@anchors} - {} +\bib@field@entrykey}{\blx@anchors}% + {}% {\listxadd\blx@anchors{X\the\c@refsection -%@ \bib@field@entrykey}% \hyper:natanchorstart{X\the\c@refsection -%@ @@ -237,22 +223,22 @@ \hyper:natanchorend}} \protected\def\blx@bibhyperref{% \@ifnextchar[%] - {\blx@bibhyperref@i} + {\blx@bibhyperref@i}% {\blx@bibhyperref@i[\bib@field@entrykey]}}% \long\def\blx@bibhyperref@i[#1]#2{% \hyper:natlinkstart{X\the\c@refsection -%@ #1}% - #2\hyper:natlinkend} + #2\hyper:natlinkend}% \protected\long\def\blx@bibhyperlink#1#2{% \hyper:natlinkstart{X\the\c@refsection --%: #1}% - #2\hyper:natlinkend} + #2\hyper:natlinkend}% \protected\long\def\blx@bibhypertarget#1#2{% \@bsphack \hyper:natanchorstart{X\the\c@refsection --%: #1}% \@esphack - #2\hyper:natanchorend} + #2\hyper:natanchorend}% \let\blx@ifhyperref\@firstoftwo \def\hyper:natanchorstart#1{\Link{}{#1}\EndLink} \def\hyper:natanchorend{} @@ -262,9 +248,9 @@ \let\:temp\do \def\do#1{% \patchcmd#1% - {\color@begingroup} - {\color@begingroup\toggletrue{blx@footnote}} - {\togglefalse{blx@tempa}\listbreak} + {\color@begingroup}% + {\color@begingroup\toggletrue{blx@footnote}}% + {\togglefalse{blx@tempa}\listbreak}% {}}% \docsvlist{% \@footnotetext,% latex -- cgit v1.2.3