wrap \special; nbsp \ifx, listings \Picture support, tex4ht r908-914

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

8 files changed, 48 insertions, 54 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/babel.4ht b/Master/texmf-dist/tex/generic/tex4ht/babel.4ht
index d67deb27e37..d4fad8f6a33 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/babel.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/babel.4ht
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% babel.4ht                             2019-07-10-13:21 %
+% babel.4ht                             2021-04-25-09:48 %
 % Copyright (C) 1999-2009       Eitan M. Gurari         %
-% Copyright 2009-2019 TeX Users Group
+% Copyright 2009-2021 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -62,7 +62,7 @@
 \Configure{quotesinglbase}{\o:quotesinglbase:}
 
 \def\arabic:loopoverdigits#1{\ifx\relax#1\else%
-\special{t4ht@+&{35}x066#1{59}}x%
+\ht:special{t4ht@+&{35}x066#1{59}}\a:HChar%
 \expandafter\arabic:loopoverdigits\fi}
 \def\arabicdigits#1{\arabic:loopoverdigits#1\relax}
 
@@ -79,8 +79,8 @@
 \HLet\DDJ@=\:tempc
 \NewConfigure{ddj}{1}
 \NewConfigure{DDJ}{1}
-\Configure{DDJ}{\leavevmode\ht:special{t4ht@+{38}{35}x0110;}x}
-\Configure{ddj}{\leavevmode\ht:special{t4ht@+{38}{35}x0111;}x}
+\Configure{DDJ}{\leavevmode\ht:special{t4ht@+{38}{35}x0110;}\a:HChar}
+\Configure{ddj}{\leavevmode\ht:special{t4ht@+{38}{35}x0111;}\a:HChar}
 
 \Hinput{babel}
 \endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
index 7102f0cdca5..3ba0b95b3fb 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
@@ -1,4 +1,4 @@
-% latex.4ht (2021-02-06-14:21), generated from tex4ht-4ht.tex
+% latex.4ht (2021-04-25-09:48), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
 % Copyright 2009-2021 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-02-06-14:21}
+\immediate\write-1{version 2021-04-25-09:48}
 
 \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi
 
@@ -206,7 +206,7 @@
   %  load tuenc definitions for commands like \quotedblbase
   \ifdefined\old:DeclareTextSymbol\else
     \input binhex
-    \def\DeclareTextSymbol#1#2#3{\gdef#1{\special{t4ht@+&{35}x\hex{#3}{59}}x}}
+    \def\DeclareTextSymbol#1#2#3{\gdef#1{\ht:special{t4ht@+&{35}x\hex{#3}{59}}\a:HChar}}
     \input tuenc.def
     \let\DeclareTextSymbol\old:DeclareTextSymbol
   \fi
