[tex4ht-commits] [SCM] tex4ht updated: r49 - trunk/lit
cvr at gnu.org.ua
cvr at gnu.org.ua
Wed Mar 31 11:56:43 CEST 2010
Author: cvr
Date: 2010-03-31 12:56:43 +0300 (Wed, 31 Mar 2010)
New Revision: 49
Modified:
trunk/lit/tex4ht-4ht.tex
Log:
\bib at field@entrykey initilized with empty value. This bug was reported by Joanna Bryson <joanna.j at gmail.com>.
Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex 2010-03-22 15:57:19 UTC (rev 48)
+++ trunk/lit/tex4ht-4ht.tex 2010-03-31 09:56:43 UTC (rev 49)
@@ -2104,9 +2104,9 @@
\let\:temp\do
\def\do#1{%
\patchcmd#1%
- {\color at begingroup}
- {\color at begingroup\toggletrue{blx at footnote}}
- {\togglefalse{blx at tempa}\listbreak}
+ {\color at begingroup}%
+ {\color at begingroup\toggletrue{blx at footnote}}%
+ {\togglefalse{blx at tempa}\listbreak}%
{}}%
\docsvlist{%
\@footnotetext,% latex
@@ -2123,7 +2123,7 @@
\pend:def\blx at 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
@@ -2141,12 +2141,15 @@
\<config biblatex\><<<
\def\nolinkurl{\o:url:}
>>>
-
+% CVR 2010/03/31
+% \bib at field@entrykey initialized with empty value
+%
\<appto blx mkhyperref\><<<
\let\blx at anchors\@empty
+\let\bib at field@entrykey\@empty
\protected\def\blx at anchor{%
- \xifinlist{|</the /c at refsection @|>\bib at field@entrykey}{\blx at anchors}
- {}
+ \xifinlist{|</the /c at refsection @|>\bib at field@entrykey}{\blx at anchors}%
+ {}%
{\listxadd\blx at anchors{|</the /c at refsection @|>\bib at field@entrykey}%
\hyper:natanchorstart{|</the /c at refsection @|>\bib at field@entrykey}%
\hyper:natanchorend}}
@@ -2155,19 +2158,19 @@
\<appto blx mkhyperref\><<<
\protected\def\blx at bibhyperref{%
\@ifnextchar[%]
- {\blx at bibhyperref@i}
+ {\blx at bibhyperref@i}%
{\blx at bibhyperref@i[\bib at field@entrykey]}}%
\long\def\blx at bibhyperref@i[#1]#2{%
\hyper:natlinkstart{|</the /c at refsection @|>#1}%
- #2\hyper:natlinkend}
+ #2\hyper:natlinkend}%
\protected\long\def\blx at bibhyperlink#1#2{%
\hyper:natlinkstart{|</the /c at refsection :|>#1}%
- #2\hyper:natlinkend}
+ #2\hyper:natlinkend}%
\protected\long\def\blx at bibhypertarget#1#2{%
\@bsphack
\hyper:natanchorstart{|</the /c at refsection :|>#1}%
\@esphack
- #2\hyper:natanchorend}
+ #2\hyper:natanchorend}%
>>>
@@ -2205,10 +2208,10 @@
\<config biblatex\><<<
\pend:def\blx at bibliography{%
\pend:def\blx at bibinit{%
- \ConfigureList{thebibliography}
- {\a:thebibliography}
- {\b:thebibliography}
- {\c:thebibliography}
+ \ConfigureList{thebibliography}%
+ {\a:thebibliography}%
+ {\b:thebibliography}%
+ {\c:thebibliography}%
{\d:thebibliography}%
\csname onthebibliography:list\endcsname
}%
@@ -2289,8 +2292,8 @@
\NewConfigure{printfield-#2}{2}%
\a:printfield{printfield-#2}%
\fi
- \Configure{blx at unit}
- {\csname a:printfield-#2\endcsname}
+ \Configure{blx at unit}%
+ {\csname a:printfield-#2\endcsname}%
{\csname b:printfield-#2\endcsname}%
\csname o:\string\blx at printfield:\endcsname[#1]{#2}%
}
@@ -2312,8 +2315,8 @@
\NewConfigure{printtext-#2}{2}%
\a:printfield{printtext-#2}%
\fi
- \Configure{blx at unit}
- {\csname a:printtext-#2\endcsname}
+ \Configure{blx at unit}%
+ {\csname a:printtext-#2\endcsname}%
{\csname b:printtext-#2\endcsname}%
\csname o:\string\blx at printtext:\endcsname[#1]{#2}%
}
@@ -2330,8 +2333,8 @@
\NewConfigure{bibstring-#2}{2}%
\a:printfield{bibstring-#2}%
\fi
- \Configure{blx at unit}
- {\csname a:bibstring-#2\endcsname}
+ \Configure{blx at unit}%
+ {\csname a:bibstring-#2\endcsname}%
{\csname b:bibstring-#2\endcsname}%
\csname o:\string\blx at bibstring:\endcsname[#1]{#2}%
}
@@ -2346,8 +2349,8 @@
\NewConfigure{bibcpstring-#2}{2}%
\a:printfield{bibcpstring-#2}%
\fi
- \Configure{blx at unit}
- {\csname a:bibcpstring-#2\endcsname}
+ \Configure{blx at unit}%
+ {\csname a:bibcpstring-#2\endcsname}%
{\csname b:bibcpstring-#2\endcsname}%
\csname o:\string\blx at bibcpstring:\endcsname[#1]{#2}%
}
@@ -2363,8 +2366,8 @@
\NewConfigure{biblcstring-#2}{2}%
\a:printfield{biblcstring-#2}%
\fi
- \Configure{blx at unit}
- {\csname a:biblcstring-#2\endcsname}
+ \Configure{blx at unit}%
+ {\csname a:biblcstring-#2\endcsname}%
{\csname b:biblcstring-#2\endcsname}%
\csname o:\string\blx at biblcstring:\endcsname[#1]{#2}%
}
@@ -2378,8 +2381,8 @@
\NewConfigure{bibucstring-#2}{2}%
\a:printfield{bibucstring-#2}%
\fi
- \Configure{blx at unit}
- {\csname a:bibucstring-#2\endcsname}
+ \Configure{blx at unit}%
+ {\csname a:bibucstring-#2\endcsname}%
{\csname b:bibucstring-#2\endcsname}%
\csname o:\string\blx at bibucstring:\endcsname[#1]{#2}%
}
@@ -2406,7 +2409,7 @@
>>>
\<config biblatex\><<<
-\NewConfigure{biblatex-style}[2]{
+\NewConfigure{biblatex-style}[2]{%
\def\:temp{#1}%
\ifx \:temp\blx at cbxfile
#2%
@@ -2423,8 +2426,8 @@
\<shared config biblatex\><<<
-\append:def\blx at bibinit{\a:bibinit}
-\NewConfigure{bibinit}{1}
+\append:def\blx at bibinit{\a:bibinit}%
+\NewConfigure{bibinit}{1}%
>>>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2453,7 +2456,7 @@
\def\finentrypunct{\strut}%
\ifnum\bbx at head<\tw@
\usebibmacro{entryhead:full}%
- \ifbool{bbx:entrykey}
+ \ifbool{bbx:entrykey}%
{\def\newblockpunct{%
\nobreak\hskip\z at skip\strut
\hfill\penalty100\hskip1em\relax
@@ -2462,7 +2465,7 @@
\parfillskip\z@\finalhyphendemerits\z@
\par\nobreak}%
\newblock
- \printfield{entrykey}}
+ \printfield{entrykey}}%
{}%
\else
\usebibmacro{entryhead:name}%
@@ -2515,8 +2518,11 @@
\Verb=\let\blx at resetpuncthook\@empty=
\Verb=\let\blx at csq@ifkernmark\@empty=
+ \Verb=\let\bib at field@entrykey\@empty=
+
%
-% Bug posted by <nicholas.cole at gmail.com>
+% Bug posted by Nicholas Cole <nicholas.cole at gmail.com>
+% Bug posted by Joanna Bryson <joanna.j at gmail.com>
%
\<config biblatex\><<<
@@ -2524,8 +2530,8 @@
\let\blx at csq@ifkernmark\@empty
\def\blx at begunit{%
\toggletrue{blx at tempa}%
- \iftoggle{blx at insert}
- {\iftoggle{blx at unit}
+ \iftoggle{blx at insert}%
+ {\iftoggle{blx at unit}%
{\begingroup
\let\blx at begunit\@empty
\let\blx at endunit\@empty
@@ -2534,25 +2540,25 @@
\global\togglefalse{blx at unit}%
\togglefalse{blx at tempa}}
{\blx at postpunct}%
- \iftoggle{blx at block}
+ \iftoggle{blx at block}%
{\begingroup
\let\blx at begunit\@empty
\let\blx at endunit\@empty
\newblockpunct
\endgroup
\global\togglefalse{blx at block}%
- \togglefalse{blx at tempa}}
- {}}
+ \togglefalse{blx at tempa}}%
+ {}}%
{}%
\blx at postpunct
\blx at resetpuncthook
- \iftoggle{blx at tempa}
- {}
+ \iftoggle{blx at tempa}%
+ {}%
{\global\togglefalse{blx at insert}}%
\csname a:blx at unit\endcsname
\blx at leavevmode
\blx at csq@ifkernmark
- {}
+ {}%
{\penalty\@M
\hskip-\blx at unitmark\relax
\hskip\blx at unitmark\relax}%
@@ -2564,30 +2570,30 @@
\<\><<<
\def\blx at begunit{%
\toggletrue{blx at tempa}%
- \iftoggle{blx at insert}
- {\iftoggle{blx at unit}
+ \iftoggle{blx at insert}%
+ {\iftoggle{blx at unit}%
{\begingroup
\let\blx at begunit\@empty
\let\blx at endunit\@empty
\blx at unitpunct
\endgroup
\global\togglefalse{blx at unit}%
- \togglefalse{blx at tempa}}
+ \togglefalse{blx at tempa}}%
{}%
- \iftoggle{blx at block}
+ \iftoggle{blx at block}%
{\begingroup
\let\blx at begunit\@empty
\let\blx at endunit\@empty
\newblockpunct
\endgroup
\global\togglefalse{blx at block}%
- \togglefalse{blx at tempa}}
- {}}
+ \togglefalse{blx at tempa}}%
+ {}}%
{}%
\blx at postpunct
\blx at resetpuncthook
- \iftoggle{blx at tempa}
- {}
+ \iftoggle{blx at tempa}%
+ {}%
{\global\togglefalse{blx at insert}}%
\csname a:blx at unit\endcsname
\blx at leavevmode
@@ -23601,6 +23607,133 @@
+% \<frenchb.4ht\><<<
+% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% % frenchb.4ht |version %
+% % Copyright (C) |CopyYear.2001. Eitan M. Gurari %
+% |<TeX4ht copyright|>
+% |<declare frenchb shorthand|>
+% |<frenchb nbsp|>
+% \Hinput{frenchb}
+% \endinput
+% >>> \AddFile{8}{frenchb}
+
+
+
+
+% \<declare frenchb shorthand\><<<
+% \def\frenchb:shorthand#1#2#3#4{%
+% \ifhmode
+% \ifdim \lastskip >\z@ \unskip \penalty \@M
+% \csname a:#1-#2\endcsname#3\csname b:#1-#2\endcsname
+% \else
+% \csname a:#1-#2\endcsname#4\csname b:#1-#2\endcsname
+% \fi \fi }
+% >>>
+
+
+
+
+% \<frenchb nbsp\><<<
+% \def\:temp{\leavevmode \nobreak \csname a:system-nbsp\endcsname\ \csname
+% b:system-nbsp\endcsname}
+% \expandafter\HLet\csname \system at group @sh@\string ~@\endcsname=\:temp
+% \expandafter \ifx \csname FDP at colonspace\endcsname\relax
+% |<pre 2001/09/09 v1.5g frenchb|>
+% \else
+% |<since 2001/09/09 v1.5g frenchb|>
+% \fi
+% \AtBeginDocument{%
+% \def\:temp{\frenchb:shorthand{frenchb}{thinspace}
+% {\thinspace }{\FDP at thinspace}\string ;}%
+% \expandafter\HLet\csname\language at group @sh@\string ;@\endcsname=\:temp
+% \def\:temp{\frenchb:shorthand{frenchb}{thinspace}
+% {\thinspace }{\FDP at thinspace}\string !}%
+% \expandafter\HLet\csname\language at group @sh@\string !@\endcsname=\:temp
+% \def\:temp{\frenchb:shorthand{frenchb}{thinspace}
+% {\thinspace }{\FDP at thinspace}\string ?}%
+% \expandafter\HLet\csname\language at group @sh@\string ?@\endcsname=\:temp
+% }
+% \NewConfigure{frenchb-nbsp}{2}
+% \NewConfigure{frenchb-thinspace}{2}
+% \NewConfigure{system-nbsp}{2}
+% >>>
+
+% \<pre 2001/09/09 v1.5g frenchb\><<<
+% \AtBeginDocument{%
+% \def\:temp{\frenchb:shorthand{frenchb}{nbsp}{\ }{\FDP at space}\string :}%
+% \expandafter\HLet\csname\language at group @sh@\string :@\endcsname=\:temp
+% }
+% >>>
+
+
+% \<since 2001/09/09 v1.5g frenchb\><<<
+% \AtBeginDocument{%
+% \def\:temp{\frenchb:shorthand{frenchb}{nbsp}{\ }{\FDP at colonspace}\string :}%
+% \expandafter\HLet\csname\language at group @sh@\string :@\endcsname=\:temp
+% }
+% >>>
+
+
+
+% \Verbatim
+% \declare at shorthand{frenchb}{:}{%
+% \ifhmode
+% \ifdim\lastskip>\z@
+% \unskip\penalty\@M\
+% \else
+% \FDP at space
+% \fi
+% \fi
+% \string:}
+% \EndVerbatim
+
+
+% \Verbatim
+% \declare at shorthand{french}{:}{%
+% \ifhmode
+% \ifdim\lastskip>\z@
+% \unskip\penalty\@M\Fcolonspace
+% \else
+% \FDP at colonspace
+% \fi
+% \fi
+% \string:}
+% \EndVerbatim
+
+
+% The following is for code such as
+
+% \Verbatim
+% \documentclass{article}
+% \usepackage[francais]{babel}
+% \begin{document}
+
+% \tableofcontents
+
+% \section{Ma premi{\`e}re section !}
+
+% \section{Culture : d{\'e}sillusions}
+
+% \section{Culture :d{\'e}sillusions}
+% \end{document}
+% \EndVerbatim
+
+
+% \<frenchb nbsp\><<<
+% \catcode`\:=13
+% \expandafter\let\csname protect\string:\endcsname=:
+% \expandafter\def\csname active\string
+% :prefix\endcsname#1{\protect#1\ifx#1:{}\fi}
+% \catcode`\:=11
+% >>>
+
+
+% \`=With the package « \usepackage[francais]{babel} », every `;' `:' ...
+% must be preceded by an unbreakable space. This works okay for the
+% input `a:' and `a :', but for `a~:' TeX4ht introduces _2_ unbreakable
+% spaces instead of one.=
+
\<frenchb.4ht\><<<
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% frenchb.4ht |version %
@@ -23632,10 +23765,10 @@
\def\:temp{\leavevmode \nobreak \csname a:system-nbsp\endcsname\ \csname
b:system-nbsp\endcsname}
\expandafter\HLet\csname \system at group @sh@\string ~@\endcsname=\:temp
-\expandafter \ifx \csname FDP at colonspace\endcsname\relax
+\expandafter \ifx \csname FDP at space\endcsname\relax
+ |<since 2001/09/09 v1.5g frenchb|>
+\else
|<pre 2001/09/09 v1.5g frenchb|>
-\else
- |<since 2001/09/09 v1.5g frenchb|>
\fi
\AtBeginDocument{%
\def\:temp{\frenchb:shorthand{frenchb}{thinspace}
@@ -23728,6 +23861,8 @@
input `a:' and `a :', but for `a~:' TeX4ht introduces _2_ unbreakable
spaces instead of one.=
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\Section{german.sty}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
More information about the tex4ht-commits
mailing list