fix fancyvrb vs. minted clash, tex4ht r1431; adjustwidth empty dimensions, tex4ht r1432

git-svn-id: svn://tug.org/texlive/trunk@69301 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 44 insertions, 40 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 6550880f4ea..af7cdeaa0d7 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,17 @@
+2024-01-04  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (changepage.4ht): fixed setting of empty margins.
+	https://github.com/michal-h21/tex4ebook/issues/120
+
+	* tex4ht-4ht.tex (fancyvrb.4ht): changed redefinition of \FVC@Verb
+	so it doesn't cause runtime errors with Minted's \mintinline.
+	https://github.com/michal-h21/make4ht/issues/141
+
+2024-01-03  Karl Berry  <karl@freefriends.org>
+
+	* tex4ht-fonts-libertinus.tex: Id.
+	* tex4ht-options.tex: 2024.
+
 2024-01-03  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-fonts-libertinus.tex: added support for the Libertinus
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index e1ca8c4c370..de73e208c4f 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 1428 2023-12-21 12:27:05Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1432 2024-01-04 21:04:24Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2023 TeX Users Group    
@@ -25815,26 +25815,21 @@ The command
 
 \SubSection{Verb}
 
+We must prevent execution of the code in a:fancyvrb in \Verb+\FVC@Verb+, as it
+inserts special for ignoring of the output, so the rest of the document 
+wouldn't be produced. This hook is inserted by \Verb+\FV@FormattingPrep+.
+See \Link[://github.com/michal-h21/make4ht/issues/141]{}{}this issue\EndLink.
+
 \<fix fancyvrb\><<<
-\begingroup
-\catcode`\^^M=\active%
-\gdef\FVC@Verb#1{%
-  \begingroup%
-    \FV@UseKeyValues%
-    \let\a:fancyvrb|=\empty\FV@FormattingPrep%
-    \FV@CatCodes%
-    \outer\def^^M{}%
-    \catcode`#1=12%
-    \def\@tempa{\def\FancyVerbGetVerb####1####2}%
-    \expandafter\@tempa\string#1{\mbox{\a:verb##2\b:verb}\endgroup}%
-    \FancyVerbGetVerb\FV@EOL}%
-\endgroup
+\pend:defI\FVC@Verb{\bgroup\let\a:fancyvrb\empty\a:verb}
+\append:defI\FVC@Verb{\b:verb\egroup}
 >>>
 
 \<fix fancyvrb\><<<
-\def\FV@UseVerb#1{\mbox{\FV@UseKeyValues%
+\def\:tempa#1{\mbox{\FV@UseKeyValues%
    \let\a:fancyvrb|=\empty \FV@FormattingPrep%
    \a:verb #1\b:verb}}
+\HLet\:tempa\FV@UseVerb
 >>>
 
 \SubSection{Colors}
@@ -33286,7 +33281,7 @@ our versions.
 %%%%%%%%%%%%%%%%%%%%%%%
 \<changepage.4ht\><<<
 % changepage.4ht (|version), generated from |jobname.tex
-% Copyright 2023 TeX Users Group
+% Copyright 2023-2024 TeX Users Group
 |<TeX4ht license text|>
 |<changepage shared config|>
 \Hinput{changepage}
@@ -33298,12 +33293,15 @@ Changepage uses a list environment to make a text with changed left and right ma
 We will instead save the margin didmension for the further processing in the output
 format configuration. 
 
+
 \<changepage shared config\><<<
 \NewConfigure{adjustwidth}{2}
 
 \def\:tempa#1#2{%
-  \def\adjustwidth:left{#1}%
-  \def\adjustwidth:right{#2}%
+  % arguments can be empty, in that case we must declare 
+  % the margins as null dimension, to prevent calculation errors
+  \edef\adjustwidth:left{\if\relax#1\relax0pt\else#1\fi}%
+  \edef\adjustwidth:right{\if\relax#2\relax0pt\else#2\fi}%
   \a:adjustwidth%
 }
 \HLet\adjustwidth\:tempa
diff --git a/Master/texmf-dist/tex/generic/tex4ht/changepage.4ht b/Master/texmf-dist/tex/generic/tex4ht/changepage.4ht
index 00b405cbec7..d0ded02bf91 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/changepage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/changepage.4ht
@@ -1,5 +1,5 @@
-% changepage.4ht (2023-10-16-13:09), generated from tex4ht-4ht.tex
-% Copyright 2023 TeX Users Group
+% changepage.4ht (2024-01-04-13:21), generated from tex4ht-4ht.tex
+% Copyright 2023-2024 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -16,13 +16,15 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2023-10-16-13:09}
+\immediate\write-1{version 2024-01-04-13:21}
 
 \NewConfigure{adjustwidth}{2}
 
 \def\:tempa#1#2{%
-  \def\adjustwidth:left{#1}%
-  \def\adjustwidth:right{#2}%
+  % arguments can be empty, in that case we must declare
+  % the margins as null dimension, to prevent calculation errors
+  \edef\adjustwidth:left{\if\relax#1\relax0pt\else#1\fi}%
+  \edef\adjustwidth:right{\if\relax#2\relax0pt\else#2\fi}%
   \a:adjustwidth%
 }
 \HLet\adjustwidth\:tempa
diff --git a/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht b/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht
index 9f05ba41b78..02e732aca22 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/fancyvrb.4ht
@@ -1,6 +1,6 @@
-% fancyvrb.4ht (2022-12-02-14:48), generated from tex4ht-4ht.tex
+% fancyvrb.4ht (2024-01-04-13:21), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
-% Copyright 2009-2022 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 2022-12-02-14:48}
+\immediate\write-1{version 2024-01-04-13:21}
 
 
    \pend:def\FV@FormattingPrep{\let\fv:color\empty
@@ -94,22 +94,12 @@
   \FV@SetLineNo%
   \def\FV@StepLineNo{\SkipRefstepAnchor\refstepcounter{FancyVerbLine}}%
   \FV@StepLineNo}
-\begingroup
-\catcode`\^^M=\active%
-\gdef\FVC@Verb#1{%
-  \begingroup%
-    \FV@UseKeyValues%
-    \let\a:fancyvrb\empty\FV@FormattingPrep%
-    \FV@CatCodes%
-    \outer\def^^M{}%
-    \catcode`#1=12%
-    \def\@tempa{\def\FancyVerbGetVerb####1####2}%
-    \expandafter\@tempa\string#1{\mbox{\a:verb##2\b:verb}\endgroup}%
-    \FancyVerbGetVerb\FV@EOL}%
-\endgroup
-\def\FV@UseVerb#1{\mbox{\FV@UseKeyValues%
+\pend:defI\FVC@Verb{\bgroup\let\a:fancyvrb\empty\a:verb}
+\append:defI\FVC@Verb{\b:verb\egroup}
+\def\:tempa#1{\mbox{\FV@UseKeyValues%
    \let\a:fancyvrb\empty \FV@FormattingPrep%
    \a:verb #1\b:verb}}
+\HLet\:tempa\FV@UseVerb
 \def\:fvcolor#1{\def\a:color##1##2!*?: {%
    \Configure{SetHColor}#1{##1}}}%
 \define@key{FV}{framerule}{%