summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog11
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex2
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex57
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht51
4 files changed, 115 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 8bd91f94e15..8ee941ac8c4 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,14 @@
+2022-04-05 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-ooffice.tex (ooffice.4ht): added option to produce inline
+ description lists.
+ https://puszcza.gnu.org.ua/bugs/?531
+
+2022-04-04 Karl Berry <karl@freefriends.org>
+
+ * tex4ht-4ht.tex (minted.4ht),
+ * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): copyright 2022.
+
2022-04-04 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (minted.4ht): fixed spurious whitespace produced by
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index c8020013b08..f12d3182680 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1106 2022-04-04 10:06:26Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1107 2022-04-04 14:44:55Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
index 56de7c4c9c1..eebe62995fd 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 1101 2022-03-28 11:52:50Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1108 2022-04-05 15:59:08Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -1979,8 +1979,19 @@ change the configuration slightly. We modify directly the
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
\<configure ooffice latex\><<<
+\:CheckOption{description-inline}\if:Option
+|<oo-description-inline|>
+\else
+\Log:Note{for description lists where header is in the same paragraph as
+ description, use the `description-inline' command option}
+|<oo-default-description|>
+\fi
+>>>
+
+
+
+\<oo-default-description\><<<
\let\end:itm=\empty
\ConfigureList{description}%
{\EndP
@@ -2019,6 +2030,37 @@ change the configuration slightly. We modify directly the
+\<oo-description-inline\><<<
+\let\end:itm=\empty
+\ConfigureList{description}%
+ {\EndP
+ \bgroup
+ \HCode{<text:list
+ text:style-name="description\if@rl-rtl\fi"
+ text:name="description"\Hnewline>}%
+ \PushMacro\end:itm
+ \global\let\end:itm=\empty
+ \HTML:PAR{description-inline|<cond rtl class|>}{description-inline|<cond rtl class|>}%
+ \gHAdvance\BegEnd:D by 1
+ }
+ {\gHAdvance\BegEnd:D by -1
+ \PopMacro\end:itm \global\let\end:itm \end:itm
+ \EndP
+ \HCode{<!--/dd-->}%
+ \HCode{</text:list-item>}
+ \HCode{</text:list>}%
+ \egroup
+ \ShowPar}
+ {\end:itm
+ \global\def\end:itm{\EndP
+ \HCode{<!--/dd-->}%
+ \HCode{</text:list-item>}%
+ }%
+ \HCode{<text:list-item>}\par\ShowPar%
+ }
+ {}
+>>>
+
@@ -2060,7 +2102,6 @@ change the configuration slightly. We modify directly the
-
\<oo-description for enumerate\><<<
\ConfigureOO{enumerate}%
{|<shared oo+ enumerate style|>%
@@ -2212,6 +2253,16 @@ change the configuration slightly. We modify directly the
fo:font-weight="bold"
/>
</style:style>
+<style:style
+ style:name="description-inline"
+ style:family="paragraph"
+ style:parent-style-name="">
+ <style:paragraph-properties
+ fo:margin-left="0.35in"
+ fo:margin-right="0in"
+ fo:text-indent="-0.35in"
+ style:auto-text-indent="false"/>
+</style:style>
>>>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index aa89899dd99..cd47a0a9b65 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 (2022-04-04-07:07), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2022-04-05-13:34), generated from tex4ht-ooffice.tex
% Copyright 2009-2022 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 2022-04-04-07:07}
+\immediate\write-1{version 2022-04-05-13:34}
\exit:ifnot{Preamble,%
algorithmicx,%
@@ -1242,6 +1242,41 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
\Configure{enumerate:2}{a}{(}{)}
\Configure{enumerate:3}{i}{}{.}
\Configure{enumerate:4}{A}{}{.}
+\:CheckOption{description-inline}\if:Option
+\let\end:itm=\empty
+\ConfigureList{description}%
+ {\EndP
+ \bgroup
+ \HCode{<text:list
+ text:style-name="description\if@rl-rtl\fi"
+ text:name="description"\Hnewline>}%
+ \PushMacro\end:itm
+ \global\let\end:itm=\empty
+ \HTML:PAR{description-inline\if@rl-rtl\fi
+}{description-inline\if@rl-rtl\fi
+}%
+ \gHAdvance\BegEnd:D by 1
+ }
+ {\gHAdvance\BegEnd:D by -1
+ \PopMacro\end:itm \global\let\end:itm \end:itm
+ \EndP
+ \HCode{<!--/dd-->}%
+ \HCode{</text:list-item>}
+ \HCode{</text:list>}%
+ \egroup
+ \ShowPar}
+ {\end:itm
+ \global\def\end:itm{\EndP
+ \HCode{<!--/dd-->}%
+ \HCode{</text:list-item>}%
+ }%
+ \HCode{<text:list-item>}\par\ShowPar%
+ }
+ {}
+
+\else
+\Log:Note{for description lists where header is in the same paragraph as
+ description, use the `description-inline' command option}
\let\end:itm=\empty
\ConfigureList{description}%
{\EndP
@@ -1279,6 +1314,8 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
\HCode{<!--dd\Hnewline class="description"-->}%
\par
}
+
+\fi
\NewConfigureOO{description}
\ConfigureOO{description}{<text:list-style style:name="description" >
<text:list-level-style-bullet
@@ -1344,6 +1381,16 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
fo:font-weight="bold"
/>
</style:style>
+<style:style
+ style:name="description-inline"
+ style:family="paragraph"
+ style:parent-style-name="">
+ <style:paragraph-properties
+ fo:margin-left="0.35in"
+ fo:margin-right="0in"
+ fo:text-indent="-0.35in"
+ style:auto-text-indent="false"/>
+</style:style>
}
\let\end:itm=\empty
\ConfigureList{list}%