texlive[65024] Master/texmf-dist: authblk maketitle, tex4ht r1237
commits+karl at tug.org
commits+karl at tug.org
Tue Nov 15 22:19:39 CET 2022
Revision: 65024
http://tug.org/svn/texlive?view=revision&revision=65024
Author: karl
Date: 2022-11-15 22:19:38 +0100 (Tue, 15 Nov 2022)
Log Message:
-----------
authblk maketitle, tex4ht r1237
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=1237
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/Makefile
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/authblk.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2022-11-15 20:52:32 UTC (rev 65023)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2022-11-15 21:19:38 UTC (rev 65024)
@@ -1,3 +1,11 @@
+2022-11-15 Michal Hoftich <michal.h21 at 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 at gmail.com>
* tex4ht-4ht.tex (xskak.4ht),
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/Makefile 2022-11-15 20:52:32 UTC (rev 65023)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/Makefile 2022-11-15 21:19:38 UTC (rev 65024)
@@ -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 @@
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_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 $<
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2022-11-15 20:52:32 UTC (rev 65023)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2022-11-15 21:19:38 UTC (rev 65024)
@@ -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 @@
%%%%%%%%%%%%%%%%%%
\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 at 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
+ at author, and it uses AB at 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 at maketitle \pic:gobble\b:mktl
+ \egroup \let\maketitle|=\empty}
+>>>
+
%%%%%%%%%%%%%%%%%%
\Section{geometry}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/authblk.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/authblk.4ht 2022-11-15 20:52:32 UTC (rev 65023)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/authblk.4ht 2022-11-15 21:19:38 UTC (rev 65024)
@@ -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 at 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 at maketitle \pic:gobble\b:mktl
+ \egroup \let\maketitle\empty}
\Hinput{authblk}
\endinput
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht 2022-11-15 20:52:32 UTC (rev 65023)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/cleveref.4ht 2022-11-15 21:19:38 UTC (rev 65024)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht 2022-11-15 20:52:32 UTC (rev 65023)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht 2022-11-15 21:19:38 UTC (rev 65024)
@@ -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?}
More information about the tex-live-commits
mailing list.