From fe00ade4944c8a116cc209aa570bb0e7105f541a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 Dec 2019 23:27:47 +0000 Subject: amsmath [] config; default to space between paragraphs; margins for div and pre; \tag cmd; tex4ht r635-639 git-svn-id: svn://tug.org/texlive/trunk@53149 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht | 9 +++++---- Master/texmf-dist/tex/generic/tex4ht/html4-math.4ht | 19 +++++++++++++------ Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 21 ++++++++++++--------- Master/texmf-dist/tex/generic/tex4ht/mathml.4ht | 7 ++++--- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht index 6cf2054993d..c7005edd05b 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht @@ -1,4 +1,4 @@ -% amsmath.4ht (2019-01-24-14:21), generated from tex4ht-4ht.tex +% amsmath.4ht (2019-12-16-15:21), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2019 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2019-01-24-14:21} +\immediate\write-1{version 2019-12-16-15:21} \HRestore\cases \HRestore\matrix @@ -145,7 +145,8 @@ \ifx\df@tag\@empty \expand:after{\o:endequation:\egroup}% \else \global\let\df:tag=\df@tag - \expand:after{\o:endequation: \expandafter\b:equation\df:tag + \expand:after{\o:endequation: \expandafter\b:equation\ifdefined\ams:delete:tag\else\df:tag\fi% + \global\let\ams:delete:tag\@undefined }\fi }\fi \c:equation\egroup @@ -505,7 +506,7 @@ \else \let\EndPicture\empty \fi \let\halign\TeXhalign} \def\make@df@tag@@#1{% - \gdef\df@tag{\maketag@@@{#1}\def\@currentlabel{#1}% + \gdef\df@tag{\maketag@@@{#1}\def\@currentlabel{#1}\gdef\ams:delete:tag{}% \let\cnt:currentlabel\@currentlabel \def\:@currentlabel{\ifx \cnt:currentlabel\@currentlabel \expandafter\the\csname c@equation\endcsname\else \@currentlabel\fi}% diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4-math.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4-math.4ht index 20a343ab296..eb5d8560ccb 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4-math.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4-math.4ht @@ -1,4 +1,4 @@ -% html4-math.4ht (2019-09-23-14:26), generated from tex4ht-html4.tex +% html4-math.4ht (2019-12-16-15:21), generated from tex4ht-html4.tex % Copyright 2009-2019 TeX Users Group % Copyright 1999-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2019-09-23-14:26} +\immediate\write-1{version 2019-12-16-15:21} \exit:ifnot{accents,% amsfonts,% @@ -473,7 +473,6 @@ MathJax.Hub.Config({ - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -491,6 +490,9 @@ MathJax.Hub.Config({ \Configure{iiiint} {\pic:sym{iiint}} \Configure{idotsint} {\pic:sym{tsint}} \Configure{doteq} {\pic:sym{tsint}} +\ifOption{mathjax}{}{% +\Configure{[]}{\begin{equation*}}{\end{equation*}} +}% \Configure{equation} {\ifmmode\else\par \IgnorePar\fi \EndP \HCode{}\IgnorePar @@ -991,7 +993,6 @@ MathJax.Hub.Config({ - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1056,6 +1057,8 @@ MathJax.Hub.Config({ + + @@ -1103,6 +1106,7 @@ MathJax.Hub.Config({ + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{fleqn} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1306,6 +1310,11 @@ MathJax.Hub.Config({ + + + + + @@ -1344,7 +1353,6 @@ MathJax.Hub.Config({ - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ushort} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1430,7 +1438,6 @@ MathJax.Hub.Config({ - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 2a9f2ed7d54..e5b8c945469 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht @@ -1,4 +1,4 @@ -% html4.4ht (2019-12-13-14:32), generated from tex4ht-html4.tex +% html4.4ht (2019-12-16-15:21), generated from tex4ht-html4.tex % Copyright 2009-2019 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 2019-12-13-14:32} +\immediate\write-1{version 2019-12-16-15:21} \exit:ifnot{8859-6,% CJK,% @@ -1114,22 +1114,25 @@ switches of tex4ht.c) {\:xhtml{\Tg

}} {\:xhtml{\Tg

}}% -\Css{p.noindent { text-indent: 0em }} -\Css{td p.noindent { text-indent: 0em; margin-top:0em; }} -\Css{p.nopar { text-indent: 0em; }} -\Css{p.indent{ text-indent: 1.5em }} \NewConfigure{!P}[1]{\expandafter\concat:config\csname a:!P\endcsname{#1}} \expandafter\let\csname a:!P\endcsname\relax \Configure{!P}{} + + \ifOption{p-indent}{% +\Css{p.noindent { text-indent: 0em }} +\Css{td p.noindent { text-indent: 0em; margin-top:0em; }} +\Css{p.nopar { text-indent: 0em; }} +\Css{p.indent{ text-indent: 1.5em }} \Css{p{margin-top:0;margin-bottom:0}} \Css{p.noindent + p.noindent{margin-top:1em;}} -}{} -\ifOption{p-space}{% +}{% \Css{p{margin-top:0;margin-bottom:0}} \Css{p.indent{text-indent:0;}} \Css{p + p{margin-top:1em;}} -}{} +\Css{p + div, p + pre {margin-top:1em;}} +\Css{div + p, pre + p {margin-top:1em;}} +} \NewConfigure{!BODY}[1]{\expandafter\concat:config \csname a:!BODY\endcsname{#1}} \expandafter\let\csname a:!BODY\endcsname\relax diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index 3e5a887b72b..2352851cbc7 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht @@ -1,4 +1,4 @@ -% mathml.4ht (2019-11-26-14:23), generated from tex4ht-mathml.tex +% mathml.4ht (2019-12-16-15:21), generated from tex4ht-mathml.tex % Copyright 2009-2019 TeX Users Group % Copyright 1999-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2019-11-26-14:23} +\immediate\write-1{version 2019-12-16-15:21} \exit:ifnot{Preamble,% accents,% @@ -1888,6 +1888,7 @@ accent="true">&\#x0332;}% {\HCode{}} {\HCode{<\a:mathml mtr>}} {\HCode{}} {\HCode{\Hnewline<\a:mathml mtd>}} {\HCode{}} +\Configure{[]}{\begin{equation*}}{\end{equation*}} \Configure{underrightarrow} {\Tg<\a:mathml munder>\Tg<\a:mathml mrow\Hnewline>\:gobble} {\Tg\mathop{\rightarrow}\Tg} @@ -1977,7 +1978,7 @@ accent="true">&\#x0332;}% \ifmtext \expandafter\expandafter\expandafter\no:maketag\fi \else \expandafter\no:maketag\fi \AA:text{maketag}\hbox\bgroup\:gobbleIII :@:} - {\egroup\BB:text } + {\egroup\BB:text\ } \def\no:maketag#1:@:#2\b:maketag{\hbox{#2}} \Configure{abovewithdelims} {\abovewithdelims:III} -- cgit v1.2.3