memoir: \tableofcontents; titlesec: toc issues; tei: css support; tex4ht r473-475

git-svn-id: svn://tug.org/texlive/trunk@49611 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 65 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/memoir.4ht b/Master/texmf-dist/tex/generic/tex4ht/memoir.4ht
index 380c9f8be95..13f674a698f 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/memoir.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/memoir.4ht
@@ -1,6 +1,6 @@
-% memoir.4ht (2018-05-11-14:26), generated from tex4ht-4ht.tex
+% memoir.4ht (2019-01-05-15:17), generated from tex4ht-4ht.tex
 % Copyright 2003-2009 Eitan M. Gurari
-% Copyright 2009-2018 TeX Users Group
+% Copyright 2009-2019 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,6 +17,8 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
+\immediate\write-1{version 2019-01-05-15:17}
+
 \input book.4ht
 \input verse.4ht
 % Table handling:
@@ -40,6 +42,8 @@
     \global\let\f@rtoc\f@rtoc
     \global\let\f@rhdr\f@rhdr  }%
    \HtmlEnv   \Toc:Title{#1}\:chapter{#2}}
+\def\:tempc{\@ifstar\o:tableofcontents:\o:tableofcontents:}
+\HLet\tableofcontents\:tempc
 \NewConfigure{poemline}{2}
 \NewConfigure{legend}{2}
 \renewcommand\legend[1]{\a:legend #1\b:legend}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tei.4ht b/Master/texmf-dist/tex/generic/tex4ht/tei.4ht
index 09e8dab0a3b..4e5c62765e6 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tei.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tei.4ht
@@ -1,6 +1,6 @@
-% tei.4ht (2018-06-12-16:03), generated from tex4ht-tei.tex
-% Copyright 2009-2016 TeX Users Group
-% Copyright (C) 2000-2009 Eitan M. Gurari
+% tei.4ht (2019-01-05-15:17), generated from tex4ht-tei.tex
+% Copyright 2009-2019 TeX Users Group
+% Copyright 2000-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2018-06-12-16:03}
+\immediate\write-1{version 2019-01-05-15:17}
 
 \exit:ifnot{Preamble,% 
 amsart,% 
@@ -143,6 +143,47 @@ url}
 \let\:NOTATIONs=\empty
 \def\Decl#1{\edef\:NOTATIONs{\:NOTATIONs#1\Hnewline}}
 
+\ScriptCommand{\CssFile}{%
+  \immediate\write-1{--- file \aa:CssFile\space ---}%
+  \def\FontSize##1##2{\:Context{##1}\ht:special{t4ht;\%##2}\%}%
+  \def\FontName##1{\:Context{##1}\ht:special{t4ht;=}}%
+  \def\:Context##1{\ht:special{t4ht>\jobname.tmp}##1\ht:special
+     {t4ht>\aa:CssFile}}%
+  \ht:special{t4ht>\jobname.tmp}\ht:special{t4ht>\aa:CssFile}\bb:CssFile
+  \hfil\break\NoFonts}{\EndNoFonts
+  \ht:special{t4ht<\aa:CssFile}\ht:special{t4ht<\jobname.tmp}}
+\let\Css:File\let \prOteCt \relax \Protect \csname acp:c\endcsname {18}\CssFile
+\def\CssFile{\futurelet\:temp\Css:Fl}
+\def\Css:Fl{\ifx [\:temp  \expandafter\Css:fl
+   \else \expand:after{\Css:File \space}\fi}
+\def\Css:fl[#1]{\Css:File\space \css:files #1,,}
+\def\css:files#1,#2{\def\:temp{#1}\ifx \:temp\empty
+   \else \def\:temp{\in:css#1.\css:files#2,,}\fi
+   \:temp }
+\def\in:css#1.#2{\def\:temp{#2}\ifx \:temp\empty \input #1.css
+   \else \inc:ss#1.#2\fi}
+\def\inc:ss#1.{\input #1 }
+\NewConfigure{CssFile}[2]{\def\aa:CssFile{#1}\def\bb:CssFile{#2}}
+\def\Css#1{{\def\:temp{\Configure{Needs}}%
+   \expandafter\:temp\expandafter{\aa:Css}\Needs{#1}}}
+
+\expandafter\ifx \csname aa:Css\endcsname\relax
+   \Configure{Css}{Css: ##1}
+\fi
+
+\Configure{Preamble}
+   {{\ifdim \lastskip>\z@ \unskip\fi  \IgnorePar\parindent\z@
+\leavevmode}%
+\immediate\write-1{--- file \aa:CssFile\space ---}%
+\ht:special{t4ht>\aa:CssFile}\ht:special{t4ht=\Hnewline /* css.sty */}%
+\ht:special{t4ht<\aa:CssFile}%
+} {}
+\Configure{CssFile}{\jobname.css}
+  {/* \aa:CssFile\space from \jobname.tex (TeX4ht) */}
+\Configure{Needs}{l.
+   \the\inputlineno\space--- needs --- #1 ---}
+\Configure{Needs-}{l.
+   \the\inputlineno\space--- needs --- #1 ---}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -1007,7 +1048,6 @@ url}
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{graphics}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1041,6 +1081,7 @@ url}
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsart}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1238,7 +1279,6 @@ url}
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{plain}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1430,6 +1470,8 @@ url}
 
 
 
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{url}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1693,6 +1735,10 @@ url}
 
 
 
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ltugboat}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1875,5 +1921,6 @@ url}
 
 
 
+
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/titlesec.4ht b/Master/texmf-dist/tex/generic/tex4ht/titlesec.4ht
index 933d1b5b681..6d99149b2f6 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/titlesec.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/titlesec.4ht
@@ -1,6 +1,6 @@
-% titlesec.4ht (2018-09-16-14:17), generated from tex4ht-4ht.tex
+% titlesec.4ht (2019-01-05-15:17), generated from tex4ht-4ht.tex
 % Copyright 2000-2009 Eitan M. Gurari
-% Copyright 2009-2018 TeX Users Group
+% Copyright 2009-2019 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2018-09-16-14:17}
+\immediate\write-1{version 2019-01-05-15:17}
 
 \ifx \ttl@assign@ii\:Undef
    \ifx \ttl@sect\:UnDef\else
@@ -82,9 +82,10 @@
          \else \csname the\sc:tp\endcsname \fi \fi
        }{#8}%
 }
-\def\:tempc{%
+\def\:tempc#1#2#3#4{%
+  \edef\sc:tp{\ifttl@label\else like\fi #1}%
    \let\ttl@savewrite\empty
-   \o:ttl@select:
+   \o:ttl@select:{#1}{#2}{#3}{#4}
 }
 \HLet\ttl@select\:tempc
 \let\ttlh@runin\ttlh@hang