texlive[62918] Master/texmf-dist: ooffice inline desc lists, tex4ht
commits+karl at tug.org
commits+karl at tug.org
Tue Apr 5 22:50:24 CEST 2022
Revision: 62918
http://tug.org/svn/texlive?view=revision&revision=62918
Author: karl
Date: 2022-04-05 22:50:23 +0200 (Tue, 05 Apr 2022)
Log Message:
-----------
ooffice inline desc lists, tex4ht r1108
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=1108
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
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 2022-04-05 20:21:28 UTC (rev 62917)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2022-04-05 20:50:23 UTC (rev 62918)
@@ -1,3 +1,14 @@
+2022-04-05 Michal Hoftich <michal.h21 at 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 at freefriends.org>
+
+ * tex4ht-4ht.tex (minted.4ht),
+ * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): copyright 2022.
+
2022-04-04 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-4ht.tex (minted.4ht): fixed spurious whitespace produced by
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2022-04-05 20:21:28 UTC (rev 62917)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2022-04-05 20:50:23 UTC (rev 62918)
@@ -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
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex 2022-04-05 20:21:28 UTC (rev 62917)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex 2022-04-05 20:50:23 UTC (rev 62918)
@@ -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 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\<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
+>>>
-\<configure ooffice latex\><<<
+
+
+\<oo-default-description\><<<
\let\end:itm=\empty
\ConfigureList{description}%
{\EndP
@@ -2019,9 +2030,40 @@
+\<oo-description-inline\><<<
+\let\end:itm=\empty
+\ConfigureList{description}%
+ {\EndP
+ \bgroup
+ \HCode{<text:list
+ text:style-name="description\if at 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%
+ }
+ {}
+>>>
+
\<configure ooffice enumerate\><<<
|<oo-description for enumerate|>
>>>
@@ -2060,7 +2102,6 @@
-
\<oo-description for enumerate\><<<
\ConfigureOO{enumerate}%
{|<shared oo+ enumerate style|>%
@@ -2212,6 +2253,16 @@
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>
>>>
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2022-04-05 20:21:28 UTC (rev 62917)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht 2022-04-05 20:50:23 UTC (rev 62918)
@@ -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,7 @@
\Configure{enumerate:2}{a}{(}{)}
\Configure{enumerate:3}{i}{}{.}
\Configure{enumerate:4}{A}{}{.}
+\:CheckOption{description-inline}\if:Option
\let\end:itm=\empty
\ConfigureList{description}%
{\EndP
@@ -1251,6 +1252,40 @@
text:name="description"\Hnewline>}%
\PushMacro\end:itm
\global\let\end:itm=\empty
+ \HTML:PAR{description-inline\if at rl-rtl\fi
+}{description-inline\if at 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
+ \bgroup
+ \HCode{<text:list
+ text:style-name="description\if at rl-rtl\fi"
+ text:name="description"\Hnewline>}%
+ \PushMacro\end:itm
+ \global\let\end:itm=\empty
\HTML:PAR{dd\if at rl-rtl\fi
}{dd\if at rl-rtl\fi
}%
@@ -1279,6 +1314,8 @@
\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 @@
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}%
More information about the tex-live-commits
mailing list.