CTAN sync 202409300304

7 files changed, 96 insertions, 44 deletions

diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index e836a359a1..ac5e6828e3 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,21 @@
+2024-09-27  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-html4.tex (html4-math.4ht),
+	* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): enclose math elements
+	in MathJax in HTML tags.
+	https://tex.stackexchange.com/a/727413/2891
+
+	* tex4ht-html4.tex (html4-math.4ht): don't add link to the MathJax
+	script if the address is empty.
+
+2024-09-26  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (fancyvrb.4ht): fixed support for background
+	colors.
+
+	* tex4ht-4ht.tex (minted.4ht): removed minted@colorbg env, to fix
+	support for Minted 3.0.
+
 2024-09-24  Karl Berry  <karl@freefriends.org>
 
 	* wripro.tex: copyright 2024.
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index ca3a61c56a..c24839ec9e 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1557 2024-09-23 12:20:56Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1560 2024-09-26 14:25:58Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2024 TeX Users Group    
@@ -26194,7 +26194,9 @@ See \Link[://github.com/michal-h21/make4ht/issues/141]{}{}this issue\EndLink.
   \ifx \fv:color\empty \else{%
      \let\HColor\fv:color \a:fancyvrbcolor%
   }\fi
-  \ifx \FancyVerbFillColor\relax \else%
+  \ifx \FancyVerbFillColor\relax \ifx\FancyVerbBackgroundColor\relax\else%
+     \:fvcolor \b:fancyvrbcolor \color{\FancyVerbBackgroundColor}|<par del|>%
+  \fi\else%
      \:fvcolor \b:fancyvrbcolor \FancyVerbFillColor|<par del|>%
   \fi
   \ifx \FancyVerbRuleColor\relax \else%
@@ -26340,12 +26342,11 @@ of LaTeX.  The \''\:gobbleII' is for getting rid of the
 
 \<minted.4ht\><<<
 % minted.4ht (|version), generated from |jobname.tex
-% Copyright 2022 TeX Users Group
+% Copyright 2022-2024 TeX Users Group
 |<TeX4ht license text|>
 
 |<minted inline fixes|>
 |<minted background color|>
-|<minted background color|>
 |<minted input fixes|>
 
 \Hinput{minted}
@@ -26380,9 +26381,18 @@ in the generated HTML.
 \HLet\minted@inline@iii\:tempa
 >>>
 
+Minted 3.0 changed the way it works with the background color. 
+It now uses Fancyvrb, so the minted@colorbg environment is not used anymore. 
+We need to remove the redefinition, to prevent compilation error. 
+The MintedColorbg configuration can stay here, to prevent errors in 
+user config files that use it, but it doesn't have any effect.
+
 \<minted background color\><<<
 % support for background color in Minted listings
 \NewConfigure{MintedColorbg}{2}
+>>>
+
+\<minted background color not used\><<<
 \renewenvironment{minted@colorbg}[1]{%
   \colorlet{shadecolor}{#1}%
   \extractcolorspec{shadecolor}{\:tempa}%
diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex
index 60ddfad048..d49bd8ba26 100644
--- a/support/TeX4ht/source/tex4ht-html4.tex
+++ b/support/TeX4ht/source/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1552 2024-09-09 14:48:03Z michal_h21 $
+% $Id: tex4ht-html4.tex 1563 2024-09-27 17:12:56Z karl $
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
@@ -73,7 +73,7 @@
 
 \<html4-math\><<<
 % html4-math.4ht (|version), generated from |jobname.tex
-% Copyright 2009-2023 TeX Users Group
+% Copyright 2009-2024 TeX Users Group
 % Copyright |CopyYear.1999. Eitan M. Gurari
 |<TeX4ht copywrite|>
 >>>
@@ -8790,16 +8790,22 @@ The hbox is for avoiding the start of a new paragraph, if in vmode.
 };
 }
 \fi
+\NewConfigure{MathjaxInline}{2}
+\NewConfigure{MathjaxBlock}{2}
+\Configure{MathjaxInline}{\HCode{<span class="mathjax-inline">}}{\HCode{</span>}}
+\Configure{MathjaxBlock}{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="mathjax-block">}}{\HCode{</div>}}
+\Configure{MathjaxEnv}{\ifvmode\IgnorePar\fi\EndP\HCode{<div class="mathjax-env mathjax-\@currenvir">}}{\HCode{</div>}}
+
 \Configure{@HEAD}{\HCode{<script>window.MathJax = \a:MathJaxConfig</script>\Hnewline}}
 \Configure{MathjaxSource}{https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml-full.js}
