summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-12-14 22:04:29 +0000
committerKarl Berry <karl@freefriends.org>2021-12-14 22:04:29 +0000
commit11493eee12b5cca18d28eb05a3e7014d23ffbf2a (patch)
tree1a9e453b8ac318403e43f25c6a79e20e27dac3b1 /Master/texmf-dist/source/generic
parentf3225f6aa8e96dbf7e421f651b9d3681f295ad7c (diff)
\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
Diffstat (limited to 'Master/texmf-dist/source/generic')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog9
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex18
2 files changed, 25 insertions, 2 deletions
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 <michal.h21@gmail.com>
+
+ * 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 <michal.h21@gmail.com>
* 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.
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{biblatex-chicago.sty}{biblatex-chicago-hooks.4ht}
+>>>
+
+\<biblatex-chicago-hooks.4ht\><<<
+% biblatex-chicago-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2021 TeX Users Group
+|<TeX4ht license text|>
+\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
>>>
\<fix url\><<<
-\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}