From 2ac9cb7859d344aac57a0ceeedb92b8418ba44ba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 21 Nov 2019 21:56:12 +0000 Subject: language detection, \cellcolor support, tex4ht r624-625 git-svn-id: svn://tug.org/texlive/trunk@52880 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht | 15 ++- Master/texmf-dist/tex/generic/tex4ht/html5.4ht | 137 +++++++++++++++++++++- 2 files changed, 146 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht b/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht index 2054fd6ba23..6a6d04f4c83 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht @@ -1,6 +1,6 @@ -% colortbl.4ht (2016-12-14-16:54), generated from tex4ht-4ht.tex +% colortbl.4ht (2019-11-21-13:35), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari -% Copyright 2009-2016 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 2016-12-14-16:54} +\immediate\write-1{version 2019-11-21-13:35} \RequirePackage{xcolor} @@ -44,6 +44,15 @@ } \def\right::colcol[#1]{} \HAssign\tblcol:N = 0 +\def\CT@cellc#1[#2]#3{{\if :#2:\def\current@color{#3}% + \else + \gHAdvance\tblcol:N by 1 + \convertcolorspec{#2}{#3}{HTML}\tmp:tblcolor + \Configure{HColor}{tblcol-\tblcol:N}{\#\tmp:tblcolor}% + \def\current@color{tblcol-\tblcol:N}% + \fi + \csname a:cell-colortbl\endcsname}% + \futurelet\:temp\left:colcol} \NewConfigure{@classz}{4} \pend:def\@classz{\pic:gobble\a:@classz} \append:def\@classz{\pic:gobble\b:@classz} diff --git a/Master/texmf-dist/tex/generic/tex4ht/html5.4ht b/Master/texmf-dist/tex/generic/tex4ht/html5.4ht index 2fccc8f0ebc..2fbffdcd7bb 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html5.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html5.4ht @@ -1,4 +1,4 @@ -% html5.4ht (2019-03-15-15:44), generated from tex4ht-html5.tex +% html5.4ht (2019-11-21-13:36), generated from tex4ht-html5.tex % Copyright 2016-2019 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,9 +16,12 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2019-03-15-15:44} +\immediate\write-1{version 2019-11-21-13:36} -\exit:ifnot{article,% +\exit:ifnot{amsart,% +amsbook,% +amsproc,% +article,% book,% latex,% report,% @@ -76,6 +79,7 @@ tex4ht} \Declare:Language{UKenglish}{en} \Declare:Language{USenglish}{en} +\Declare:Language{latex}{en} \Declare:Language{acadian}{fr} \Declare:Language{albanian}{sq} \Declare:Language{american}{en} @@ -329,6 +333,129 @@ tex4ht} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \ConfigureHinput{amsart} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \Configure{float} + {\ifOption{refcaption}{}{\csname par\endcsname\ShowPar \leavevmode}} + {\:xhtml{\IgnorePar\EndP}\HCode{
}} + {\ifvmode \IgnorePar \fi\EndP + \HCode{
}\csname par\endcsname\ShowPar} + +\ConfigureEnv{figure} +{\:xhtml{\IgnorePar\EndP}\HCode{
\Hnewline}% + \bgroup \Configure{float}{\ShowPar}{}{}% + } + {\egroup + \:xhtml{\IgnorePar\EndP}\HCode{
}\ShowPar +\par} + {}{} + +\Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}} +\Css{figure.float img {text-align:center;}} +\Css{figure.figure img {text-align:center;}} +\Css{figure.figure > p {text-align:center;}} + +\Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{
}} + {:} {\HCode{}} + {\HCode{
}\HCode{}% +} +\Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; + text-align:center;}} +\Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput\empty\empty\empty\empty\empty\empty +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \ConfigureHinput{amsbook} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \Configure{float} + {\ifOption{refcaption}{}{\csname par\endcsname\ShowPar \leavevmode}} + {\:xhtml{\IgnorePar\EndP}\HCode{
}} + {\ifvmode \IgnorePar \fi\EndP + \HCode{
}\csname par\endcsname\ShowPar} + +\ConfigureEnv{figure} +{\:xhtml{\IgnorePar\EndP}\HCode{
\Hnewline}% + \bgroup \Configure{float}{\ShowPar}{}{}% + } + {\egroup + \:xhtml{\IgnorePar\EndP}\HCode{
}\ShowPar +\par} + {}{} + +\Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}} +\Css{figure.float img {text-align:center;}} +\Css{figure.figure img {text-align:center;}} +\Css{figure.figure > p {text-align:center;}} + +\Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{
}} + {:} {\HCode{}} + {\HCode{
}\HCode{}% +} +\Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; + text-align:center;}} +\Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput\empty\empty\empty\empty\empty\empty +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \ConfigureHinput{amsproc} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \Configure{float} + {\ifOption{refcaption}{}{\csname par\endcsname\ShowPar \leavevmode}} + {\:xhtml{\IgnorePar\EndP}\HCode{
}} + {\ifvmode \IgnorePar \fi\EndP + \HCode{
}\csname par\endcsname\ShowPar} + +\ConfigureEnv{figure} +{\:xhtml{\IgnorePar\EndP}\HCode{
\Hnewline}% + \bgroup \Configure{float}{\ShowPar}{}{}% + } + {\egroup + \:xhtml{\IgnorePar\EndP}\HCode{
}\ShowPar +\par} + {}{} + +\Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}} +\Css{figure.float img {text-align:center;}} +\Css{figure.figure img {text-align:center;}} +\Css{figure.figure > p {text-align:center;}} + +\Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{
}} + {:} {\HCode{}} + {\HCode{
}\HCode{}% +} +\Css{figcaption.caption {text-indent:-2em; margin-left:3em; margin-right:1em; + text-align:center;}} +\Css{figcaption.caption span.id{font-weight: bold; white-space: nowrap; }} + + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput\empty\empty\empty\empty\empty\empty +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + + + + + @@ -570,6 +697,7 @@ tex4ht} \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{scrreprt} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -839,6 +967,9 @@ tex4ht} + + + -- cgit v1.2.3