@@ -1996,8 +1996,8 @@ $\vcenter
    \ifx \:temp\empty \let\a:sp\sp:c\else\def\a:sp{#1}\fi}
 \Configure{ }{\:nbsp}
 
-\def\:nbsp{\protect\leavevmode\special{t4ht@+\string&{35}x00A0{59}}x}
-\def\:ensp{\protect\leavevmode\special{t4ht@+\string&{35}x2002{59}}x}
+\def\:nbsp{\ifx\EndPicture\:UnDef\protect\leavevmode\ht:special{t4ht@+\string&{35}x00A0{59}}\a:HChar\else\leavevmode\nobreak\ \fi}
+\def\:ensp{\protect\leavevmode\ht:special{t4ht@+\string&{35}x2002{59}}\a:HChar}
 \let\nobreakspace\:nbsp
 
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht b/Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht
index b0690c76131..1be7d606c31 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/lfeenc.4ht
@@ -1,33 +1,25 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% lfeenc.4ht                             2009-05-21-09:32 %
-% Copyright (C) 2007--2009       Youssef Jabri               %
+% lfeenc.4ht                             2021-04-25-09:48 %
+% Copyright (C) 2007-2009       Youssef Jabri               %
 %                            Modified by Eitan M. Gurari %
-%                                                        %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3c of this license or (at your option) any   %
-% later version. The latest version of this license is   %
-% in                                                     %
-%   http://www.latex-project.org/lppl.txt                %
-% and version 1.3c or later is part of all distributions %
-% of LaTeX version 2005/12/01 or later.                  %
-%                                                        %
-% This work has the LPPL maintenance status "maintained".%
-%                                                        %
-% This Current Maintainer of this work                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-% If you modify this program your changing its signature %
-% with a directive of the following form will be         %
-% appreciated.                                           %
-%            \message{signature}                         %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{version 2009-05-21-09:32}
-
-  \long\def\ZWNJ{\noindent\ht:special{t4ht@+\string&{35}x200C;}x}
+% Copyright 2009-2021 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+  \long\def\ZWNJ{\noindent\ht:special{t4ht@+\string&{35}x200C;}\a:HChar}
 \Hinput{lfeenc}
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
index d504e4f6feb..e1157fb6575 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
@@ -1,4 +1,4 @@
-% listings.4ht (2021-04-22-13:52), generated from tex4ht-4ht.tex
+% listings.4ht (2021-04-25-09:48), generated from tex4ht-4ht.tex
 % Copyright 2001-2009 Eitan M. Gurari
 % Copyright 2009-2021 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-04-22-13:52}
+\immediate\write-1{version 2021-04-25-09:48}
 
 \def\lst@makecaption#1#2{\cptA: #1\if :#1:\else\cptB:\fi \cptC: #2\cptD:}
 
@@ -59,11 +59,12 @@
     \ifdefined\chapter\chapter*{\lstlistlistingname}\else\section*{\lstlistlistingname}\fi%
     \TableOfContents[lol]%
   \egroup}
