texlive[60797] Master/texmf-dist: figure css, tex4ht r994; koma

commits+karl at tug.org commits+karl at tug.org
Mon Oct 18 22:11:07 CEST 2021


Revision: 60797
          http://tug.org/svn/texlive?view=revision&revision=60797
Author:   karl
Date:     2021-10-18 22:11:06 +0200 (Mon, 18 Oct 2021)
Log Message:
-----------
figure css, tex4ht r994; koma abstracts, tex4ht r995

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=994
    http://tug.org/svn/texlive?view=revision&revision=995

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/html5.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2021-10-18 19:50:24 UTC (rev 60796)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2021-10-18 20:11:06 UTC (rev 60797)
@@ -1,3 +1,11 @@
+2021-10-18  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-html5.tex (html5.4ht): removed CSS declaration that prevented
+	horizontal scacking of images in figure environment.
+	https://tex.stackexchange.com/a/619302/2891
+	* tex4ht-ooffice.tex (ooffice.4ht): fixed abstract support for Koma classes.
+	https://puszcza.gnu.org.ua/bugs/?507
+
 2021-10-12  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): clean up for \paragraph and \subparagraph

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex	2021-10-18 19:50:24 UTC (rev 60796)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html5.tex	2021-10-18 20:11:06 UTC (rev 60797)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html5.tex 949 2021-06-13 08:57:21Z michal_h21 $
+% $Id: tex4ht-html5.tex 994 2021-10-18 08:59:43Z michal_h21 $
 % compile 3 times: latex tex4ht-moz
 %           or   xhlatex tex4ht-moz "html,3,sections+"
 %
@@ -338,7 +338,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex	2021-10-18 19:50:24 UTC (rev 60796)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex	2021-10-18 20:11:06 UTC (rev 60797)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 993 2021-10-12 15:19:37Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 995 2021-10-18 13:45:08Z michal_h21 $
 % compile 3 times: latex tex4ht-ooffice
 %      htlatex tex4ht-ooffice "xhtml,4,sections+"
 %
@@ -1564,6 +1564,36 @@
 \section{Abstract}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\subsection{Scr}
+
+The paragraph styles are already defined in ooffice title page
+section, which is included by scrartcle and scrreprt before this 
+code.
+
+Koma classess don't contain mandatory abstract title, so we must 
+change the configuration slightly. We modify directly the 
+\verb|\abstractname| command to print XML tags.
+
+\<scr abstract\><<<
+\ConfigureEnv{abstract}
+   {\IgnorePar\EndP \bgroup
+      \Configure{HtmlPar}
+         {\EndP \HCode{<text:p
+                    text:style-name="abstract|<cond rtl class|>">}}
+         {\EndP \HCode{<text:p  
+                    text:style-name="abstract|<cond rtl class|>">}}
+         {\HCode{</text:p>}}
+         {\HCode{</text:p>}}%
+      \par \ShowPar
+   }
+   {\ifvmode \IgnorePar\fi \EndP \egroup \ShowPar\par \IgnoreIndent }
+   {
+     \pend:def\abstractname{\ifvmode \IgnorePar\fi\EndP\HCode{<text:p text:style-name="abstract-title">}}
+     \append:def\abstractname{\HCode{</text:p>}}
+   }
+   {}
+>>>
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{LaTeX}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -9063,6 +9093,7 @@
 
 \<configure ooffice scrreprt\><<<
 |<ooffice title page|>
+|<scr abstract|>
 |<content styles|>
 |<chap tocs|>
 |<scr chap tocs|>
@@ -9080,6 +9111,7 @@
 
 \<configure ooffice scrartcl\><<<
 |<ooffice title page|>
