diff options
Diffstat (limited to 'Master/texmf-dist/source')
3 files changed, 34 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 738ecdbd7c6..d4d252102dc 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,10 @@ +2021-09-17 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-html4.tex (html4.4ht): fixed support for floating listings. + https://tex.stackexchange.com/a/615703/2891 + * tex4ht-ooffice.tex (ooffice.4ht): fixed listings support in the ODT + format. + 2021-09-14 Michal Hoftich <michal.h21@gmail.com> * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): fixed TOC support for \exp diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index 0108f2d289d..5dfb67b428f 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 978 2021-09-12 21:26:18Z michal_h21 $ +% $Id: tex4ht-html4.tex 982 2021-09-17 12:20:37Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -15254,15 +15254,17 @@ Configuration for the inline code \gdef\start:LstLn{% \HCode{<div class="lstlisting" id="listing-\listingN">}% \gdef\start:LstLn{|<nbsp|>\HCode{<br />\Hnewline}}} - \bgroup + \bgroup% + % we put the closing </div> here in order to support floating listings + % https://tex.stackexchange.com/a/615703/2891 + \pend:def\lst@DeInit{\ifvmode\IgnorePar\fi\EndP\HCode{</div>}}% \Configure{listings} {{\everypar{}\leavevmode}} {{\everypar{}\leavevmode}} {\start:LstLn \HCode{<span class="label">}} {\HCode{</span>}}% } - {\egroup - \ifvmode \IgnorePar\fi \EndP \HCode{</div>}\par} + {\egroup\par} {} {} \Css{.lstlisting .label{margin-right:0.5em; }} \Css{div.lstlisting{font-family: monospace,monospace; white-space: nowrap; diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex index 71b3105795f..1eac5065436 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 977 2021-09-09 13:53:34Z michal_h21 $ +% $Id: tex4ht-ooffice.tex 983 2021-09-17 14:27:15Z michal_h21 $ % compile 3 times: latex tex4ht-ooffice % htlatex tex4ht-ooffice "xhtml,4,sections+" % @@ -10446,15 +10446,21 @@ Y{0178}\i{00EF}% \ConfigureEnv{lstlisting} {\ifvmode \IgnorePar\fi \EndP \HCode{<!--l. \the\inputlineno lstlisting-->}% - \HCode{<text:p\Hnewline text:style-name="Preformatted-Text">}% - \bgroup \special{t4ht@(}% + % \HCode{}% + \bgroup % + \gdef\start:LstLn{% + \ifvmode\IgnorePar\fi\EndP\HCode{<text:p\Hnewline text:style-name="Preformatted-Text">}% + \ht:special{t4ht@(}\ttfamily% + \gdef\start:LstLn{\HCode{<text:s/><text:line-break/>}}} + \pend:def\lst@DeInit{\ifvmode\IgnorePar\fi\EndP\HCode{</text:p>}}% \Configure{listings} {{\everypar{}\leavevmode}} {{\everypar{}\leavevmode}} - {\HCode{<text:s/><text:line-break/>}}{}% + {\start:LstLn}{}% } - {\special{t4ht@)}\egroup - \ifvmode \IgnorePar\fi \EndP \HCode{</text:p>}\par} + {\ht:special{t4ht@)}\egroup + % \ifvmode \IgnorePar\fi \EndP \HCode{</text:p>}\par} + \par} {} {} >>> @@ -10462,16 +10468,20 @@ Y{0178}\i{00EF}% \Configure{lstinputlisting} {\ifvmode \IgnorePar\fi \EndP \HCode{<!--l. \the\inputlineno lstinputlisting-->}% - \HCode{<text:p\Hnewline text:style-name="Preformatted-Text">}% - \bgroup \tt \special{t4ht@(}% + % \HCode{<text:p\Hnewline text:style-name="Preformatted-Text">}% + \bgroup% + \gdef\start:LstLn{% + \ifvmode\IgnorePar\fi\EndP\HCode{<text:p\Hnewline text:style-name="Preformatted-Text">}% + \ht:special{t4ht@(}\ttfamily% + \gdef\start:LstLn{\HCode{<text:s/><text:line-break/>}}} + \pend:def\lst@DeInit{\ifvmode\IgnorePar\fi\EndP\HCode{</text:p>}}% \Configure{listings} {{\everypar{}\leavevmode}} {{\everypar{}\leavevmode}} - {\HCode{<text:s/><text:line-break/>}} + {\start:LstLn} {\HCode{<text:line-break/>}}% } - {\special{t4ht@)}\egroup - \ifvmode \IgnorePar\fi \EndP \HCode{</text:p>}\par} + {\special{t4ht@)}\egroup\par} >>> |