-\def\lst@NewLine{%
+\def\:tempa{%
    \ifx\lst@OutputBox\@gobble\else \the\everypar \fi
    \global\advance\lst@newlines\m@ne
    \lst@newlinetrue
 }%
+\HLet\lst@NewLine\:tempa
 \def\lst@InputListing#1{%
     \begingroup
       \lsthk@PreSet \gdef\lst@intname{#1}%
@@ -78,7 +79,7 @@
       \b:lstinputlisting
     \endgroup}
 \NewConfigure{lstinputlisting}{2}
-\def\lst@Kern#1{%
+\def\:tempa#1{%
    \setbox\z@\hbox{{\lst@currstyle{\kern#1}}}%
    \global\advance\lst@currlwidth \wd\z@
    \tmp:dim=#1 \let\:tempc=\empty
@@ -89,6 +90,7 @@
    \repeat
    \setbox\z@\hbox{{\lst@currstyle{\:tempc}}}%
    \lst@OutputBox\z@}
+\HLet\lst@Kern\:tempa
 \NewConfigure{lst@Kern}{2}
 \Configure{lst@Kern}{0.499em}{0.1em}
 \def\lst@outputspace{\:nbsp}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/plain.4ht b/Master/texmf-dist/tex/generic/tex4ht/plain.4ht
index cc656d23f00..32522324617 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/plain.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/plain.4ht
@@ -1,4 +1,4 @@
-% plain.4ht (2021-02-06-14:21), generated from tex4ht-4ht.tex
+% plain.4ht (2021-04-25-09:48), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
 % Copyright 2009-2021 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-02-06-14:21}
+\immediate\write-1{version 2021-04-25-09:48}
 
 \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi
 
@@ -264,8 +264,8 @@
    \ifx \:temp\empty \let\a:sp\sp:c\else\def\a:sp{#1}\fi}
 \Configure{ }{\:nbsp}
 %
-\def\:nbsp{\leavevmode\special{t4ht@+\string&{35}x00A0{59}}x}
-\def\:ensp{\leavevmode\special{t4ht@+\string&{35}x2002{59}}x}
+\def\:nbsp{\ifx\EndPicture\:UnDef\leavevmode\ht:special{t4ht@+\string&{35}x00A0{59}}\a:HChar\else\leavevmode\nobreak\ \fi}
+\def\:ensp{\leavevmode\ht:special{t4ht@+\string&{35}x2002{59}}\a:HChar}
 \expandafter\let\csname  beginsection\endcsname\relax
 \NewSection\beginsection{}{}
 \let\begin:section\beginsection
diff --git a/Master/texmf-dist/tex/generic/tex4ht/polyglossia.4ht b/Master/texmf-dist/tex/generic/tex4ht/polyglossia.4ht
index de7dbf72c90..fd62a8b9a31 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/polyglossia.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/polyglossia.4ht
@@ -1,4 +1,4 @@
-% polyglossia.4ht (2020-10-05-15:32), generated from tex4ht-4ht.tex
+% polyglossia.4ht (2021-04-25-09:48), generated from tex4ht-4ht.tex
 % Copyright 2019 TeX Users Group
 %
 % This work may be distributed and/or modified under the
@@ -16,11 +16,11 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2020-10-05-15:32}
+\immediate\write-1{version 2021-04-25-09:48}
 
 \NewConfigure{PolyglossiaRtl}{2}
 \def\arabic:loopoverdigits#1{\ifx\relax#1\else%
-\special{t4ht@+&{35}x066#1{59}}x%
+\ht:special{t4ht@+&{35}x066#1{59}}\a:HChar%
 \expandafter\arabic:loopoverdigits\fi}
 \def\arabicdigits#1{\arabic:loopoverdigits#1\relax}
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tuenc-xetex-input.4ht b/Master/texmf-dist/tex/generic/tex4ht/tuenc-xetex-input.4ht
index 8191867dbde..c8507bf4293 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tuenc-xetex-input.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tuenc-xetex-input.4ht
@@ -16,7 +16,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2019-01-17-13:32}
+\immediate\write-1{version 2021-04-25-09:48}
 
 \input binhex
 
@@ -26,7 +26,7 @@
   \catcode#1=\active% make the character active
   \begingroup\lccode`\~=#1 % trick to define the character as a command
   % the code inside \special will be converted back to utf8 by tex4ht
-  \lowercase{\endgroup\protected\def~}{\special{t4ht@+&{35}x\hex{#1}{59}}x}
+  \lowercase{\endgroup\protected\def~}{\ht:special{t4ht@+&{35}x\hex{#1}{59}}\a:HChar}
 }
 
 % remove character definition
diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht
index cd10f1597a4..6a8b9e2b476 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht
@@ -1,4 +1,4 @@
-% unicode.4ht (2021-04-17-18:23), generated from tex4ht-unicode.tex
+% unicode.4ht (2021-04-25-09:48), generated from tex4ht-unicode.tex
 % Copyright 2009-2021 TeX Users Group
 % Copyright 1998-2009 Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-04-17-18:23}
+\immediate\write-1{version 2021-04-25-09:48}
 
 \exit:ifnot{8859-6,% 
 SIunits,% 
@@ -352,7 +352,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}%
 
 \def\textellipsis{\x:unicode{2026}}
 
-\def\:nbsp{\x:unicode{00A0}}
+\def\:nbsp{\ifx\EndPicture\:UnDef\protect\leavevmode\ht:special{t4ht@+\string&{35}x00A0{59}}\a:HChar\else\leavevmode\nobreak\ \fi}
 \:CheckOption{new-accents}     \if:Option \else
    \expand:after{\Configure{accent}}\csname T1\string\`\expandafter\endcsname
     \csname T1\string\`\endcsname{A{00C0}E{00C8}I{00CC}N{01F8}O{00D2}U{00D9}W{1E80}%