From 1912b112c3c5e6d672f5f5b7eec006ff6d89e732 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 27 Dec 2021 21:37:27 +0000 Subject: remove cleveref nested links, tex4ht r1043; biblatex spacing, tex4ht r1042 git-svn-id: svn://tug.org/texlive/trunk@61424 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht | 28 ++++++--------- Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht | 7 ++-- Master/texmf-dist/tex/generic/tex4ht/minted.4ht | 6 ++-- Master/texmf-dist/tex/generic/tex4ht/xifthen.4ht | 43 +++++++++++++++++++++++ 4 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/tex4ht/xifthen.4ht (limited to 'Master/texmf-dist/tex/generic/tex4ht') 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 . +% +% 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 + -- cgit v1.2.3