summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-12 20:50:43 +0000
committerKarl Berry <karl@freefriends.org>2021-10-12 20:50:43 +0000
commit8ec89c3df631469008e86996ada7920cc4f3a5dc (patch)
tree7c692530738187f54b356c2217c2ff3fda201179 /Master/texmf-dist
parent9b9af3f98ce453fa388221fbb39b765facc75146 (diff)
ooffice fixes, tex4ht r992; \(sub)paragraph cleanup, tex4ht 993
git-svn-id: svn://tug.org/texlive/trunk@60744 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog9
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex18
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex10
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht24
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht12
5 files changed, 41 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 8496e089183..1422a4f6262 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,12 @@
+2021-10-12 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-html4.tex (html4.4ht): clean up for \paragraph and \subparagraph
+ commands.
+ https://puszcza.gnu.org.ua/bugs/?530#discussion
+ * tex4ht-ooffice.tex (ooffice.4ht): fixed handling of paragraphs in
+ \paragraph and \subpagraph.
+ https://puszcza.gnu.org.ua/bugs/?530#discussion
+
2021-10-10 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-fonts-noncjk.tex (
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index e8e952e56b5..15c1f88db88 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 988 2021-09-28 21:06:02Z michal_h21 $
+% $Id: tex4ht-html4.tex 992 2021-10-12 12:17:53Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -9178,7 +9178,7 @@ The hbox is for avoiding the start of a new paragraph, if in vmode.
\<ams proc,book\><<<
\Configure{paragraph}{}{}
- {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup\bf}
+ {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup}
{\endgroup\HCode{</span>}\IgnorePar}
\ConfigureMark{subparagraph}{\thesubparagraph}
\Css{.paragraphHead { margin-top:2em; font-weight: bold;}}
@@ -9197,7 +9197,7 @@ The hbox is for avoiding the start of a new paragraph, if in vmode.
\<ams proc,book\><<<
\Configure{subparagraph}{}{}
- {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup\bf
+ {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup
\TitleMark\space}
{\endgroup\HCode{</span>}\IgnorePar}
\Css{.subparagraphHead { font-weight: bold;}}
@@ -10264,21 +10264,21 @@ need to change early the catcodes of `\verb'_' and `\verb'^'.
|<config lists of figures and tables|>
\Configure{paragraph}{}{}
- {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup\bf}
- {\endgroup\HCode{</span>}}
+ {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup}
+ {\endgroup\HCode{</span>}\IgnorePar}
\Configure{likeparagraph}{}{}
{\ShowPar\IgnoreIndent\HCode{<span class="likeparagraphHead"\a:LRdir>}}
- {\HCode{</span>}}
+ {\HCode{</span>}\IgnorePar}
\Css{.paragraphHead, .likeparagraphHead
{ margin-top:2em; font-weight: bold;}}
-\ConfigureMark{subparagraph}{\thesubparagraph}
+\ConfigureMark{subparagraph}{}
\Configure{subparagraph}{}{}
- {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup\bf
+ {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup
\TitleMark\space}
{\endgroup\HCode{</span>}\IgnorePar}
\Configure{likesubparagraph}{}{}
- {\ShowPar\HCode{<span class="likesubparagraphHead"\a:LRdir>}\begingroup\bf}
+ {\ShowPar\HCode{<span class="likesubparagraphHead"\a:LRdir>}\begingroup}
{\endgroup\HCode{</span>}\IgnorePar}
\Css{.subparagraphHead, .likesubparagraphHead
{ font-weight: bold;}}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
index 1eac5065436..bce861e38fd 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 983 2021-09-17 14:27:15Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 993 2021-10-12 15:19:37Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -467,10 +467,10 @@ in the character style passed as the second argument.
\<utilities\><<<
\def\:DefineParagraph#1#2{%
\Configure{#1}
- {\IgnorePar\EndP \HCode{<!--start of #1 -->}}
- {\IgnorePar\EndP \HCode{<!--start of #1 -->}}
- {\bgroup\HTML:PAR{#1-p}{#1-p}\par\HCode{<text:span text:style-name="#2" >}}
- {\HCode{</text:span><text:s/><text:s/>\Hnewline}\egroup}
+ {\ifvmode\IgnorePar\fi\EndP \HCode{<!--start of #1 -->}}
+ {\ifvmode\IgnorePar\fi\EndP \HCode{<!--start of #1 -->}}
+ {\bgroup\HTML:PAR{#1-p}{#1-p}\ifvmode\IgnorePar\fi\EndP\par\HCode{<text:span text:style-name="#2" >}}
+ {\HCode{</text:span><text:s/><text:s/>\Hnewline}\egroup\IgnorePar}
\:ParagraphStyle{#1-p}
}
>>>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 2e5c289a2cd..499b35f0607 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 (2021-09-28-14:09), generated from tex4ht-html4.tex
+% html4.4ht (2021-10-12-13:20), generated from tex4ht-html4.tex
% Copyright 2009-2021 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 2021-09-28-14:09}
+\immediate\write-1{version 2021-10-12-13:20}
\exit:ifnot{8859-6,%
CJK,%
@@ -16631,12 +16631,12 @@ s{015B}u{00FA}y{00FD}z{017A}j{FFFD}J{FFDD}\i{00ED}\j{FFFD}%
\TitleMark\space \HtmlParOff}
{\HCode{</h5>}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar}
\Configure{paragraph}{}{}
- {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup\bf}
+ {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup}
{\endgroup\HCode{</span>}\IgnorePar}
\ConfigureMark{subparagraph}{\thesubparagraph}
\Css{.paragraphHead { margin-top:2em; font-weight: bold;}}
\Configure{subparagraph}{}{}
- {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup\bf
+ {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup
\TitleMark\space}
{\endgroup\HCode{</span>}\IgnorePar}
\Css{.subparagraphHead { font-weight: bold;}}
@@ -19256,12 +19256,12 @@ s{015B}u{00FA}y{00FD}z{017A}j{FFFD}J{FFDD}\i{00ED}\j{FFFD}%
\TitleMark\space \HtmlParOff}
{\HCode{</h5>}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar}
\Configure{paragraph}{}{}
- {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup\bf}
+ {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup}
{\endgroup\HCode{</span>}\IgnorePar}
\ConfigureMark{subparagraph}{\thesubparagraph}
\Css{.paragraphHead { margin-top:2em; font-weight: bold;}}
\Configure{subparagraph}{}{}
- {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup\bf
+ {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup
\TitleMark\space}
{\endgroup\HCode{</span>}\IgnorePar}
\Css{.subparagraphHead { font-weight: bold;}}
@@ -32828,21 +32828,21 @@ description">}%
\Configure{paragraph}{}{}
- {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup\bf}
- {\endgroup\HCode{</span>}}
+ {\ShowPar\IgnoreIndent\HCode{<span class="paragraphHead"\a:LRdir>}\begingroup}
+ {\endgroup\HCode{</span>}\IgnorePar}
\Configure{likeparagraph}{}{}
{\ShowPar\IgnoreIndent\HCode{<span class="likeparagraphHead"\a:LRdir>}}
- {\HCode{</span>}}
+ {\HCode{</span>}\IgnorePar}
\Css{.paragraphHead, .likeparagraphHead
{ margin-top:2em; font-weight: bold;}}
-\ConfigureMark{subparagraph}{\thesubparagraph}
+\ConfigureMark{subparagraph}{}
\Configure{subparagraph}{}{}
- {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup\bf
+ {\ShowPar\HCode{<span class="subparagraphHead"\a:LRdir>}\begingroup
\TitleMark\space}
{\endgroup\HCode{</span>}\IgnorePar}
\Configure{likesubparagraph}{}{}
- {\ShowPar\HCode{<span class="likesubparagraphHead"\a:LRdir>}\begingroup\bf}
+ {\ShowPar\HCode{<span class="likesubparagraphHead"\a:LRdir>}\begingroup}
{\endgroup\HCode{</span>}\IgnorePar}
\Css{.subparagraphHead, .likesubparagraphHead
{ font-weight: bold;}}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index b8606ad9c47..986848be284 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
@@ -1,4 +1,4 @@
-% ooffice.4ht (2021-09-17-15:31), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2021-10-12-13:20), 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-09-17-15:31}
+\immediate\write-1{version 2021-10-12-13:20}
\exit:ifnot{Preamble,%
algorithmicx,%
@@ -199,10 +199,10 @@ xmlns:xlink="http://www.w3.org/1999/xlink"\Hnewline
}
\def\:DefineParagraph#1#2{%
\Configure{#1}
- {\IgnorePar\EndP \HCode{<!--start of #1 -->}}
- {\IgnorePar\EndP \HCode{<!--start of #1 -->}}
- {\bgroup\HTML:PAR{#1-p}{#1-p}\par\HCode{<text:span text:style-name="#2" >}}
- {\HCode{</text:span><text:s/><text:s/>\Hnewline}\egroup}
+ {\ifvmode\IgnorePar\fi\EndP \HCode{<!--start of #1 -->}}
+ {\ifvmode\IgnorePar\fi\EndP \HCode{<!--start of #1 -->}}
+ {\bgroup\HTML:PAR{#1-p}{#1-p}\ifvmode\IgnorePar\fi\EndP\par\HCode{<text:span text:style-name="#2" >}}
+ {\HCode{</text:span><text:s/><text:s/>\Hnewline}\egroup\IgnorePar}
\:ParagraphStyle{#1-p}
}
\def\:BoldStyle#1{%