diff options
Diffstat (limited to 'Master/texmf-dist/source/generic')
| -rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex | 57 |
2 files changed, 61 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 752e2841f45..f2fee524bed 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,14 @@ +2022-01-07 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (ooffice.4ht): use \par after some environemnts to + prevent ommision of the following text. + + * tex4ht-ooffice.tex (ooffice.4ht): correctly handle text alignment + environments inside enumerate items. + + * tex4ht-ooffice.tex (ooffice.4ht): added NoSection option to + disable frames around text alignment environments. + 2022-01-05 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (adjustbox.4ht): prevent undefined control diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex index 66a160768cf..f2f35a664ea 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 1045 2021-12-29 15:03:05Z michal_h21 $ +% $Id: tex4ht-ooffice.tex 1052 2022-01-07 13:10:15Z michal_h21 $ % compile 3 times: latex tex4ht-ooffice % htlatex tex4ht-ooffice "xhtml,4,sections+" % @@ -84,7 +84,7 @@ tail>>> \<try env inline par\><<< -\ShowPar +\par\ShowPar >>> \<try inline par\><<< @@ -1856,8 +1856,10 @@ change the configuration slightly. We modify directly the {\EndP\HCode{<text:p text:style-name="Inside-enumerate|<cond rtl class|>" >}} - {\HCode{</text:p>\Hnewline}} {\HCode{</text:p>\Hnewline}}} - {\EndP\IgnorePar \egroup \HCode{</text:list-item>\Hnewline + {\HCode{</text:p>\Hnewline}} {\HCode{</text:p>\Hnewline}} + \gHAdvance\BegEnd:D by 1% + } + {\gHAdvance\BegEnd:D by -1\EndP\IgnorePar \egroup \HCode{</text:list-item>\Hnewline </\text:orderedlist>\Hnewline}\ShowPar} {\EndP\end@Item\DeleteMark} {\HCode{<text:list-item>}\par\ShowPar @@ -2028,8 +2030,11 @@ change the configuration slightly. We modify directly the {\EndP\HCode{<text:p text:style-name="Inside-enumerate|<cond rtl class|>" >}} - {\HCode{</text:p>\Hnewline}} {\HCode{</text:p>\Hnewline}}} - {\EndP\IgnorePar \egroup \HCode{</text:list-item>\Hnewline + {\HCode{</text:p>\Hnewline}} {\HCode{</text:p>\Hnewline}} + \gHAdvance\BegEnd:D by 1% + } + {\gHAdvance\BegEnd:D by -1% + \EndP\IgnorePar \egroup \HCode{</text:list-item>\Hnewline </\text:orderedlist>\Hnewline}\ShowPar} {\EndP\end@Item \let\sv:DeleteMark\DeleteMark \let\DeleteMark\DeleteMark: \DeleteMark} @@ -3320,32 +3325,70 @@ See html4 comment regarding \verb+\Configure{jbanchor}{\Link}{\EndLink}+ - \<configure ooffice latex\><<< \HAssign\BegEnd:N=0 \HAssign\BegEnd:D=0 >>> +We use ODT sections for various environements, +especially for changed text alignment. + +These sections are not rendered in some contexts, +for example in enumerate items. So we need +to have a mechanism to disable them. + +I don't even think that these sections are usefull +at all, as the text alignment in these environments +seems to work regardless of the section use. + +We will print section tags only when BedEnd:X is +zero. The following commands increase and decrease +this counter. This should handle nesting. + +\<configure ooffice latex\><<< +\HAssign\BegEnd:X=0 +\def\:DisableSections{\gHAdvance\BegEnd:X by 1} +\def\:EnableSections{\gHAdvance\BegEnd:X by -1} +>>> + +We also provide an option to dispable sections +completelly. + + +\<configure ooffice latex\><<< +\:CheckOption{NoSections}\if:Option +\HAssign\BegEnd:X=9999% use some really high number +\else +\Log:Note{To disable use of sections for text + alignment environemnts, use the "NoSections" + option} +\fi +>>> \<begin env section\><<< \ifvmode \IgnorePar\fi \EndP +\ifnum\BegEnd:X=0% \ifnum \BegEnd:D=0 |<sectioned env|>% \else |<boxed env|>% \fi \gHAdvance\BegEnd:D by 1 +\fi >>> \<end env section\><<< \gHAdvance\BegEnd:D by -1 \ifvmode \IgnorePar\fi\EndP +\ifnum\BegEnd:X=0% \ifnum \BegEnd:D=0 |<end sectioned env|>% \else |<end boxed env|>% \fi +\else\par% +\fi >>> |