diff options
author | Karl Berry <karl@freefriends.org> | 2024-06-10 21:04:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-06-10 21:04:37 +0000 |
commit | 00558f3dac8676dda5160c2e885a0998779e1850 (patch) | |
tree | 968790c0192c039e66fcb963569e593cee49199e | |
parent | 72a17d918a21a85672f8c59c2bf5162fbeeae216 (diff) |
listings fix for otherkeywords, tex4ht r1527
git-svn-id: svn://tug.org/texlive/trunk@71478 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 13 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 13 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/listings.4ht | 10 |
3 files changed, 29 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 6c8e2f74e4d..d9cfcceeacb 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,16 @@ +2024-06-10 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (babel-sty-hooks.4ht): use \ProvideDocumentCommand + to define \:babelfont, in order to prevent errors if Babel is used + multiple times. + https://puszcza.gnu.org.ua/bugs/?626 + +2024-06-06 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (listings.4ht): fixed error with otherkeywords + style. + https://tex.stackexchange.com/a/719878/2891 + 2024-05-28 Michal Hoftich <michal.h21@gmail.com> * tex4ht-html4.tex (html4.4ht): renamed jurabib cofigurations to diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index a6a4a21a7a4..998a21722f5 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 1525 2024-05-28 12:07:12Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1528 2024-06-10 18:18:47Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2024 TeX Users Group @@ -24954,7 +24954,7 @@ It can cause fatal errors, because it changes font encodings and can cause loating of OTF fonts \<babelfont\><<< -\NewDocumentCommand\:babelfont{o m o m}{} +\ProvideDocumentCommand\:babelfont{o m o m}{} \:AtEndOfPackage{% % disable \babelfont @@ -33343,10 +33343,17 @@ content. \NewConfigure{listings-init}{2} >>> +Use the TextStyle hook to insert markup for inline listings. This hook can +be used also in other contexts, so we need to execute it conditionally, +based on the \Verb|\lst@ifmode| condition. +See \Link[https://tex.stackexchange.com/q/719828/2891]{}{}for example\EndLink. + \<listings sty\><<< \lst@AddToHook{TextStyle}{% \Configure{listings}{}{}{}{}% - \a:lstinline \bgroup \aftergroup\b:lstinline\aftergroup\egroup + \lst@ifmode\else% + \a:lstinline \bgroup \aftergroup\b:lstinline\aftergroup\egroup% + \fi% } \NewConfigure{lstinline}{2} >>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht index 20638b08253..00b7058447c 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht @@ -1,6 +1,6 @@ -% listings.4ht (2023-07-25-12:42), generated from tex4ht-4ht.tex +% listings.4ht (2024-06-10-14:03), generated from tex4ht-4ht.tex % Copyright 2001-2009 Eitan M. Gurari -% Copyright 2009-2023 TeX Users Group +% Copyright 2009-2024 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-07-25-12:42} +\immediate\write-1{version 2024-06-10-14:03} \@ifpackageloaded{xcolor}{}{% \RequirePackage{xcolor} @@ -46,7 +46,9 @@ \NewConfigure{listings-init}{2} \lst@AddToHook{TextStyle}{% \Configure{listings}{}{}{}{}% - \a:lstinline \bgroup \aftergroup\b:lstinline\aftergroup\egroup + \lst@ifmode\else% + \a:lstinline \bgroup \aftergroup\b:lstinline\aftergroup\egroup% + \fi% } \NewConfigure{lstinline}{2} \pend:defI\lst@MakeCaption{% |