avoid old font patching, tex4ht r435

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

11 files changed, 77 insertions, 233 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht
index 13c44d3f67a..1cb477b8e43 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/amsart.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% amsart.4ht                            2018-06-12-16:01 %
+% amsart.4ht                            2018-10-20-15:45 %
 % Copyright (C) 1997-2009       Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -219,27 +219,6 @@ A script of the form
    \egroup \let\maketitle\empty}
 
 
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?: 
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\ifx \csname #1 \endcsname\relax\else
-     \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}%
-  \fi
-}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-
-\fi
-
 \ifx \deferred@thm@head\:UnDef\else
    \ifx \deferred@thm@head\:UnDef\else
    \expandafter\dth@everypar\expandafter{%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht
index 122d0df20c1..1d89baa27ae 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/amsbook.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% amsbook.4ht                           2018-06-12-16:01 %
+% amsbook.4ht                           2018-10-20-15:45 %
 % Copyright (C) 1997-2009       Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -238,27 +238,6 @@ A script of the form
    \egroup \let\maketitle\empty}
 
 
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?: 
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\ifx \csname #1 \endcsname\relax\else
-     \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}%
-  \fi
-}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-
-\fi
-
 \ifx \deferred@thm@head\:UnDef\else
    \ifx \deferred@thm@head\:UnDef\else
    \expandafter\dth@everypar\expandafter{%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht
index 0a4b40732be..153a865894a 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/amsproc.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% amsproc.4ht                           2018-06-12-16:01 %
+% amsproc.4ht                           2018-10-20-15:45 %
 % Copyright (C) 1997-2009       Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -217,27 +217,6 @@ A script of the form
 
 \pend:defII\@starttoc{\par}
 
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?: 
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\ifx \csname #1 \endcsname\relax\else
-     \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}%
-  \fi
-}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-
-\fi
-
 \ifx \deferred@thm@head\:UnDef\else
    \ifx \deferred@thm@head\:UnDef\else
    \expandafter\dth@everypar\expandafter{%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/article.4ht b/Master/texmf-dist/tex/generic/tex4ht/article.4ht
index a643f183187..7d712944200 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/article.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/article.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% article.4ht                           2018-06-12-16:01 %
+% article.4ht                           2018-10-20-15:45 %
 % Copyright (C) 1997-2009       Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -201,27 +201,6 @@ UnDFexyz}%
 \ifx \@openbib@code\:UnDef \else
  \pend:def\@openbib@code{\labelsep\z@}
 \fi
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?: 
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\ifx \csname #1 \endcsname\relax\else
-     \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}%
-  \fi
-}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-
-\fi
-
 \ifx \part\:UnDef\else
    \def\@part[#1]#2{%
     \ifnum \c@secnumdepth >-2\relax
diff --git a/Master/texmf-dist/tex/generic/tex4ht/book.4ht b/Master/texmf-dist/tex/generic/tex4ht/book.4ht
index 9a7d351c3d6..982e215a0e2 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/book.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/book.4ht
@@ -1,4 +1,4 @@
-% book.4ht                             2018-06-12-16:01 %
+% book.4ht                             2018-10-20-15:45 %
 % Copyright (C) 1997-2009      Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -128,27 +128,6 @@ UnDFexyz}%
 \ifx \@openbib@code\:UnDef \else
  \pend:def\@openbib@code{\labelsep\z@}
 \fi
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?: 
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\ifx \csname #1 \endcsname\relax\else
-     \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}%
-  \fi
-}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-
-\fi
-
 \ifx \part\:UnDef\else
    \def\@part[#1]#2{%
     \ifnum \c@secnumdepth >-2\relax
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht
index 2779bb4cb3d..8bed042d426 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mwart.4ht                             2018-06-12-16:01 %
+% mwart.4ht                             2018-10-20-15:45 %
 % Copyright (C) 2003-2009       Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -85,26 +85,28 @@ A script of the form
 \NewConfigure{quotation}{1}
 \NewConfigure{listof}{6}
 
-\ifx \@openbib@code\:UnDef \else
- \pend:def\@openbib@code{\labelsep\z@}
-\fi
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?:
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
 
-\fi
+% We removed this code from base class declarations, so we can disable it here as well
+% \ifx \@openbib@code\:UnDef \else
+%  \pend:def\@openbib@code{\labelsep\z@}
+% \fi
+% \def\:temp#1#2!*?: {\def\:temp{#1}}
+% \expandafter\:temp\usepackage!*?:
+% \def\:tempa{\@latex@e@error}
+% \ifx \:temp\:tempa \else
+%    \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
+%    \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
+%         {\expandafter\noexpand
+%    \csname o:\expandafter\:gobble\string #3:\endcsname}}}
+% \def\:temp#1{%
+%   \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
+% \:temp{rm}
+% \:temp{sf}
+% \:temp{tt}
+% \:temp{bf}
+% \:temp{it}
+
+% \fi
 
   \let\:tempc\listoffigures
 \pend:def\:tempc{\begingroup \a:listoffigures
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht
index 124231aa239..16462b9880d 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mwbk.4ht                              2018-06-12-16:01 %
+% mwbk.4ht                              2018-10-20-15:45 %
 % Copyright (C) 2003-2009       Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -85,26 +85,28 @@ A script of the form
 \NewConfigure{quotation}{1}
 \NewConfigure{listof}{6}
 
-\ifx \@openbib@code\:UnDef \else
- \pend:def\@openbib@code{\labelsep\z@}
-\fi
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?:
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
 
-\fi
+% We removed this code from base class declarations, so we can disable it here as well
+% \ifx \@openbib@code\:UnDef \else
+%  \pend:def\@openbib@code{\labelsep\z@}
+% \fi
+% \def\:temp#1#2!*?: {\def\:temp{#1}}
+% \expandafter\:temp\usepackage!*?:
+% \def\:tempa{\@latex@e@error}
+% \ifx \:temp\:tempa \else
+%    \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
+%    \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
+%         {\expandafter\noexpand
+%    \csname o:\expandafter\:gobble\string #3:\endcsname}}}
+% \def\:temp#1{%
+%   \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
+% \:temp{rm}
+% \:temp{sf}
+% \:temp{tt}
+% \:temp{bf}
+% \:temp{it}
+
+% \fi
 
   \let\:tempc\listoffigures
 \pend:def\:tempc{\begingroup \a:listoffigures
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht
index 3683b1cf16e..12adda81fa9 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% mwrep.4ht                             2018-06-12-16:01 %
+% mwrep.4ht                             2018-10-20-15:45 %
 % Copyright (C) 2003-2009       Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -85,26 +85,28 @@ A script of the form
 \NewConfigure{quotation}{1}
 \NewConfigure{listof}{6}
 
-\ifx \@openbib@code\:UnDef \else
- \pend:def\@openbib@code{\labelsep\z@}
-\fi
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?:
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
 
-\fi
+% We removed this code from base class declarations, so we can disable it here as well
+% \ifx \@openbib@code\:UnDef \else
+%  \pend:def\@openbib@code{\labelsep\z@}
+% \fi
+% \def\:temp#1#2!*?: {\def\:temp{#1}}
+% \expandafter\:temp\usepackage!*?:
+% \def\:tempa{\@latex@e@error}
+% \ifx \:temp\:tempa \else
+%    \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
+%    \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
+%         {\expandafter\noexpand
+%    \csname o:\expandafter\:gobble\string #3:\endcsname}}}
+% \def\:temp#1{%
+%   \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
+% \:temp{rm}
+% \:temp{sf}
+% \:temp{tt}
+% \:temp{bf}
+% \:temp{it}
+
+% \fi
 
   \let\:tempc\listoffigures
 \pend:def\:tempc{\begingroup \a:listoffigures
diff --git a/Master/texmf-dist/tex/generic/tex4ht/report.4ht b/Master/texmf-dist/tex/generic/tex4ht/report.4ht
index be10a5402a1..360aa8b0159 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/report.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/report.4ht
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% report.4ht                           2018-06-12-16:01 %
+% report.4ht                           2018-10-20-15:45 %
 % Copyright (C) 1997-2009      Eitan M. Gurari         %
 % Copyright 2009-2018 TeX Users Group
 %
@@ -242,27 +242,6 @@ UnDFexyz}%
 \ifx \@openbib@code\:UnDef \else
  \pend:def\@openbib@code{\labelsep\z@}
 \fi
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?: 
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-   \csname o:\expandafter\:gobble\string #3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\ifx \csname #1 \endcsname\relax\else
-     \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}%
-  \fi
-}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-
-\fi
-
 \ifx \part\:UnDef\else
    \def\@part[#1]#2{%
     \ifnum \c@secnumdepth >-2\relax
diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht
index 7e89a125868..3760d6186f0 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/scrartcl.4ht
@@ -1,6 +1,6 @@
-% scrartcl.4ht (2015-02-07-15:56), generated from tex4ht-4ht.tex
+% scrartcl.4ht (2018-10-20-15:45), generated from tex4ht-4ht.tex
 % Copyright 1999-2009 Eitan M. Gurari
-% Copyright 2009-2015 TeX Users Group
+% Copyright 2009-2018 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -17,26 +17,8 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2015-02-07-15:56}
+\immediate\write-1{version 2018-10-20-15:45}
 
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?:
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\popthree#1#2#3#4{#4}
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-  \csname o:\expandafter\expandafter\:gobble\expandafter\string \popthree#3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-
-\fi
 
 \input article.4ht
 \Def:Section\minisec{}{#1}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht b/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
index 8bf45fc6f21..a6201760bb6 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/scrreprt.4ht
@@ -1,4 +1,4 @@
-% scrreprt.4ht (2018-06-12-16:01), generated from tex4ht-4ht.tex
+% scrreprt.4ht (2018-10-20-15:45), generated from tex4ht-4ht.tex
 % Copyright (C) 1999-2009 Eitan M. Gurari
 % Copyright 2009-2018 TeX Users Group
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2018-06-12-16:01}
+\immediate\write-1{version 2018-10-20-15:45}
 
 \let\o:maketitle:\maketitle
 \def\maketitle{\bgroup
@@ -250,24 +250,6 @@ UnDFexyz}%
 \ifx \@openbib@code\:UnDef \else
  \pend:def\@openbib@code{\labelsep\z@}
 \fi
-\def\:temp#1#2!*?: {\def\:temp{#1}}
-\expandafter\:temp\usepackage!*?:
-\def\:tempa{\@latex@e@error}
-\ifx \:temp\:tempa \else
-   \def\popthree#1#2#3#4{#4}
-   \def\:tempa#1#2#3#4{\tmp:toks{#1{#2}}%
-   \long\expandafter\edef\csname #4 \endcsname{\the\tmp:toks
-        {\expandafter\noexpand
-  \csname o:\expandafter\expandafter\:gobble\expandafter\string \popthree#3:\endcsname}}}
-\def\:temp#1{%
-  \expandafter\expandafter\expandafter\:tempa\csname #1 \endcsname{#1}}
-\:temp{rm}
-\:temp{sf}
-\:temp{tt}
-\:temp{bf}
-\:temp{it}
-
-\fi
 
   \let\:tempc\listoffigures
 \pend:def\:tempc{\begingroup \a:listoffigures