summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-11-17 03:01:35 +0000
committerNorbert Preining <norbert@preining.info>2022-11-17 03:01:35 +0000
commit3692808268baf9f2c56b28f61c266ef0efbb0fe6 (patch)
treec4f2221ea448c419130ee989be4cd0f00a0560c5 /support
parentfa9eff5f7febdf005dca510a70e57ffe92257c2c (diff)
CTAN sync 202211170301
Diffstat (limited to 'support')
-rw-r--r--support/TeX4ht/source/ChangeLog8
-rw-r--r--support/TeX4ht/source/Makefile9
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex36
3 files changed, 45 insertions, 8 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index ed15608655..4724d8bf62 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/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/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile
index 070f244253..75e13f7734 100644
--- a/support/TeX4ht/source/Makefile
+++ b/support/TeX4ht/source/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/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 29bfdaf2db..b78484d8a0 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/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}