diff options
author | Karl Berry <karl@freefriends.org> | 2022-09-29 21:27:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-09-29 21:27:50 +0000 |
commit | bc2c0633aee58afc8334a8006d6ff996f1ee58d1 (patch) | |
tree | b9d9a792cd39861d600686ae307230bf509d12dc | |
parent | 205871bcecf6dddcec61653bb1c04b95919d673c (diff) |
biblatex+beamer fixes, tex4ht r1203
git-svn-id: svn://tug.org/texlive/trunk@64555 c570f23f-e606-0410-a88d-b1316a301751
6 files changed, 69 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index be4678d63b5..a2e8a8a04c9 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2022-09-29 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (beamer.4ht), + * tex4ht-html4.tex (html4.4ht): fixed tag mismatch for BibLaTeX + bibliographies that are spread over several slides. + 2022-09-27 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (beamer.4ht): don't redeclare \addtocontents, in diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 546222bacc9..f43a7d957c9 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1202 2022-09-27 14:51:50Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1203 2022-09-29 13:51:29Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -25958,6 +25958,34 @@ transported into the slide blocks. >>> + Beamer can break BibLaTeX's bibliography across several slides, + which can lead in tag mis-match, as the closing tags for the bibliography + are inserted as child of other element, than the opening tags. + + This redefinition uses Beamer's macros to insert tags for each individual + bib item, without container item that would cause problems. + + +\<conf beamer current\><<< +\NewConfigure{beamerbiblatex}{3} +\@ifpackageloaded{biblatex}{ + \pend:defI\beamer@biblabeltemplate{% + \ifdefined\end:itm\end:itm\fi% + \gdef\end:itm{\c:beamerbiblatex}% + \a:beamerbiblatex% + } + \append:defI\beamer@biblabeltemplate{\b:beamerbiblatex} + \AfterPreamble{% + \def\bibConfigure{% + \ConfigureList{thebibliography}% + {\PushMacro\end:itm\let\end:itm=\empty}% + {\end:itm\PopMacro\end:itm\global\let\end:itm\end:itm}{}{}% + } + } +} +{} + +>>> %%%%%%%%%%%%% \SubSection{beamerbasetoc} %%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index d55d830e027..145cb1ae28e 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html4.tex 1198 2022-09-22 15:05:34Z michal_h21 $ +% $Id: tex4ht-html4.tex 1203 2022-09-29 13:51:29Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -14319,6 +14319,12 @@ supported formats by tex4ht. div.Beispiel, div.Examples, div.example, div.examples{color:green;}} >>> +\<beamer environments\><<< +\Configure{beamerbiblatex}{\HCode{<div class="bibitem"><div class="label">}} +{\HCode{</div><div class="bibcontent">}}{\HCode{</div></div>\Hnewline}} +\Css{.bibitem{display:grid;grid-template-columns:3em 1fr;}} +>>> + \<beamer slides\><<< \:CheckOption{1} \if:Option \ConfigureEnv{slide} diff --git a/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht b/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht index fe908d87a01..3de7e729c31 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht @@ -1,4 +1,4 @@ -% beamer.4ht (2022-09-27-14:07), generated from tex4ht-4ht.tex +% beamer.4ht (2022-09-29-14:23), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-09-27-14:07} +\immediate\write-1{version 2022-09-29-14:23} \NewConfigure{titlepage}{2} \NewConfigure{title}{2} @@ -165,6 +165,24 @@ \pend:defI\emph{\a:emph}% \append:defI\emph{\b:emph}% +\NewConfigure{beamerbiblatex}{3} +\@ifpackageloaded{biblatex}{ + \pend:defI\beamer@biblabeltemplate{% + \ifdefined\end:itm\end:itm\fi% + \gdef\end:itm{\c:beamerbiblatex}% + \a:beamerbiblatex% + } + \append:defI\beamer@biblabeltemplate{\b:beamerbiblatex} + \AfterPreamble{% + \def\bibConfigure{% + \ConfigureList{thebibliography}% + {\PushMacro\end:itm\let\end:itm=\empty}% + {\end:itm\PopMacro\end:itm\global\let\end:itm\end:itm}{}{}% + } + } +} +{} + \Hinput{beamer} \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index fd34bb78fae..ec0f0ac8639 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht @@ -1,4 +1,4 @@ -% html4.4ht (2022-09-22-14:11), generated from tex4ht-html4.tex +% html4.4ht (2022-09-29-14:24), generated from tex4ht-html4.tex % Copyright 2009-2022 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-09-22-14:11} +\immediate\write-1{version 2022-09-29-14:24} \exit:ifnot{8859-6,% CJK,% @@ -35198,6 +35198,9 @@ description">}% {\def\block:Name{examples}} {} {} {} \Css{div.Example, div.examplblock, div.Beispiele, div.Beispiel, div.Examples, div.example, div.examples{color:green;}} +\Configure{beamerbiblatex}{\HCode{<div class="bibitem"><div class="label">}} +{\HCode{</div><div class="bibcontent">}}{\HCode{</div></div>\Hnewline}} +\Css{.bibitem{display:grid;grid-template-columns:3em 1fr;}} \ifx \beamer@version\:UnDef \ConfigureEnv{exampleblock} diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index de174923907..6d4479e0d43 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht @@ -1,4 +1,4 @@ -% usepackage.4ht (2022-09-27-14:07), generated from tex4ht-4ht.tex +% usepackage.4ht (2022-09-29-14:23), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-09-27-14:07} +\immediate\write-1{version 2022-09-29-14:23} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} |