diff options
author | Karl Berry <karl@freefriends.org> | 2021-12-27 21:37:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-12-27 21:37:27 +0000 |
commit | 1912b112c3c5e6d672f5f5b7eec006ff6d89e732 (patch) | |
tree | bcd7c6ab991429072edfe4c15d054df00c4e94ad /Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | |
parent | 9cdce20e7cb3a162be11edf1cb40ce012be4dd05 (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
Diffstat (limited to 'Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex')
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 78 |
1 files changed, 60 insertions, 18 deletions
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} |