summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-12-27 21:37:27 +0000
committerKarl Berry <karl@freefriends.org>2021-12-27 21:37:27 +0000
commit1912b112c3c5e6d672f5f5b7eec006ff6d89e732 (patch)
treebcd7c6ab991429072edfe4c15d054df00c4e94ad
parent9cdce20e7cb3a162be11edf1cb40ce012be4dd05 (diff)
remove cleveref nested links, tex4ht r1043; biblatex spacing, tex4ht r1042
git-svn-id: svn://tug.org/texlive/trunk@61424 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog60
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex3
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex78
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht28
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht7
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/minted.4ht6
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/xifthen.4ht43
7 files changed, 163 insertions, 62 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 21c5b056204..bc6a82d0221 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,22 @@
+2021-12-27 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (cleveref.4ht): remove nested links from Cleveref.
+ https://tex.stackexchange.com/a/625385/2891
+
+ * tex4ht-4ht.tex (biblatex.4ht): removed code that interfered with
+ spacing. Redefined \addnbspace to produce non-breaking space
+ character.
+ https://tex.stackexchange.com/a/628208/2891
+
+2021-12-26 Karl Berry <karl@freefriends.org>
+
+ * tex4ht-4ht.tex (minted.4ht): copyright 2021.
+
+2021-12-25 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (xifthen.4ht): fixed support for the Xifthen package.
+ https://tex.stackexchange.com/a/628068/2891
+
2021-12-20 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (biblatex.4ht): added support for back links.
@@ -7,8 +26,8 @@
2021-12-19 Michal Hoftich <michal.h21@gmail.com>
- * tex4ht-4ht.tex (minted.4ht): redefine Minted commands that cause issues
- with TeX4ht documentation.
+ * tex4ht-4ht.tex (minted.4ht): redefine Minted commands that
+ cause issues with TeX4ht documentation.
* tex4ht-4ht.tex (backref.4ht): added support for the Backref package.
https://github.com/michal-h21/tex4ebook/issues/64
@@ -22,18 +41,19 @@
2021-12-16 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-fonts-ebgaramond.tex: updated EB Garamond fonts.
- The HTF files are now in various directories depending on the font weight
- and shape!
+ The HTF files are now in various directories depending on the font
+ weight and shape!
https://github.com/michal-h21/make4ht/issues/57
- * tex4ht-4ht.tex (biblatex-chicago-hooks.4ht): reset catcodes before loading
- of Ifthen, colon remains letter otherwise, which causes various issues.
+ * tex4ht-4ht.tex (biblatex-chicago-hooks.4ht): reset catcodes
+ before loading of Ifthen, colon remains letter otherwise, which
+ causes various issues.
https://puszcza.gnu.org.ua/bugs/?480#discussion
2021-12-14 Michal Hoftich <michal.h21@gmail.com>
- * tex4ht-4ht.tex (usepackage.4ht, biblatex-chicago-hooks.4ht): load Ifthen
- package before BibLaTeX-Chicago.
+ * 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.
@@ -41,8 +61,8 @@
2021-12-11 Michal Hoftich <michal.h21@gmail.com>
- * tex4ht-ooffice.tex (ooffice.4ht): enclose image file names in braces, in
- order to support spaces in filenames.
+ * tex4ht-ooffice.tex (ooffice.4ht): enclose image file names in
+ braces, in order to support spaces in filenames.
* tex4ht-4ht.tex (ifthen.4ht, hyperref-hooks.4ht): disable Nameref from
patching of the \ifthenelse command.
@@ -50,22 +70,22 @@
2021-12-09 Michal Hoftich <michal.h21@gmail.com>
- * tex4ht-ooffice.tex (ooffice-mml.4ht): remove spurious space after inline
- math.
+ * tex4ht-ooffice.tex (ooffice-mml.4ht): remove spurious space
+ after inline math.
https://github.com/michal-h21/make4ht/issues/55
2021-12-08 Michal Hoftich <michal.h21@gmail.com>
- * tex4ht-4ht.tex (hyperref-hooks.4ht): reintroduced loading of Nameref due
- to various issues that it's removal caused.
+ * tex4ht-4ht.tex (hyperref-hooks.4ht): reintroduced loading of
+ Nameref due to various issues that it's removal caused.
2021-12-02 Michal Hoftich <michal.h21@gmail.com>
- * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): search for \par<word boundary> in
- regex that replaces \par commands, as suggested by David Carlisle.
- https://tex.stackexchange.com/q/624671/2891
- * tex4ht-4ht.tex (usepackage.4ht, graphbox-hooks.4ht): revert changes made
- by the Graphbox package to \Gin@setfile.
+ * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): search for \par<word
+ boundary> in regex that replaces \par commands, as suggested by
+ David Carlisle. https://tex.stackexchange.com/q/624671/2891
+ * tex4ht-4ht.tex (usepackage.4ht, graphbox-hooks.4ht): revert
+ changes made by the Graphbox package to \Gin@setfile.
https://github.com/michal-h21/tex4ebook/issues/84
2021-12-01 Michal Hoftich <michal.h21@gmail.com>
@@ -4713,4 +4733,4 @@ This file is public domain. Started 2010, Karl Berry.
This file is public domain. Started 2010, Karl Berry.
-# vim: textwidth=78
+# vim: textwidth=70
diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
index 82a970b8393..86616aa9f8b 100644
--- a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1034 2021-12-19 13:53:20Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1038 2021-12-25 19:26:07Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -67,6 +67,7 @@
\AddFile{9}{srcltx}
\AddFile{9}{emulateapj}
\AddFile{7}{ifthen}
+\AddFile{7}{xifthen}
\AddFile{9}{picins}
\AddFile{9}{nomencl}
\AddFile{2}{fontmath}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 9acf761cb57..95c9490645f 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 1037 2021-12-20 22:36:14Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1043 2021-12-27 18:25:26Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -2576,34 +2576,24 @@ X\the\c@refsection --%:
{}}%
{}%
\blx@postpunct
- \blx@resetpuncthook
+ \blx@imc@resetpunctfont
\iftoggle{blx@tempa}%
{}%
{\global\togglefalse{blx@insert}}%
\csname a:blx@unit\endcsname
\blx@leavevmode
- \blx@csq@ifkernmark
- {}%
- {\penalty\@M
- \hskip-\blx@unitmark\relax
- \hskip\blx@unitmark\relax
- }%
\begingroup
\Configure{blx@unit}{}{}%
}
\def\blx@endunit{%
\endgroup
- \csname b:blx@unit\endcsname
+ \csname b:blx@unit\endcsname%
\Configure{blx@unit}{}{}%
- \ifdim\lastskip=\blx@unitmark
- \unskip\unskip\unpenalty
- \global\togglefalse{blx@lastins}%
- \else
- \global\toggletrue{blx@insert}%
- \global\toggletrue{blx@lastins}%
- \fi
+ \global\toggletrue{blx@insert}%
+ \global\toggletrue{blx@lastins}%
}
\NewConfigure{blx@unit}{2}
+
%
\else
\fi
@@ -2620,6 +2610,17 @@ they caused compilation error when the AUX file is loaded.
\fi
>>>
+BibLaTeX don't use \`'\nobreakspace' command for non-breaking spaces,
+so TeX4ht outputs regular spaces in their place. This redefinition should
+fix it.
+
+\<config biblatex\><<<
+\renewrobustcmd*{\addnbspace}{%
+ \unspace\blx@postpunct%
+ % insert real non-breaking space character
+ \nobreakspace\blx@imc@resetpunctfont}
+>>>
+
\<shared config biblatex\><<<
\append:def\blx@bibinit{\a:bibinit}%
\NewConfigure{bibinit}{1}%
@@ -3596,7 +3597,8 @@ Support for links from the \Verb|\cref| command.
\def\:tempa#1#2{\bgroup%
\def\rEfLiNK##1##2{\Link{##1}{}}%
\expandafter\expandafter\expandafter\@firstoffive\csname r@#2\endcsname{}{}{}{}{}%
- \o:@@@setcref:{#1}{#2}%
+ \cref@getlabel{#2}{\@templabel}%
+ #1{\@templabel}{}{}%
\EndLink\egroup%
}%
@@ -13299,6 +13301,46 @@ ifthen.sty\EndLink
Fixed for caseses like \`'\ifthenelse{\isodd{\pageref{abc}}}'.
+\<xifthen.4ht\><<<
+% xifthen.4ht (|version), generated from |jobname.tex
+% Copyright 2021 TeX Users Group
+|<TeX4ht license text|>
+|<fix xifthen|>
+\Hinput{xifthen}
+\endinput
+>>> \AddFile{7}{xifthen}
+
+The \`'\TE@repl' command is executed by \`'\ifthenelse',
+where \`'\begingroup' is redefined to insert TeX4ht hooks.
+We need to prevent execution of this code here, so we use
+\`'\sv:begingroup', saved version of \`'\begingroup' from
+ifthen.4ht.
+\Link[https://tex.stackexchange.com/a/628068/2891]{}{}%
+More details\EndLink.
+
+\<fix xifthen\><<<
+\def \TE@repl #1#2{%
+ \long \def \@tempc ##1#1##2{%
+ \def \@tempb{\@tempc}%
+ \sv:begingroup % Thanks MPG
+ \toks@ {##2}%
+ \edef \@tempa {\the \toks@}% <- UF v1.3
+ \expandafter \endgroup
+ \ifx \@tempa \@tempb
+ \toks@ \expandafter {\the \toks@ ##1}%
+ \expandafter \@gobble
+ \else
+ \toks@ \expandafter {\the \toks@ ##1#2}%
+ \expandafter \@tempc
+ \fi
+ ##2%
+ }%
+ \toks@ \expandafter {\expandafter}%
+ \expandafter \@tempc \the \toks@ #1\@tempc
+}
+>>>
+
+
\<non classified latex\><<<
|<early latex util|>
|<more latex math|>
@@ -24569,7 +24611,7 @@ of LaTeX. The \''\:gobbleII' is for getting rid of the
\<minted.4ht\><<<
% minted.4ht (|version), generated from |jobname.tex
-% Copyright 2020 TeX Users Group
+% Copyright 2020-2021 TeX Users Group
|<TeX4ht license text|>
\NewConfigure{InlineCode}{2}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
index ee7346a4829..b78d9e00ab2 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
@@ -1,4 +1,4 @@
-% biblatex.4ht (2021-12-20-14:48), generated from tex4ht-4ht.tex
+% biblatex.4ht (2021-12-27-13:23), generated from tex4ht-4ht.tex
% Copyright 2007-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-20-14:48}
+\immediate\write-1{version 2021-12-27-13:23}
\def\make:blx:ver#1.#2#3\relax{%
%\ifdim#1pt< 3pt \xdef\blx:ver:no{2}\else\xdef\blx:ver:no{3}\fi%
@@ -413,34 +413,24 @@
{}}%
{}%
\blx@postpunct
- \blx@resetpuncthook
+ \blx@imc@resetpunctfont
\iftoggle{blx@tempa}%
{}%
{\global\togglefalse{blx@insert}}%
\csname a:blx@unit\endcsname
\blx@leavevmode
- \blx@csq@ifkernmark
- {}%
- {\penalty\@M
- \hskip-\blx@unitmark\relax
- \hskip\blx@unitmark\relax
- }%
\begingroup
\Configure{blx@unit}{}{}%
}
\def\blx@endunit{%
\endgroup
- \csname b:blx@unit\endcsname
+ \csname b:blx@unit\endcsname%
\Configure{blx@unit}{}{}%
- \ifdim\lastskip=\blx@unitmark
- \unskip\unskip\unpenalty
- \global\togglefalse{blx@lastins}%
- \else
- \global\toggletrue{blx@insert}%
- \global\toggletrue{blx@lastins}%
- \fi
+ \global\toggletrue{blx@insert}%
+ \global\toggletrue{blx@lastins}%
}
\NewConfigure{blx@unit}{2}
+
%
\else
\fi
@@ -450,6 +440,10 @@
\global\boolfalse{refcontextdefaults}%
\csxdef{blx@assignedrefcontextbib@#1@\detokenize{#2}}{\detokenize{#3}}}
\fi
+\renewrobustcmd*{\addnbspace}{%
+ \unspace\blx@postpunct%
+ % insert real non-breaking space character
+ \nobreakspace\blx@imc@resetpunctfont}
\NewConfigure{thebibliography}{4}
\append:def\blx@bibinit{\a:bibinit}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht b/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht
index e9aead433fb..60a4dd80355 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht
@@ -1,4 +1,4 @@
-% cleveref.4ht (2021-06-30-14:33), generated from tex4ht-4ht.tex
+% cleveref.4ht (2021-12-27-13:23), generated from tex4ht-4ht.tex
% Copyright 2018-2021 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-06-30-14:33}
+\immediate\write-1{version 2021-12-27-13:23}
@@ -63,7 +63,8 @@
\def\:tempa#1#2{\bgroup%
\def\rEfLiNK##1##2{\Link{##1}{}}%
\expandafter\expandafter\expandafter\@firstoffive\csname r@#2\endcsname{}{}{}{}{}%
- \o:@@@setcref:{#1}{#2}%
+ \cref@getlabel{#2}{\@templabel}%
+ #1{\@templabel}{}{}%
\EndLink\egroup%
}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/minted.4ht b/Master/texmf-dist/tex/generic/tex4ht/minted.4ht
index 1d6f709606c..e68860a1804 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/minted.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/minted.4ht
@@ -1,5 +1,5 @@
-% minted.4ht (2021-12-19-14:41), generated from tex4ht-4ht.tex
-% Copyright 2020 TeX Users Group
+% minted.4ht (2021-12-26-09:03), generated from tex4ht-4ht.tex
+% Copyright 2020-2021 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-12-19-14:41}
+\immediate\write-1{version 2021-12-26-09:03}
\NewConfigure{InlineCode}{2}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xifthen.4ht b/Master/texmf-dist/tex/generic/tex4ht/xifthen.4ht
new file mode 100644
index 00000000000..e5d0f8c174e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/xifthen.4ht
@@ -0,0 +1,43 @@
+% xifthen.4ht (2021-12-25-13:54), 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 <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2021-12-25-13:54}
+
+\def \TE@repl #1#2{%
+ \long \def \@tempc ##1#1##2{%
+ \def \@tempb{\@tempc}%
+ \sv:begingroup % Thanks MPG
+ \toks@ {##2}%
+ \edef \@tempa {\the \toks@}% <- UF v1.3
+ \expandafter \endgroup
+ \ifx \@tempa \@tempb
+ \toks@ \expandafter {\the \toks@ ##1}%
+ \expandafter \@gobble
+ \else
+ \toks@ \expandafter {\the \toks@ ##1#2}%
+ \expandafter \@tempc
+ \fi
+ ##2%
+ }%
+ \toks@ \expandafter {\expandafter}%
+ \expandafter \@tempc \the \toks@ #1\@tempc
+}
+
+\Hinput{xifthen}
+\endinput
+