summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-10-25 21:58:53 +0000
committerKarl Berry <karl@freefriends.org>2012-10-25 21:58:53 +0000
commit6988622013d0d522125099c5d34ef000c75d8263 (patch)
treed11fdf9b1f21b8612212e58be543b1956008d7ae /Master/texmf-dist
parentb69ee00f0b82f51987969ad2d74a0fc8be04d2cc (diff)
biblatex.4ht from tex4ht r96
git-svn-id: svn://tug.org/texlive/trunk@28074 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht38
1 files changed, 32 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
index fea5d51a9c7..c0e6280c64e 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 2012-09-28-15:51 %
+% biblatex.4ht 2012-10-25-14:56 %
% Copyright (C) 2007--2009 Eitan M. Gurari %
% 2009--2012 TeX Users Group %
% %
@@ -25,7 +25,7 @@
% tex4ht@tug.org %
% http://www.tug.org/tex4ht %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2012-09-28-15:51}
+\immediate\write-1{version 2012-10-25-14:56}
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -286,13 +286,39 @@
\let\abx@aux@page\@gobbletwo
\let\abx@aux@fnpage\@gobbletwo
\let\abx@aux@refsection\@gobbletwo
-\def\blx@aux@number#1#2#3#4{}
-\def\abx@aux@number#1#2#3#4{}
+%
+% <Kristian.Debrabant@cs.kuleuven.be> reported that After updating
+% biblatex and biblatex.ht to versions 2.2 respectively
+% 2012-09-28-17:49 (using MiKTeX 2.9 64 bit), tex4ht seemed no longer
+% respected the defernumbers option in biblatex.sty: When applied to
+% the attached file tex4hterror.tex.
+%
+% The problem was due to nullifying \abx@aux@number which in fact
+% should have been redefined to \blx@aux@number when defernumbers
+% option is true.
+%
+% This is done now and as per Kristian, the fix works fine now.
+%
+\protected\def\blx@aux@number#1#2#3#4{%
+ \blx@bbl@addentryfield{\detokenize{#2}}{#3}{localnumber}{#4}%
+ \ifblank{#4}%
+ {}%
+ {\csgdef{blx@labelnumber@#3}{#4}%
+ %\blx@addchecksum{#1}{#4} % this can cause a nodocument error!
+ }}
+%
+\iftoggle{blx@defernumbers}%
+ {\setkeys{blx@opt@pre}{labelnumber}%
+ \let\blx@thelabelnumber\blx@addlabelnumber
+ \let\abx@aux@number\blx@aux@number}%
+ {\let\blx@thelabelnumber\relax
+ \let\abx@aux@number\@gobblefour}
+%
\AtEndDocument{%
\def\abx@aux@page#1#2{\blx@addpagesum{#1}{#2}}%
- \def\abx@aux@fnpage#1#2{\blx@addpagesum{#1}{#2}}
+ \def\abx@aux@fnpage#1#2{\blx@addpagesum{#1}{#2}}%
}
-
+%
\def\blx@begunit{%
\toggletrue{blx@tempa}%
\iftoggle{blx@insert}%