diff options
author | Karl Berry <karl@freefriends.org> | 2022-11-15 21:19:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-11-15 21:19:38 +0000 |
commit | 8d92212849ef5f8f5329de3a03eddd11778e37b4 (patch) | |
tree | b2300e6e605afd789b652c9cc631bebaa8c2d8ef /Master | |
parent | 967a83e95b9d1863160e12ad17f06800e6fc34f0 (diff) |
authblk maketitle, tex4ht r1237
git-svn-id: svn://tug.org/texlive/trunk@65024 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
6 files changed, 73 insertions, 18 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index ed15608655d..4724d8bf624 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,11 @@ +2022-11-15 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (authblk.4ht): better handling of the authblk + version of \maketitle + https://tex.stackexchange.com/a/665125/2891 + + * tex4ht-fonts-stix.tex: added support for the STIX fonts. + 2022-11-04 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (xskak.4ht), diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile index 070f244253a..75e13f7734f 100644 --- a/Master/texmf-dist/source/generic/tex4ht/Makefile +++ b/Master/texmf-dist/source/generic/tex4ht/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 1213 2022-10-06 22:08:15Z karl $ +# $Id: Makefile 1236 2022-11-15 12:28:12Z michal_h21 $ # This file is public domain. Originally written 2010, Karl Berry. # Assumes GNU make. @@ -223,6 +223,10 @@ derived += $(tex4ht_fonts_mnsymbol_derived) tex4ht_fonts_mnsymbol_derived = \ $(ht_fonts_devdir)/unicode/MnSymbol/MnSymbolA-Bold10.htf +derived += $(tex4ht_fonts_stix_derived) +tex4ht_fonts_stix_derived = \ + $(ht_fonts_devdir)/unicode/STIX/stix-mathbb.htf + # htcmd not used #derived += $(tex4ht_htcmd_derived) #tex4ht_htcmd_derived = htcmd.c @@ -445,6 +449,9 @@ $(tex4ht_fonts_opensans_derived): tex4ht-fonts-opensans.tex $(tex4ht_fonts_mnsymbol_derived): tex4ht-fonts-mnsymbol.tex $(HTTEX) $< "" +$(tex4ht_fonts_stix_derived): tex4ht-fonts-stix.tex + $(HTTEX) $< "" + # requires more memory than configured in other tex programs. $(tex4ht_fonts_4hf): tex4ht-fonts-4hf.tex dvilualatex $< diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 29bfdaf2db4..b78484d8a02 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 1235 2022-11-04 15:46:19Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1237 2022-11-15 15:09:44Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -3729,20 +3729,42 @@ because Hyperref exits before this macro is defined. %%%%%%%%%%%%%%%%%% \Section{authblk} -This is a basic fix for authblk package. -\Link[https://tex.stackexchange.com/a/309246/2891]{}{}More context.\EndLink \<authblk.4ht\><<< % authblk.4ht (|version), generated from |jobname.tex % Copyright 2017 TeX Users Group |<TeX4ht license text|> -\def\maketitle{\bgroup% - \AB@maketitle% -\egroup} - +|<authblk maketitle|> \Hinput{authblk} \endinput >>> \AddFile{8}{authblk} +This is a basic fix for authblk package. +\Link[https://tex.stackexchange.com/a/309246/2891]{}{}Original issue.\EndLink + +This is modified version of TeX4ht maketitle, with support for arguments in +@author, and it uses AB@maketitle, as o:maketitle: caused infinite loop. + +\<authblk maketitle\><<< +\let\o:maketitle:|=\maketitle +\def\maketitle{\bgroup + |<adjust minipageNum for setcounter footnote 0|>% + \ifx \EndPicture\:UnDef + \def\sec:typ{title}% + \Configure{HtmlPar}{}{}{}{}% + \Configure{newpage}{}% + \ConfigureEnv{center}{\empty}{}{\empty}{\empty} + \renewenvironment{tabular}[2][]{\begin{center}}{\end{center}} + \ConfigureEnv{tabular}{\empty}{}{}{}% + |<title for TITLE|>% + \pend:def\@title{\a:ttl}\append:def\@title{\b:ttl}% + \pend:def\@date{\a:date}\append:def\@date{\b:date}% + \pend:defI\@author{\a:author}\append:def\@author{\b:author}% + |</and for maketitle|>% + \fi + \pic:gobble\a:mktl \AB@maketitle \pic:gobble\b:mktl + \egroup \let\maketitle|=\empty} +>>> + %%%%%%%%%%%%%%%%%% \Section{geometry} diff --git a/Master/texmf-dist/tex/generic/tex4ht/authblk.4ht b/Master/texmf-dist/tex/generic/tex4ht/authblk.4ht index be44fcc072c..67ebda75458 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/authblk.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/authblk.4ht @@ -1,4 +1,4 @@ -% authblk.4ht (2017-09-09-16:15), generated from tex4ht-4ht.tex +% authblk.4ht (2022-11-15-13:15), generated from tex4ht-4ht.tex % Copyright 2017 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,11 +16,29 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2017-09-09-16:15} +\immediate\write-1{version 2022-11-15-13:15} -\def\maketitle{\bgroup% - \AB@maketitle% -\egroup} +\let\o:maketitle:\maketitle +\def\maketitle{\bgroup + \gHAdvance\:mpNum by 1 +\HAssign\minipageNum=\:mpNum \relax +% + \ifx \EndPicture\:UnDef + \def\sec:typ{title}% + \Configure{HtmlPar}{}{}{}{}% + \Configure{newpage}{}% + \ConfigureEnv{center}{\empty}{}{\empty}{\empty} + \renewenvironment{tabular}[2][]{\begin{center}}{\end{center}} + \ConfigureEnv{tabular}{\empty}{}{}{}% + % + \pend:def\@title{\a:ttl}\append:def\@title{\b:ttl}% + \pend:def\@date{\a:date}\append:def\@date{\b:date}% + \pend:defI\@author{\a:author}\append:def\@author{\b:author}% + \def\and{\a:and} +% + \fi + \pic:gobble\a:mktl \AB@maketitle \pic:gobble\b:mktl + \egroup \let\maketitle\empty} \Hinput{authblk} \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht b/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht index 64645ebc732..a54f2e5d57e 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht @@ -1,5 +1,5 @@ -% cleveref.4ht (2022-10-27-13:37), generated from tex4ht-4ht.tex -% Copyright 2018-2021 TeX Users Group +% cleveref.4ht (2022-11-04-13:31), generated from tex4ht-4ht.tex +% Copyright 2018-2022 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 2022-10-27-13:37} +\immediate\write-1{version 2022-11-04-13:31} diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index 57f70c81439..041412ed7e3 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 (2022-11-04-13:31), generated from tex4ht-4ht.tex +% usepackage.4ht (2022-11-15-13:15), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-11-04-13:31} +\immediate\write-1{version 2022-11-15-13:15} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} |