-\Configure{@HEAD}{\HCode{ <script type="text/javascript" async="async" id="MathJax-script" src="\a:MathjaxSource"></script> \Hnewline}}
+\Configure{@HEAD}{\ifx\a:MathjaxSource\@empty\else\HCode{<script type="text/javascript" async="async" id="MathJax-script" src="\a:MathjaxSource"></script> \Hnewline}\fi}
 \edef\:RestoreMathjaxCatcodes{\catcode`\noexpand \&=\the\catcode`\&}
 \def\:HandleMathjaxCatcodes{\edef\:RestoreMathjaxCatcodes{\catcode`\noexpand \&=\the\catcode`\&}\catcode`\&=11}
-\Configure{$}{\:HandleMathjaxCatcodes}{\:RestoreMathjaxCatcodes}{\expandafter\AltMathOne}
-\Configure{$$}{\:HandleMathjaxCatcodes}{\:RestoreMathjaxCatcodes}{\expandafter\AltlDisplayDollars}
-% for some reason, it is necessary to specify the catcode change directly in the configuration
-\Configure{()}{\:HandleMathjaxCatcodes\catcode`\&=11\AltlMath}{\:RestoreMathjaxCatcodes}
-\Configure{[]}{\:HandleMathjaxCatcodes\catcode`\&=11\AltlDisplay}{\:RestoreMathjaxCatcodes}
+\Configure{$}{\a:MathjaxInline\:HandleMathjaxCatcodes}{\:RestoreMathjaxCatcodes\b:MathjaxInline}{\expandafter\AltMathOne}
+\Configure{()}{\a:MathjaxInline\:HandleMathjaxCatcodes\catcode`\&=11\AltlMath}{\:RestoreMathjaxCatcodes\b:MathjaxInline}
+\Configure{$$}{\a:MathjaxBlock\:HandleMathjaxCatcodes}{\:RestoreMathjaxCatcodes\b:MathjaxBlock}{\expandafter\AltlDisplayDollars}
+\Configure{[]}{\a:MathjaxBlock\:HandleMathjaxCatcodes\catcode`\&=11\AltlDisplay}{\:RestoreMathjaxCatcodes\b:MathjaxBlock}
+
 \fi
 >>>
 
diff --git a/support/TeX4ht/source/tex4ht-mathjax.tex b/support/TeX4ht/source/tex4ht-mathjax.tex
index 56c53e3698..90d4498dc1 100644
--- a/support/TeX4ht/source/tex4ht-mathjax.tex
+++ b/support/TeX4ht/source/tex4ht-mathjax.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathjax.tex 1554 2024-09-11 13:41:52Z michal_h21 $
+% $Id: tex4ht-mathjax.tex 1562 2024-09-27 11:07:49Z michal_h21 $
 % compile: latex tex4ht-mathjax
 %
 % Copyright 2018-2024 TeX Users Group
@@ -131,10 +131,14 @@ environments. They will then keep the LaTeX code unchanged.
 % beginning of each display math
 \long\def\AltlDisplayDollars#1$${\alteqtoks{\[#1\]}$$}
 
+\NewConfigure{MathjaxEnv}{2}
+
 \newcommand\VerbMathToks[2]{%
+  \a:MathjaxEnv%
   \HCode{\string\begin{#2}}%
     \alteqtoks{#1}%
   \HCode{\string\end{#2}}%
+  \b:MathjaxEnv%
 }
 >>>
 
diff --git a/support/texshop/README.txt b/support/texshop/README.txt
index c48dab2cd5..2bc351e58a 100644
--- a/support/texshop/README.txt
+++ b/support/texshop/README.txt
@@ -7,4 +7,4 @@ The main author is Richard Koch, koch@uoregon.edu, with supporting contributions
 Consult the program web site, https://pages.uoregon.edu/koch/texshop/texshop.html,
 for full source code, an extensive Changes document, and other information.
 
-The current version, 5.44, was released on September 12, 2024.
\ No newline at end of file
+The current version, 5.46, was released on September 25, 2024.
\ No newline at end of file
diff --git a/support/texshop/texshop544.html b/support/texshop/texshop544.html
deleted file mode 100644
index 71cd7ca483..0000000000
--- a/support/texshop/texshop544.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>TeXShop</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-</head>
-
-<body>
-
-
-<!-- main content -->
-<div id="main">
-
-Version 5.43 was never released. Version 5.44 has two minor changes listed below. In addition, version 5.44  supports Writing Tools, an important component of Apple Intelligence on macOS 15, Sequoia. 
-<ul>
-<p><li> Holding down the option key while selecting the Typeset menu, or holding down option-command-T, erases aux files and then typesets. This behavior has been extended to the Typeset icon in the toolbar; holding down the option key and clicking this icon now erases aux files and then typesets.
-<p><li> The tab menu in the toolbar lists the beginnings of chapters, sections, subsections, and so forth; selecting an item in this menu takes you to the corresponding spot in the source file. This menu is supposed to be updated as the user edits the source file. Curiously, a bug prevented this update if the toolbar was in "Text Only" mode. This bug went unreported for perhaps twenty years. Now it is fixed.
-
-<p> TeXShop has a preference setting which creates a Tags menu in the main menu bar, duplicating the Tags menu in the toolbar. The bug also affected this menu bar item. I am unable to fix this second bug without risking performance issues for the editor. However, if both tags menus are visible and the menu bar version becomes out of date, using the toolbar version  once will update both versions.  
-</ul>
-
-
-<p>
-<p>
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/support/texshop/texshop546.html b/support/texshop/texshop546.html
new file mode 100644
index 0000000000..75d6cce3a7
--- /dev/null
+++ b/support/texshop/texshop546.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>TeXShop</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+</head>
+
+<body>
+
+
+<!-- main content -->
+<div id="main">
+
+Version 5.45 was never released. Version 5.46 fixes a few minor problems that crept into version 5.44.
+<ul>
+<p><li> In the English localization, the Edit Menu item "Paste As Comment" was changed to
+"Paste and Match Style". This is now fixed. 
+<p><li> Keyboard shortcuts for menu commands are a programming nightmare because keyboards
+are not standard across the globe. This is particularly true for unusual characters like
+{, }, [, ],  /, \. Consequently a shortcut which is convenient in English may be awkward in another language. The Macintosh automatically modifies some shortcuts for different keyboards, but I have no idea
+where these modifications are documented.
+
+<p>
+Apple allows users to assign their own shortcuts to  menu commands using System Settings and  the keyboard module, so I generally refuse to introduce new shortcuts or modify old ones.
+
+<p> In TeXShop 5.44, the keyboard shortcut for "comment" in the English localization was switched from command-{ to command-/. This is fixed and the shortcuts for "comment" and "uncomment" are again command-{ and command-}. These shortcuts work on earlier systems and on the release version of Sequoia.
+
+<p> The current beta of Sequoia with Apple Intelligence changes command-{ to command-/. Let us hope this is fixed before the update is released.
+<p> All of this applies only to the English localization. I left other localizations unchanged because I have no way to determine what Sequoia used with an unusual keyboard will do.
+
+<p><li> The keyboard shortcuts "command +" and "command -" enlarge or shrink the contents of the source window 
+in both Single Window mode and Double Window mode. The keyboard shortcuts "shift-command +" and
+"shift-command -" similarly enlarge or shrink the contents of the preview window in both Single Window mode
+and Double Window mode. In previous versions of TeXShop, the shortcuts "command +" and "command -" could also be used to enlarge or shrink the preview window when it was the active window, so two different sets of commands could be used with the Preview Window. This is no longer possible in TeXShop 5.46 because it interfered with  annotation features introduced this summer.
+</ul>  
+
+<p>
+<p>
+</div>
+
+
+</body>
+</html>
\ No newline at end of file