texlive[68494] Master/texmf-dist: format toc with css, tex4ht r1378;
commits+karl at tug.org
commits+karl at tug.org
Mon Oct 9 23:23:46 CEST 2023
Revision: 68494
https://tug.org/svn/texlive?view=revision&revision=68494
Author: karl
Date: 2023-10-09 23:23:46 +0200 (Mon, 09 Oct 2023)
Log Message:
-----------
format toc with css, tex4ht r1378; fix css for starred section titles, tex4ht r1379; process some \newfontfamily keyval options, tex4ht r1380
Revision Links:
--------------
https://tug.org/svn/texlive?view=revision&revision=1378
https://tug.org/svn/texlive?view=revision&revision=1379
https://tug.org/svn/texlive?view=revision&revision=1380
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/html5.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2023-10-09 20:22:38 UTC (rev 68493)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2023-10-09 21:23:46 UTC (rev 68494)
@@ -1,3 +1,16 @@
+2023-10-09 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-4ht.tex (usepackage-fontspec.4ht): process keyval options
+ from the first optional argument in \newfontfamily.
+ https://tex.stackexchange.com/a/698071/2891
+
+ * tex4ht-html5.tex (html5.4ht): fixed CSS selector for setting size
+ of starred section titles.
+
+ * tex4ht-html4.tex (html4.4ht): removed spurious spaces from TOCs,
+ simplified their formatting using CSS.
+ https://puszcza.gnu.org.ua/bugs/?605
+
2023-10-04 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-mathml.tex (mathml.4ht): removed \mathchoice from
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2023-10-09 20:22:38 UTC (rev 68493)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2023-10-09 21:23:46 UTC (rev 68494)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1375 2023-10-02 10:40:17Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1381 2023-10-09 21:22:59Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -4603,7 +4603,7 @@
\<usepackage-fontspec.4ht\><<<
% usepackage-fontspec.4ht (|version), generated from |jobname.tex
-% Copyright 2017-2020 TeX Users Group
+% Copyright 2017-2023 TeX Users Group
|<TeX4ht license text|>
% \RequirePackage{expl3}% we need to disable them before loading
\ExplSyntaxOn
@@ -4676,6 +4676,7 @@
\DeclareDocumentCommand \newfontfamily { m O{} m O{} }
{
% \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3}
+ \keys_set_known:nn {fontspec4ht}{#2}
\keys_set_known:nn {fontspec4ht}{#4}
\seq_put_right:Nn \fontspec_ht_fontfamilies {#3}
\use:x
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex 2023-10-09 20:22:38 UTC (rev 68493)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex 2023-10-09 21:23:46 UTC (rev 68494)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1372 2023-09-22 15:05:09Z michal_h21 $
+% $Id: tex4ht-html4.tex 1378 2023-10-09 11:33:14Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -1860,20 +1860,14 @@
#1 \fi #2\HCode{</span>}\par}
\def\toclikesection#1#2#3{\par
\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}%
- \def\tocsubsection#1#2#3{\par\ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par\
- \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par\ \
- \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
- \def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
+ \def\toclikesubparagraph#1#2#3{\par\HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\else
|<chapter toc css|>%
\def\tocchapter#1#2#3{\par
@@ -1883,22 +1877,16 @@
\HCode{<span class="likechapterToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocappendix#1#2#3{\par
\HCode{<span class="appendixToc" \a:LRdir>}#1 #2\HCode{</span>}\par}
- \def\tocsection#1#2#3{\par\ \toc:num{section}{#1}{#2}\par}
- \def\toclikesection#1#2#3{\par\ \HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsection#1#2#3{\par\ \ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par
- \ \ \ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
- \def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsection#1#2#3{\par\toc:num{section}{#1}{#2}\par}
+ \def\toclikesection#1#2#3{\par\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
+ \def\toclikesubparagraph#1#2#3{\par\HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\fi
\def\toc:num#1#2#3{\def\:temp{#1#2}%
\HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty
@@ -1919,30 +1907,24 @@
.appendixToc a, .appendixToc, .addchapToc a
{line-height: 200\%; font-weight:bold;}}
\def\tocchapter#1#2#3{\par
- \HCode{<span class="chapterToc" \a:LRdir>}#1\ \ #2\HCode{</span>}\par}
+ \HCode{<span class="chapterToc" \a:LRdir>}#1\ #2\HCode{</span>}\par}
\def\toclikechapter#1#2#3{\par
\HCode{<span class="likechapterToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocaddchap#1#2#3{\par
\HCode{<span class="addchapToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocappendix#1#2#3{\par
- \HCode{<span class="appendixToc" \a:LRdir>}#1\ \ #2\HCode{</span>}\par}
- \def\tocsection#1#2#3{\par\ \toc:num{section}{#1}{#2}\par}
- \def\toclikesection#1#2#3{\par\
- \HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsection#1#2#3{\par\ \ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par
- \ \ \ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
+ \HCode{<span class="appendixToc" \a:LRdir>}#1\ #2\HCode{</span>}\par}
+ \def\tocsection#1#2#3{\par\toc:num{section}{#1}{#2}\par}
+ \def\toclikesection#1#2#3{\par\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
\def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\toc:num#1#2#3{\def\:temp{#1#2}%
\HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty
\else \def\:temp{#2}\ifx\:temp\empty\else #2\ \ \fi\fi #3\HCode{</span>}}
@@ -1966,16 +1948,16 @@
\def\toclikesubsection#1#2#3{\par\
\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\tocsubsubsection#1#2#3{\par
- \ \ \toc:num{subsubsection}{#1}{#2}\par}
+ \toc:num{subsubsection}{#1}{#2}\par}
\def\toclikesubsubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\tocparagraph#1#2#3{\par\ \ \toc:num{paragraph}{#1}{#2}\par}
\def\toclikeparagraph#1#2#3{\par\ \
\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
+ \toc:num{subparagraph}{#1}{#2}\par}
\def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\else
\Css{.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc,
.appendixToc a, .appendixToc
@@ -1992,18 +1974,18 @@
\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\tocsubsection#1#2#3{\par\ \ \toc:num{subsection}{#1}{#2}\par}
\def\toclikesubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\tocsubsubsection#1#2#3{\par
- \ \ \ \toc:num{subsubsection}{#1}{#2}\par}
+ \toc:num{subsubsection}{#1}{#2}\par}
\def\toclikesubsubsection#1#2#3{\par
- \ \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\tocparagraph#1#2#3{\par\ \ \ \toc:num{paragraph}{#1}{#2}\par}
\def\toclikeparagraph#1#2#3{\par
- \ \ \ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
+ \toc:num{subparagraph}{#1}{#2}\par}
\def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\fi
\def\toc:num#1#2#3{\def\:temp{#1#2}%
\HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty
@@ -2029,13 +2011,13 @@
{}
{\HCode{</span><br />}}
\ConfigureToc{subsection}
- {\HCode{<span class="subsectionToc" \a:LRdir>}\ \ \toc:Mark{subsection}}
+ {\HCode{<span class="subsectionToc" \a:LRdir>}\toc:Mark{subsection}}
{\End:Mark}
{}
{\HCode{</span><br />}}
\ConfigureToc{subsubsection}
{\HCode{<span
- class="subsubsectionToc" \a:LRdir>}\ \ \ \ \toc:Mark{subsubsection}}
+ class="subsubsectionToc" \a:LRdir>}\toc:Mark{subsubsection}}
{\End:Mark}
{}
{\HCode{</span><br />}}
@@ -8843,27 +8825,10 @@
\fi
|<config book-report-article|>
|<config report / article 4.0t|>
-\:CheckOption{1} \if:Option
-\else
- \:CheckOption{2} \if:Option \else
- \:CheckOption{3} \if:Option \else
- \:CheckOption{4} \if:Option \else
- \:CheckOption{5} \if:Option \else
- \:CheckOption{6} \if:Option \else
- \:CheckOption{7} \if:Option \else
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \if:Option
- \Css{.subsectionToc, .likesubsectionToc {margin-left:2em;}}
- \Css{.subsubsectionToc, .likesubsubsectionToc {margin-left:4em;}}
- \Css{.paragraphToc, .likeparagraphToc {margin-left:6em;}}
- \Css{.subparagraphToc, .likesubparagraphToc {margin-left:8em;}}
- \fi
-\fi
+\Css{.subsectionToc, .likesubsectionToc {margin-left:1em;}}
+\Css{.subsubsectionToc, .likesubsubsectionToc {margin-left:2em;}}
+\Css{.paragraphToc, .likeparagraphToc {margin-left:3em;}}
+\Css{.subparagraphToc, .likesubparagraphToc {margin-left:4em;}}
>>>
@@ -8904,6 +8869,7 @@
|<config report / article 4.0t|>
|<32,4 report,book|>
|<32,4 report|>
+|<book: css|>
>>>
\<32,4 report\><<<
@@ -8985,70 +8951,26 @@
.likechapterToc
{margin-left:0em;}}
\Css{
-.chapterToc \string~ .likesectionToc,
-.chapterToc \string~ .sectionToc,
-.likechapterToc \string~ .likesectionToc,
-.likechapterToc \string~ .sectionToc
- {margin-left:2em;}}
+.likesectionToc,
+.sectionToc
+ {margin-left:1em;}}
\Css{
-.chapterToc \string~ .likesectionToc \string~ .likesubsectionToc,
-.chapterToc \string~ .likesectionToc \string~ .subsectionToc,
-.chapterToc \string~ .sectionToc \string~ .likesubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .subsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .likesubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .subsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .likesubsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .subsectionToc
- {margin-left:4em;}}
-\Css{.chapterToc \string~ .likesectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.chapterToc \string~ .likesectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.chapterToc \string~ .likesectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.chapterToc \string~ .likesectionToc \string~ .subsectionToc \string~ .subsubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .subsectionToc \string~ .subsubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .subsectionToc \string~ .subsubsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc
-.likechapterToc \string~ .sectionToc \string~ .subsectionToc \string~ .subsubsectionToc
- {margin-left:6em;}}
-
-
-\Css{.paragraphToc, .likeparagraphToc {margin-left:8em;}}
-\Css{.subparagraphToc, .likesubparagraphToc {margin-left:10em;}}
-
-\Css{
-.likesectionToc ,
-.sectionToc
- {margin-left:0em;}}
-\Css{
-.likesectionToc \string~ .likesubsectionToc,
-.likesectionToc \string~ .subsectionToc,
-.sectionToc \string~ .likesubsectionToc,
-.sectionToc \string~ .subsectionToc
+.likesubsectionToc,
+.subsectionToc
{margin-left:2em;}}
-\Css{.likesectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.likesectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.likesectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.likesectionToc \string~ .subsectionToc \string~ .subsubsectionToc,
-.sectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.sectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.sectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.sectionToc \string~ .subsectionToc \string~ .subsubsectionToc
- {margin-left:4em;}}
\Css{
.likesubsectionToc,
.subsectionToc
- {margin-left:0em;}}
+ {margin-left:2em;}}
\Css{
-.likesubsectionToc \string~ .subsubsectionToc,
-.subsectionToc \string~ .subsubsectionToc
- {margin-left:2em;}}
+.likesubsubsectionToc,
+.subsubsectionToc
+ {margin-left:3em;}}
+
+
+\Css{.paragraphToc, .likeparagraphToc {margin-left:4em;}}
+\Css{.subparagraphToc, .likesubparagraphToc {margin-left:5em;}}
+
>>>
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex 2023-10-09 20:22:38 UTC (rev 68493)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex 2023-10-09 21:23:46 UTC (rev 68494)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html5.tex 1284 2023-01-10 21:33:09Z karl $
+% $Id: tex4ht-html5.tex 1379 2023-10-09 11:56:53Z michal_h21 $
% compile 3 times: latex tex4ht-moz
% or xhlatex tex4ht-moz "html,3,sections+"
%
@@ -93,11 +93,11 @@
max-width:none
}
}}
-\Css{.partHead, likepartHead { font-size: 2em; }}
-\Css{.chapterHead, likechapterHead { font-size: 1.7411em; }}
-\Css{.sectionHead, likesectionHead { font-size: 1.5157em; }}
-\Css{.subsectionHead, likesubsectionHead { font-size: 1.3195em; }}
-\Css{.subsubsectionHead, likesubsubsectionHead { font-size: 1.1487em; }}
+\Css{.partHead, .likepartHead { font-size: 2em; }}
+\Css{.chapterHead, .likechapterHead { font-size: 1.7411em; }}
+\Css{.sectionHead, .likesectionHead { font-size: 1.5157em; }}
+\Css{.subsectionHead, .likesubsectionHead { font-size: 1.3195em; }}
+\Css{.subsubsectionHead, .likesubsubsectionHead { font-size: 1.1487em; }}
\Css{
@media (prefers-color-scheme: dark) {
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht 2023-10-09 20:22:38 UTC (rev 68493)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht 2023-10-09 21:23:46 UTC (rev 68494)
@@ -1,4 +1,4 @@
-% html4.4ht (2023-09-22-14:06), generated from tex4ht-html4.tex
+% html4.4ht (2023-10-09-13:31), generated from tex4ht-html4.tex
% Copyright 2009-2023 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2023-09-22-14:06}
+\immediate\write-1{version 2023-10-09-13:31}
\exit:ifnot{8859-6,%
CJK,%
@@ -3437,20 +3437,14 @@
#1 \fi #2\HCode{</span>}\par}
\def\toclikesection#1#2#3{\par
\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}%
- \def\tocsubsection#1#2#3{\par\ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par\
- \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par\ \
- \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
- \def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
+ \def\toclikesubparagraph#1#2#3{\par\HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\else
\Css{.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc,
.appendixToc a, .appendixToc
@@ -3463,22 +3457,16 @@
\HCode{<span class="likechapterToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocappendix#1#2#3{\par
\HCode{<span class="appendixToc" \a:LRdir>}#1 #2\HCode{</span>}\par}
- \def\tocsection#1#2#3{\par\ \toc:num{section}{#1}{#2}\par}
- \def\toclikesection#1#2#3{\par\ \HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsection#1#2#3{\par\ \ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par
- \ \ \ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
- \def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsection#1#2#3{\par\toc:num{section}{#1}{#2}\par}
+ \def\toclikesection#1#2#3{\par\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
+ \def\toclikesubparagraph#1#2#3{\par\HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\fi
\def\toc:num#1#2#3{\def\:temp{#1#2}%
\HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty
@@ -6056,72 +6044,28 @@
.likechapterToc
{margin-left:0em;}}
\Css{
-.chapterToc \string~ .likesectionToc,
-.chapterToc \string~ .sectionToc,
-.likechapterToc \string~ .likesectionToc,
-.likechapterToc \string~ .sectionToc
- {margin-left:2em;}}
-\Css{
-.chapterToc \string~ .likesectionToc \string~ .likesubsectionToc,
-.chapterToc \string~ .likesectionToc \string~ .subsectionToc,
-.chapterToc \string~ .sectionToc \string~ .likesubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .subsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .likesubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .subsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .likesubsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .subsectionToc
- {margin-left:4em;}}
-\Css{.chapterToc \string~ .likesectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.chapterToc \string~ .likesectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.chapterToc \string~ .likesectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.chapterToc \string~ .likesectionToc \string~ .subsectionToc \string~ .subsubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.chapterToc \string~ .sectionToc \string~ .subsectionToc \string~ .subsubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.likechapterToc \string~ .likesectionToc \string~ .subsectionToc \string~ .subsubsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.likechapterToc \string~ .sectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc
-.likechapterToc \string~ .sectionToc \string~ .subsectionToc \string~ .subsubsectionToc
- {margin-left:6em;}}
-
-
-\Css{.paragraphToc, .likeparagraphToc {margin-left:8em;}}
-\Css{.subparagraphToc, .likesubparagraphToc {margin-left:10em;}}
-
-\Css{
-.likesectionToc ,
+.likesectionToc,
.sectionToc
- {margin-left:0em;}}
+ {margin-left:1em;}}
\Css{
-.likesectionToc \string~ .likesubsectionToc,
-.likesectionToc \string~ .subsectionToc,
-.sectionToc \string~ .likesubsectionToc,
-.sectionToc \string~ .subsectionToc
+.likesubsectionToc,
+.subsectionToc
{margin-left:2em;}}
-\Css{.likesectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.likesectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.likesectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.likesectionToc \string~ .subsectionToc \string~ .subsubsectionToc,
-.sectionToc \string~ .likesubsectionToc \string~ .likesubsubsectionToc,
-.sectionToc \string~ .likesubsectionToc \string~ .subsubsectionToc,
-.sectionToc \string~ .subsectionToc \string~ .likesubsubsectionToc,
-.sectionToc \string~ .subsectionToc \string~ .subsubsectionToc
- {margin-left:4em;}}
\Css{
.likesubsectionToc,
.subsectionToc
- {margin-left:0em;}}
+ {margin-left:2em;}}
\Css{
-.likesubsectionToc \string~ .subsubsectionToc,
-.subsectionToc \string~ .subsubsectionToc
- {margin-left:2em;}}
+.likesubsubsectionToc,
+.subsubsectionToc
+ {margin-left:3em;}}
+\Css{.paragraphToc, .likeparagraphToc {margin-left:4em;}}
+\Css{.subparagraphToc, .likesubparagraphToc {margin-left:5em;}}
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput\empty\empty\empty\empty\empty\empty
@@ -6143,20 +6087,14 @@
#1 \fi #2\HCode{</span>}\par}
\def\toclikesection#1#2#3{\par
\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}%
- \def\tocsubsection#1#2#3{\par\ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par\
- \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par\ \
- \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
- \def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
+ \def\toclikesubparagraph#1#2#3{\par\HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\else
\Css{.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc,
.appendixToc a, .appendixToc
@@ -6169,22 +6107,16 @@
\HCode{<span class="likechapterToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocappendix#1#2#3{\par
\HCode{<span class="appendixToc" \a:LRdir>}#1 #2\HCode{</span>}\par}
- \def\tocsection#1#2#3{\par\ \toc:num{section}{#1}{#2}\par}
- \def\toclikesection#1#2#3{\par\ \HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsection#1#2#3{\par\ \ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par
- \ \ \ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
- \def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsection#1#2#3{\par\toc:num{section}{#1}{#2}\par}
+ \def\toclikesection#1#2#3{\par\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
+ \def\toclikesubparagraph#1#2#3{\par\HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\fi
\def\toc:num#1#2#3{\def\:temp{#1#2}%
\HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty
@@ -8757,7 +8689,33 @@
{\IgnorePar\EndP\HCode{<h2 class="likechapterHead"\a:LRdir>}}
{\HCode{</h2>}\IgnoreIndent\par}
+\Css{
+.chapterToc,
+.likechapterToc
+ {margin-left:0em;}}
+\Css{
+.likesectionToc,
+.sectionToc
+ {margin-left:1em;}}
+\Css{
+.likesubsectionToc,
+.subsectionToc
+ {margin-left:2em;}}
+\Css{
+.likesubsectionToc,
+.subsectionToc
+ {margin-left:2em;}}
+\Css{
+.likesubsubsectionToc,
+.subsubsectionToc
+ {margin-left:3em;}}
+
+\Css{.paragraphToc, .likeparagraphToc {margin-left:4em;}}
+\Css{.subparagraphToc, .likesubparagraphToc {margin-left:5em;}}
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput\empty\empty\empty\empty\empty\empty
@@ -8781,20 +8739,14 @@
#1 \fi #2\HCode{</span>}\par}
\def\toclikesection#1#2#3{\par
\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}%
- \def\tocsubsection#1#2#3{\par\ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par\
- \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par\ \
- \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
- \def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
+ \def\toclikesubparagraph#1#2#3{\par\HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\else
\Css{.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc,
.appendixToc a, .appendixToc
@@ -8807,22 +8759,16 @@
\HCode{<span class="likechapterToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocappendix#1#2#3{\par
\HCode{<span class="appendixToc" \a:LRdir>}#1 #2\HCode{</span>}\par}
- \def\tocsection#1#2#3{\par\ \toc:num{section}{#1}{#2}\par}
- \def\toclikesection#1#2#3{\par\ \HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsection#1#2#3{\par\ \ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par
- \ \ \ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
- \def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsection#1#2#3{\par\toc:num{section}{#1}{#2}\par}
+ \def\toclikesection#1#2#3{\par\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
+ \def\toclikesubparagraph#1#2#3{\par\HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\fi
\def\toc:num#1#2#3{\def\:temp{#1#2}%
\HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty
@@ -11352,27 +11298,10 @@
\Css{.abstracttitle{text-align:center;margin-bottom:1em;}}
-\:CheckOption{1} \if:Option
-\else
- \:CheckOption{2} \if:Option \else
- \:CheckOption{3} \if:Option \else
- \:CheckOption{4} \if:Option \else
- \:CheckOption{5} \if:Option \else
- \:CheckOption{6} \if:Option \else
- \:CheckOption{7} \if:Option \else
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \if:Option
- \Css{.subsectionToc, .likesubsectionToc {margin-left:2em;}}
- \Css{.subsubsectionToc, .likesubsubsectionToc {margin-left:4em;}}
- \Css{.paragraphToc, .likeparagraphToc {margin-left:6em;}}
- \Css{.subparagraphToc, .likesubparagraphToc {margin-left:8em;}}
- \fi
-\fi
+\Css{.subsectionToc, .likesubsectionToc {margin-left:1em;}}
+\Css{.subsubsectionToc, .likesubsubsectionToc {margin-left:2em;}}
+\Css{.paragraphToc, .likeparagraphToc {margin-left:3em;}}
+\Css{.subparagraphToc, .likesubparagraphToc {margin-left:4em;}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12098,13 +12027,13 @@
{}
{\HCode{</span><br />}}
\ConfigureToc{subsection}
- {\HCode{<span class="subsectionToc" \a:LRdir>}\ \ \toc:Mark{subsection}}
+ {\HCode{<span class="subsectionToc" \a:LRdir>}\toc:Mark{subsection}}
{\End:Mark}
{}
{\HCode{</span><br />}}
\ConfigureToc{subsubsection}
{\HCode{<span
- class="subsubsectionToc" \a:LRdir>}\ \ \ \ \toc:Mark{subsubsection}}
+ class="subsubsectionToc" \a:LRdir>}\toc:Mark{subsubsection}}
{\End:Mark}
{}
{\HCode{</span><br />}}
@@ -14684,13 +14613,13 @@
{}
{\HCode{</span><br />}}
\ConfigureToc{subsection}
- {\HCode{<span class="subsectionToc" \a:LRdir>}\ \ \toc:Mark{subsection}}
+ {\HCode{<span class="subsectionToc" \a:LRdir>}\toc:Mark{subsection}}
{\End:Mark}
{}
{\HCode{</span><br />}}
\ConfigureToc{subsubsection}
{\HCode{<span
- class="subsubsectionToc" \a:LRdir>}\ \ \ \ \toc:Mark{subsubsection}}
+ class="subsubsectionToc" \a:LRdir>}\toc:Mark{subsubsection}}
{\End:Mark}
{}
{\HCode{</span><br />}}
@@ -17318,13 +17247,13 @@
{}
{\HCode{</span><br />}}
\ConfigureToc{subsection}
- {\HCode{<span class="subsectionToc" \a:LRdir>}\ \ \toc:Mark{subsection}}
+ {\HCode{<span class="subsectionToc" \a:LRdir>}\toc:Mark{subsection}}
{\End:Mark}
{}
{\HCode{</span><br />}}
\ConfigureToc{subsubsection}
{\HCode{<span
- class="subsubsectionToc" \a:LRdir>}\ \ \ \ \toc:Mark{subsubsection}}
+ class="subsubsectionToc" \a:LRdir>}\toc:Mark{subsubsection}}
{\End:Mark}
{}
{\HCode{</span><br />}}
@@ -32692,30 +32621,24 @@
.appendixToc a, .appendixToc, .addchapToc a
{line-height: 200\%; font-weight:bold;}}
\def\tocchapter#1#2#3{\par
- \HCode{<span class="chapterToc" \a:LRdir>}#1\ \ #2\HCode{</span>}\par}
+ \HCode{<span class="chapterToc" \a:LRdir>}#1\ #2\HCode{</span>}\par}
\def\toclikechapter#1#2#3{\par
\HCode{<span class="likechapterToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocaddchap#1#2#3{\par
\HCode{<span class="addchapToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocappendix#1#2#3{\par
- \HCode{<span class="appendixToc" \a:LRdir>}#1\ \ #2\HCode{</span>}\par}
- \def\tocsection#1#2#3{\par\ \toc:num{section}{#1}{#2}\par}
- \def\toclikesection#1#2#3{\par\
- \HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsection#1#2#3{\par\ \ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par
- \ \ \ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
+ \HCode{<span class="appendixToc" \a:LRdir>}#1\ #2\HCode{</span>}\par}
+ \def\tocsection#1#2#3{\par\toc:num{section}{#1}{#2}\par}
+ \def\toclikesection#1#2#3{\par\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
\def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\toc:num#1#2#3{\def\:temp{#1#2}%
\HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty
\else \def\:temp{#2}\ifx\:temp\empty\else #2\ \ \fi\fi #3\HCode{</span>}}
@@ -34019,30 +33942,24 @@
.appendixToc a, .appendixToc, .addchapToc a
{line-height: 200\%; font-weight:bold;}}
\def\tocchapter#1#2#3{\par
- \HCode{<span class="chapterToc" \a:LRdir>}#1\ \ #2\HCode{</span>}\par}
+ \HCode{<span class="chapterToc" \a:LRdir>}#1\ #2\HCode{</span>}\par}
\def\toclikechapter#1#2#3{\par
\HCode{<span class="likechapterToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocaddchap#1#2#3{\par
\HCode{<span class="addchapToc" \a:LRdir>}#2\HCode{</span>}\par}%
\def\tocappendix#1#2#3{\par
- \HCode{<span class="appendixToc" \a:LRdir>}#1\ \ #2\HCode{</span>}\par}
- \def\tocsection#1#2#3{\par\ \toc:num{section}{#1}{#2}\par}
- \def\toclikesection#1#2#3{\par\
- \HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsection#1#2#3{\par\ \ \toc:num{subsection}{#1}{#2}\par}
- \def\toclikesubsection#1#2#3{\par
- \ \ \HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubsubsection#1#2#3{\par
- \ \ \ \toc:num{subsubsection}{#1}{#2}\par}
- \def\toclikesubsubsection#1#2#3{\par
- \ \ \ \HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocparagraph#1#2#3{\par\ \ \ \toc:num{paragraph}{#1}{#2}\par}
- \def\toclikeparagraph#1#2#3{\par
- \ \ \ \HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
- \def\tocsubparagraph#1#2#3{\par
- \ \ \ \ \ \toc:num{subparagraph}{#1}{#2}\par}
+ \HCode{<span class="appendixToc" \a:LRdir>}#1\ #2\HCode{</span>}\par}
+ \def\tocsection#1#2#3{\par\toc:num{section}{#1}{#2}\par}
+ \def\toclikesection#1#2#3{\par\HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsection#1#2#3{\par\toc:num{subsection}{#1}{#2}\par}
+ \def\toclikesubsection#1#2#3{\par\HCode{<span class="likesubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubsubsection#1#2#3{\par\toc:num{subsubsection}{#1}{#2}\par}
+ \def\toclikesubsubsection#1#2#3{\par\HCode{<span class="likesubsubsectionToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocparagraph#1#2#3{\par\toc:num{paragraph}{#1}{#2}\par}
+ \def\toclikeparagraph#1#2#3{\par\HCode{<span class="likeparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \def\tocsubparagraph#1#2#3{\par\toc:num{subparagraph}{#1}{#2}\par}
\def\toclikesubparagraph#1#2#3{\par
- \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
+ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
\def\toc:num#1#2#3{\def\:temp{#1#2}%
\HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty
\else \def\:temp{#2}\ifx\:temp\empty\else #2\ \ \fi\fi #3\HCode{</span>}}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html5.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html5.4ht 2023-10-09 20:22:38 UTC (rev 68493)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html5.4ht 2023-10-09 21:23:46 UTC (rev 68494)
@@ -1,4 +1,4 @@
-% html5.4ht (2023-01-10-13:34), generated from tex4ht-html5.tex
+% html5.4ht (2023-10-09-13:31), generated from tex4ht-html5.tex
% Copyright 2016-2023 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 2023-01-10-13:34}
+\immediate\write-1{version 2023-10-09-13:31}
\exit:ifnot{amsart,%
amsbook,%
@@ -85,11 +85,11 @@
max-width:none
}
}}
-\Css{.partHead, likepartHead { font-size: 2em; }}
-\Css{.chapterHead, likechapterHead { font-size: 1.7411em; }}
-\Css{.sectionHead, likesectionHead { font-size: 1.5157em; }}
-\Css{.subsectionHead, likesubsectionHead { font-size: 1.3195em; }}
-\Css{.subsubsectionHead, likesubsubsectionHead { font-size: 1.1487em; }}
+\Css{.partHead, .likepartHead { font-size: 2em; }}
+\Css{.chapterHead, .likechapterHead { font-size: 1.7411em; }}
+\Css{.sectionHead, .likesectionHead { font-size: 1.5157em; }}
+\Css{.subsectionHead, .likesubsectionHead { font-size: 1.3195em; }}
+\Css{.subsubsectionHead, .likesubsubsectionHead { font-size: 1.1487em; }}
\Css{
@media (prefers-color-scheme: dark) {
@@ -399,7 +399,6 @@
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsart}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -652,6 +651,8 @@
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{memoir}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -779,8 +780,6 @@
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{scrbook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -972,6 +971,17 @@
+
+
+
+
+
+
+
+
+
+
+
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht 2023-10-09 20:22:38 UTC (rev 68493)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht 2023-10-09 21:23:46 UTC (rev 68494)
@@ -1,5 +1,5 @@
-% usepackage-fontspec.4ht (2020-09-02-14:24), generated from tex4ht-4ht.tex
-% Copyright 2017-2020 TeX Users Group
+% usepackage-fontspec.4ht (2023-10-09-14:23), generated from tex4ht-4ht.tex
+% Copyright 2017-2023 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 2020-09-02-14:24}
+\immediate\write-1{version 2023-10-09-14:23}
% \RequirePackage{expl3}% we need to disable them before loading
\ExplSyntaxOn
@@ -89,6 +89,7 @@
\DeclareDocumentCommand \newfontfamily { m O{} m O{} }
{
% \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3}
+ \keys_set_known:nn {fontspec4ht}{#2}
\keys_set_known:nn {fontspec4ht}{#4}
\seq_put_right:Nn \fontspec_ht_fontfamilies {#3}
\use:x
More information about the tex-live-commits
mailing list.