From 11493eee12b5cca18d28eb05a3e7014d23ffbf2a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Dec 2021 22:04:29 +0000 Subject: \protected for \url, tex4ht r1029; ifthen before biblatex-chicago, tex4ht r1030 git-svn-id: svn://tug.org/texlive/trunk@61306 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 9 ++++ .../source/generic/tex4ht/tex4ht-4ht.tex | 18 +++++++- .../tex/generic/tex4ht/biblatex-chicago-hooks.4ht | 23 +++++++++++ Master/texmf-dist/tex/generic/tex4ht/url.4ht | 48 +++++++++------------- .../texmf-dist/tex/generic/tex4ht/usepackage.4ht | 5 ++- 5 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/tex4ht/biblatex-chicago-hooks.4ht diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 588c19d38d1..209cea5893e 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,12 @@ +2021-12-14 Michal Hoftich + + * tex4ht-4ht.tex (usepackage.4ht, biblatex-chicago-hooks.4ht): load Ifthen + package before BibLaTeX-Chicago. + https://puszcza.gnu.org.ua/bugs/?480#discussion + * tex4ht-4ht.tex (url.4ht): use \protected for redefinition of the \url + command. + https://puszcza.gnu.org.ua/bugs/?480#discussion + 2021-12-11 Michal Hoftich * tex4ht-ooffice.tex (ooffice.4ht): enclose image file names in braces, in diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 617f60e9fa7..5b9b9d8a802 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 1027 2021-12-10 23:22:54Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1030 2021-12-14 16:18:24Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2021 TeX Users Group @@ -2973,6 +2973,20 @@ US rules. \endinput >>> \AddFile{6}{biblatex-chicago} +BibLaTeX Chicago fails with errors related to Ifthen package. It seems +that we need to load it before BibLaTeX. + +\<<< +\Configure{PackageHooks}{biblatex-chicago.sty}{biblatex-chicago-hooks.4ht} +>>> + +\<<< +% biblatex-chicago-hooks.4ht (|version), generated from |jobname.tex +% Copyright 2021 TeX Users Group +| +\RequirePackage{ifthen} +\endinput +>>> \AddFile{9}{biblatex-chicago-hooks} %%%%%%%%%%%%% \SubSection{debug.bbx} @@ -4577,7 +4591,7 @@ The pdfbase package redefines \`|\@outputpage| macro, which causes tex4ht patche >>> \<<< -\def\:temp{\leavevmode \begingroup +\protected\def\:temp{\leavevmode \begingroup \def\UrlLeft##1\UrlRight{\ifmmode \else \UrlFont\fi \Url:use{##1}}% \def\Url@use##1 ##2{\ifmmode \else \UrlFont\fi \Url:use{##1}}\let\,\empty \Configure{$}{}{}{}\Url} diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex-chicago-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex-chicago-hooks.4ht new file mode 100644 index 00000000000..b0ebb3e6978 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/biblatex-chicago-hooks.4ht @@ -0,0 +1,23 @@ +% biblatex-chicago-hooks.4ht (2021-12-14-13:43), generated from tex4ht-4ht.tex +% Copyright 2021 TeX Users Group +% +% 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 2021-12-14-13:43} + +\RequirePackage{ifthen} +\endinput + diff --git a/Master/texmf-dist/tex/generic/tex4ht/url.4ht b/Master/texmf-dist/tex/generic/tex4ht/url.4ht index 47653649af6..5c707464671 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/url.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/url.4ht @@ -1,32 +1,24 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% url.4ht 2009-05-21-09:32 % -% Copyright (C) 1997--2009 Eitan M. Gurari % -% % -% 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".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} - - \def\:temp{\leavevmode \begingroup +% url.4ht 2021-12-14-13:43 % +% Copyright (C) 1997-2009 Eitan M. Gurari % +% Copyright 2009-2021 TeX Users Group +% +% 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. + \protected\def\:temp{\leavevmode \begingroup \def\UrlLeft##1\UrlRight{\ifmmode \else \UrlFont\fi \Url:use{##1}}% \def\Url@use##1 ##2{\ifmmode \else \UrlFont\fi \Url:use{##1}}\let\,\empty \Configure{$}{}{}{}\Url} diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index 4afc9fe3466..aaaec5f6fbf 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 (2021-12-02-14:01), generated from tex4ht-4ht.tex +% usepackage.4ht (2021-12-14-13:43), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2021 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-12-02-14:01} +\immediate\write-1{version 2021-12-14-13:43} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} @@ -40,6 +40,7 @@ \def\:temp##1!*?: {\input usepackage.4ht }% \else \let\:temp=\use:package \fi \fi \:temp} +\Configure{PackageHooks}{biblatex-chicago.sty}{biblatex-chicago-hooks.4ht} \Configure{PackageHooks}{cleveref.sty}{cleveref-hooks.4ht} \Configure{PackageHooks}{xr.sty}{xr-hooks.4ht} \Configure{PackageHooks}{xr-hyper.sty}{xrhyper-hooks.4ht} -- cgit v1.2.3