texlive[71478] Master/texmf-dist: listings fix for otherkeywords,

commits+karl at tug.org commits+karl at tug.org
Mon Jun 10 23:04:37 CEST 2024


Revision: 71478
          https://tug.org/svn/texlive?view=revision&revision=71478
Author:   karl
Date:     2024-06-10 23:04:37 +0200 (Mon, 10 Jun 2024)
Log Message:
-----------
listings fix for otherkeywords, tex4ht r1527

Revision Links:
--------------
    https://tug.org/svn/texlive?view=revision&revision=1527

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-06-10 21:00:12 UTC (rev 71477)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-06-10 21:04:37 UTC (rev 71478)
@@ -1,3 +1,16 @@
+2024-06-10  Michal Hoftich  <michal.h21 at 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 at 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 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): renamed jurabib cofigurations to

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-06-10 21:00:12 UTC (rev 71477)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-06-10 21:04:37 UTC (rev 71478)
@@ -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 @@
 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 @@
 \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 at ifmode| condition. 
+See \Link[https://tex.stackexchange.com/q/719828/2891]{}{}for example\EndLink.
+
 \<listings sty\><<<
 \lst at AddToHook{TextStyle}{%
    \Configure{listings}{}{}{}{}%
-   \a:lstinline \bgroup \aftergroup\b:lstinline\aftergroup\egroup
+   \lst at ifmode\else%
+   \a:lstinline \bgroup \aftergroup\b:lstinline\aftergroup\egroup%
+   \fi%
   }
 \NewConfigure{lstinline}{2}
 >>>

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht	2024-06-10 21:00:12 UTC (rev 71477)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht	2024-06-10 21:04:37 UTC (rev 71478)
@@ -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 at AddToHook{TextStyle}{%
    \Configure{listings}{}{}{}{}%
-   \a:lstinline \bgroup \aftergroup\b:lstinline\aftergroup\egroup
+   \lst at ifmode\else%
+   \a:lstinline \bgroup \aftergroup\b:lstinline\aftergroup\egroup%
+   \fi%
   }
 \NewConfigure{lstinline}{2}
 \pend:defI\lst at MakeCaption{%



More information about the tex-live-commits mailing list.