+|<scr abstract|>
 |<content styles|>
 |<ooffice bib with bibname|>
 |<ooffice begin-end env|>

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html5.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html5.4ht	2021-10-18 19:50:24 UTC (rev 60796)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html5.4ht	2021-10-18 20:11:06 UTC (rev 60797)
@@ -1,4 +1,4 @@
-% html5.4ht (2021-06-13-08:45), generated from tex4ht-html5.tex
+% html5.4ht (2021-10-18-12:58), generated from tex4ht-html5.tex
 % Copyright 2016-2021 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 2021-06-13-08:45}
+\immediate\write-1{version 2021-10-18-12:58}
 
 \exit:ifnot{amsart,% 
 amsbook,% 
@@ -220,7 +220,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -259,7 +258,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -305,7 +303,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -348,6 +345,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsart}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -367,7 +365,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -406,7 +403,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -446,7 +442,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -588,7 +583,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -699,7 +693,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -738,7 +731,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -777,7 +769,6 @@
    {}{}
 
 \Css{figure.float, div.figure {margin-left: auto; margin-right: auto;}}
-\Css{figure.float img, figure.figure img {display: block; margin-left: auto; margin-right: auto;}}
 \Css{figure.figure {text-align:center;}}
 
 \Configure{caption}{\:xhtml{\IgnorePar\EndP}\HCode{<figcaption class="caption" ><span class="id">}}
@@ -846,6 +837,8 @@
 
 
 
+
+
 
 
 

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht	2021-10-18 19:50:24 UTC (rev 60796)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht	2021-10-18 20:11:06 UTC (rev 60797)
@@ -1,4 +1,4 @@
-% ooffice.4ht (2021-10-12-13:20), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2021-10-18-12:59), generated from tex4ht-ooffice.tex
 % Copyright 2009-2021 TeX Users Group
 % Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-10-12-13:20}
+\immediate\write-1{version 2021-10-18-12:59}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -14782,6 +14782,26 @@
 </style:style>\Hnewline
 }
 
+\ConfigureEnv{abstract}
+   {\IgnorePar\EndP \bgroup
+      \Configure{HtmlPar}
+         {\EndP \HCode{<text:p
+                    text:style-name="abstract\if at rl-rtl\fi
+">}}
+         {\EndP \HCode{<text:p
+                    text:style-name="abstract\if at rl-rtl\fi
+">}}
+         {\HCode{</text:p>}}
+         {\HCode{</text:p>}}%
+      \par \ShowPar
+   }
+   {\ifvmode \IgnorePar\fi \EndP \egroup \ShowPar\par \IgnoreIndent }
+   {
+     \pend:def\abstractname{\ifvmode \IgnorePar\fi\EndP\HCode{<text:p text:style-name="abstract-title">}}
+     \append:def\abstractname{\HCode{</text:p>}}
+   }
+   {}
+
 \NewConfigureOO{Contents 1}
 \ConfigureOO{Contents 1}{\Hnewline
    <style:style style:name="Contents-1"
@@ -16051,6 +16071,26 @@
 </style:style>\Hnewline
 }
 
+\ConfigureEnv{abstract}
+   {\IgnorePar\EndP \bgroup
+      \Configure{HtmlPar}
+         {\EndP \HCode{<text:p
+                    text:style-name="abstract\if at rl-rtl\fi
+">}}
+         {\EndP \HCode{<text:p
+                    text:style-name="abstract\if at rl-rtl\fi
+">}}
+         {\HCode{</text:p>}}
+         {\HCode{</text:p>}}%
+      \par \ShowPar
+   }
+   {\ifvmode \IgnorePar\fi \EndP \egroup \ShowPar\par \IgnoreIndent }
+   {
+     \pend:def\abstractname{\ifvmode \IgnorePar\fi\EndP\HCode{<text:p text:style-name="abstract-title">}}
+     \append:def\abstractname{\HCode{</text:p>}}
+   }
+   {}
+
 \NewConfigureOO{Contents 1}
 \ConfigureOO{Contents 1}{\Hnewline
    <style:style style:name="Contents-1"



More information about the tex-live-commits mailing list.