From 1d6bc7d398b4f598eda91dac5ca947bb3179b826 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 22 Sep 2021 21:28:10 +0000
Subject: clash between Spanish Babel and MathML, tex4ht r984

git-svn-id: svn://tug.org/texlive/trunk@60584 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/generic/tex4ht/ChangeLog  |  5 ++++
 .../source/generic/tex4ht/tex4ht-4ht.tex           | 33 ++++++++++++++++------
 Master/texmf-dist/tex/generic/tex4ht/spanish.4ht   | 12 ++++----
 3 files changed, 36 insertions(+), 14 deletions(-)

(limited to 'Master/texmf-dist')

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index d4d252102dc..0d7635ed262 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,8 @@
+2021-09-22  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (spanish.4ht): fix for clash between Spanish Babel and
+	MathML configurations.
+
 2021-09-17  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): fixed support for floating listings.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 0eb73250a3c..ed4649929da 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 976 2021-08-24 14:28:48Z michal_h21 $
+% $Id: tex4ht-4ht.tex 984 2021-09-22 10:29:30Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2021 TeX Users Group    
@@ -23760,6 +23760,8 @@ The following is for code such as
  input `a:' and `a :', but for `a~:' TeX4ht introduces _2_ unbreakable
  spaces instead of one.=
 
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \Section{german.sty}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38562,14 +38564,18 @@ Declarationf for Cyrillics characters are loaded with XeLaTeX
 \endinput
 >>>                        \AddFile{9}{slovene}
 
-\<spanish.4ht\><<<
-% spanish.4ht (|version), generated from |jobname.tex
-% Copyright |CopyYear.2000. Eitan M. Gurari
-|<TeX4ht copywrite|>
-  |<spanish defs|>
-\Hinput{spanish}
-\endinput
->>>                        \AddFile{9}{spanish}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\Section{spanish.ldf}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\<spanish.4ht\><<< 
+% spanish.4ht (|version), generated from |jobname.tex 
+% Copyright 2021 TeX Users Group 
+|<TeX4ht license text|> 
+|<spanish defs|>
+\Hinput{spanish} 
+\endinput 
+>>> \AddFile{9}{spanish}
 
 The following is needed to compensate for the extra \''\relax\space' in
 \''\def\protect##1{\string\protect\string##1\relax\space}'.
@@ -38694,6 +38700,15 @@ The following is needed to compensate for the extra \''\relax\space' in
 }
 >>>
 
+This is necessary to fix clash between mathml option and some definitions
+in Spanish babel.
+
+\<spanish defs\><<<
+\let\orig:nolimits\nolimits
+\let\nolimits\o:nolimits:
+\AtBeginDocument{\let\nolimits\orig:nolimits}
+>>>
+
 % \def\@text@composite#1#2#3\@text@composite{%
 %    \writesixteen{....\string#1-\string#2...\expandafter
 %                      \meaning\csname\string#1-\string#2\endcsname}%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/spanish.4ht b/Master/texmf-dist/tex/generic/tex4ht/spanish.4ht
index 8d7c9585638..1284bfa5b3f 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/spanish.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/spanish.4ht
@@ -1,6 +1,5 @@
-% spanish.4ht (2021-05-09-08:03), generated from tex4ht-4ht.tex
-% Copyright 2000-2009 Eitan M. Gurari
-% Copyright 2009-2021 TeX Users Group
+% spanish.4ht (2021-09-22-13:59), generated from tex4ht-4ht.tex
+% Copyright 2021 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,9 +16,9 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-05-09-08:03}
+\immediate\write-1{version 2021-09-22-13:59}
 
-  \expandafter\def\csname spanish:"shorthand\endcsname
+\expandafter\def\csname spanish:"shorthand\endcsname
                #1{\leavevmode \hbox{\csname a:spanish"#1\endcsname}}
 \edef\:temp{\expandafter\noexpand
                \csname spanish:"shorthand\endcsname\space a}
@@ -106,6 +105,9 @@
    \def\bbl@umlauta{\ifx \EndPicture \:UnDef \expandafter \n:bbl@umlauta:
                     \else \expandafter \o:bbl@umlauta: \fi }%
 }
+\let\orig:nolimits\nolimits
+\let\nolimits\o:nolimits:
+\AtBeginDocument{\let\nolimits\orig:nolimits}
 
 \Hinput{spanish}
 \endinput
-- 
cgit v1.2.3