From c65a2764ea12c27b64d8714c2865e547e3646de2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Oct 2020 21:00:44 +0000 Subject: omit left quotes when trying to find .4ht files, tex4ht r811 git-svn-id: svn://tug.org/texlive/trunk@56679 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht | 14 ++++++++------ Master/texmf-dist/tex/generic/tex4ht/docbook.4ht | 15 +++++++++------ Master/texmf-dist/tex/generic/tex4ht/html0.4ht | 18 +++++++++++------- Master/texmf-dist/tex/generic/tex4ht/html32.4ht | 20 ++++++++++++-------- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 14 ++++++++------ Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht | 14 ++++++++------ Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht | 18 +++++++++++------- Master/texmf-dist/tex/generic/tex4ht/ooimpress.4ht | 16 ++++++++++------ Master/texmf-dist/tex/generic/tex4ht/tei.4ht | 15 +++++++++------ 9 files changed, 86 insertions(+), 58 deletions(-) diff --git a/Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht index 75fede1ee10..f365d58d732 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/cond4ht.4ht @@ -14,7 +14,7 @@ % \AddFile{1}{latex} \AddFile{2}{article} % \AddFile{5}{amsmath} \AddFile{2}{report} ... -% cond4ht.4ht (2019-11-07-15:48), generated from tex4ht-cond4ht.tex +% cond4ht.4ht (2020-10-16-13:47), generated from tex4ht-cond4ht.tex % Copyright 2009-2019 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -33,7 +33,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2019-11-07-15:48} +\immediate\write-1{version 2020-10-16-13:47} \ifx \BREAK\UnDef @@ -338,19 +338,21 @@ it an explicitly check. On the other hand, we should avoid duplications. \fi% \Hinclude{\input #1.4ht}{fontmath} |<*.4ht out of order|> +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude diff --git a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht index 264a28069be..974f4b76279 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht @@ -1,4 +1,4 @@ -% docbook.4ht (2020-06-23-13:57), generated from tex4ht-docbook.tex +% docbook.4ht (2020-10-16-13:47), generated from tex4ht-docbook.tex % Copyright 2009-2019 TeX Users Group % Copyright 2000-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-06-23-13:57} +\immediate\write-1{version 2020-10-16-13:47} \exit:ifnot{Preamble,% algorithmic,% @@ -277,19 +277,21 @@ switches of tex4ht.c) \no:dupl{colortbl}{\input colortbl.4ht}% }{}}{colortbl} +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -5512,6 +5514,7 @@ version="5.0" \Hnewline + \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/html0.4ht b/Master/texmf-dist/tex/generic/tex4ht/html0.4ht index 2a639b41333..ec11fa49e37 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html0.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html0.4ht @@ -1,4 +1,4 @@ -% html0.4ht (2020-02-18-14:18), generated from tex4ht-html0.tex +% html0.4ht (2020-10-16-13:48), generated from tex4ht-html0.tex % Copyright (C) 2009-2016 TeX Users Group % Copyright (C) 1996-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-02-18-14:18} +\immediate\write-1{version 2020-10-16-13:48} \exit:ifnot{Preamble,% aa,% @@ -292,19 +292,21 @@ vanilla} \no:dupl{colortbl}{\input colortbl.4ht}% }{}}{colortbl} +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -1529,6 +1531,7 @@ vanilla} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{vanilla} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1614,7 +1617,6 @@ vanilla} - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1884,6 +1886,7 @@ vanilla} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1978,6 +1981,7 @@ vanilla} + \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/html32.4ht b/Master/texmf-dist/tex/generic/tex4ht/html32.4ht index af9a521548e..0cde51de1b8 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html32.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html32.4ht @@ -1,4 +1,4 @@ -% html32.4ht (2020-02-18-14:18), generated from tex4ht-html32.tex +% html32.4ht (2020-10-16-13:48), generated from tex4ht-html32.tex % Copyright (C) 2009-2016 TeX Users Group % Copyright (C) 1997-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-02-18-14:18} +\immediate\write-1{version 2020-10-16-13:48} \exit:ifnot{CJK,% Preamble,% @@ -687,19 +687,21 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \no:dupl{colortbl}{\input colortbl.4ht}% }{}}{colortbl} +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -8660,6 +8662,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{vanilla} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8723,8 +8726,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ntheorem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8851,6 +8852,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -9369,6 +9371,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ProTex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -9631,6 +9634,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index fec7a152695..b9fabb4124e 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht @@ -1,4 +1,4 @@ -% html4.4ht (2020-09-28-13:52), generated from tex4ht-html4.tex +% html4.4ht (2020-10-16-13:48), generated from tex4ht-html4.tex % Copyright 2009-2020 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-09-28-13:52} +\immediate\write-1{version 2020-10-16-13:48} \exit:ifnot{8859-6,% CJK,% @@ -1795,19 +1795,21 @@ switches of tex4ht.c) \no:dupl{colortbl}{\input colortbl.4ht}% }{}}{colortbl} +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude diff --git a/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht index f08e912545d..b047bf473fe 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht @@ -11,7 +11,7 @@ % are strongly advised not to look at the code which follows % the copyright notice. % -% mktex4ht.4ht (2020-07-13-13:39), generated from cond4ht.4ht +% mktex4ht.4ht (2020-10-16-13:47), generated from cond4ht.4ht % Copyright 2009-2019 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -30,7 +30,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-07-13-13:39} +\immediate\write-1{version 2020-10-16-13:47} \def\infofiles{infoht4,infomml} @@ -509,19 +509,21 @@ it an explicitly check. On the other hand, we should avoid duplications. \no:dupl{colortbl}{\input colortbl.4ht}% }{}}{colortbl} +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht index e83b552ebb0..d044832f247 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht @@ -1,4 +1,4 @@ -% ooffice.4ht (2020-05-20-14:34), generated from tex4ht-ooffice.tex +% ooffice.4ht (2020-10-16-13:48), generated from tex4ht-ooffice.tex % Copyright 2009-2019 TeX Users Group % Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-05-20-14:34} +\immediate\write-1{version 2020-10-16-13:48} \exit:ifnot{Preamble,% algorithmicx,% @@ -773,19 +773,21 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew \no:dupl{colortbl}{\input colortbl.4ht}% }{}}{colortbl} +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -12767,7 +12769,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -12909,6 +12910,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{apacite} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -19140,6 +19142,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -19241,6 +19244,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{soul} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooimpress.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooimpress.4ht index fe6f63aaee0..8d0a7cdc7f5 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/ooimpress.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/ooimpress.4ht @@ -1,4 +1,4 @@ -% ooimpress.4ht (2020-02-18-14:19), generated from tex4ht-ooimpress.tex +% ooimpress.4ht (2020-10-16-13:48), generated from tex4ht-ooimpress.tex % Copyright (C) 2009-2010 TeX Users Group % Copyright (C) 2001-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-02-18-14:19} +\immediate\write-1{version 2020-10-16-13:48} \exit:ifnot{foils,% g-brief,% @@ -107,19 +107,21 @@ tex4ht} \no:dupl{colortbl}{\input colortbl.4ht}% }{}}{colortbl} +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -902,6 +904,8 @@ tex4ht} + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/tei.4ht b/Master/texmf-dist/tex/generic/tex4ht/tei.4ht index 0e0f7717630..0e68ada4b9e 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tei.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/tei.4ht @@ -1,4 +1,4 @@ -% tei.4ht (2020-07-10-09:05), generated from tex4ht-tei.tex +% tei.4ht (2020-10-16-13:49), generated from tex4ht-tei.tex % Copyright 2009-2019 TeX Users Group % Copyright 2000-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2020-07-10-09:05} +\immediate\write-1{version 2020-10-16-13:49} \exit:ifnot{Preamble,% amsart,% @@ -237,19 +237,21 @@ url} \no:dupl{colortbl}{\input colortbl.4ht}% }{}}{colortbl} +\def\:strip:quotes"#1"#2"#3\relax{\if .#1.#2\else #1\fi} \def\h:input#1.#2.#3!*?: {% - \:CheckOption{no_#1}\if:Option + \edef\:current:package{\:strip:quotes"#1""\relax} + \:CheckOption{no_\:current:package}\if:Option \let\:temp\empty \else \let\:temp\empty - \no:dupl{#1}{% + \no:dupl{\:current:package}{% \def\:warn:msg{} \:CheckOption{debug}\if:Option \def\:warn:msg{% - \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + \:warning{No configuration file for \:current:package.\if .#2.tex\else #2\fi}% } \fi% - \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% + \def\:temp{\input:if:fileexists{\:current:package.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -1957,6 +1959,7 @@ url} + \endinput -- cgit v1.2.3