From c80b0e0dbb49b8f9c588ef542915deab63d486df Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 Mar 2020 21:28:05 +0000 Subject: (belated) \InputIfFileExists support, tex4ht r609 git-svn-id: svn://tug.org/texlive/trunk@54365 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/docbook.4ht | 75 +++++++++++++--------- Master/texmf-dist/tex/generic/tex4ht/html0.4ht | 56 +++++++++++----- Master/texmf-dist/tex/generic/tex4ht/html32.4ht | 62 ++++++++++++------ Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht | 55 ++++++++++------ Master/texmf-dist/tex/generic/tex4ht/ooimpress.4ht | 46 +++++++++---- Master/texmf-dist/tex/generic/tex4ht/tei.4ht | 48 ++++++++++---- 6 files changed, 228 insertions(+), 114 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht index 480f94cafa0..04e0f974e62 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 (2019-07-06-14:23), generated from tex4ht-docbook.tex +% docbook.4ht (2020-03-16-10:42), 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 2019-07-06-14:23} +\immediate\write-1{version 2020-03-16-10:42} \exit:ifnot{Preamble,% algorithmic,% @@ -258,6 +258,18 @@ switches of tex4ht.c) \fi } +\ifx\InputIfFileExists\UnDef% +\def\input:if:fileexists#1#2#3{% + \openin15 #1.4ht% + \ifeof15% + #3% + \else% + \input #1% + \fi\closein15% +}% +\else +\let\input:if:fileexists\InputIfFileExists% +\fi% \Hinclude{\input #1.4ht}{fontmath} \Hinclude{\@ifpackageloaded{colortbl}{% \no:dupl{array}{\input array.4ht}% @@ -271,16 +283,13 @@ switches of tex4ht.c) \else \let\:temp\empty \no:dupl{#1}{% - \openin15 #1.4ht - \ifeof15 - \:CheckOption{debug}\if:Option - \:warning{No configuration file for - #1.\if .#2.tex\else #2\fi}% - \fi - \let\:temp\empty - \else - \def\:temp{\input #1.4ht }% - \fi \closein15 + \def\:warn:msg{} + \:CheckOption{debug}\if:Option + \def\:warn:msg{% + \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + } + \fi% + \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -759,7 +768,7 @@ switches of tex4ht.c) \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -1073,7 +1082,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -1392,7 +1401,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -1687,14 +1696,13 @@ version="5.0" \Hnewline - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -1971,7 +1979,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -2247,7 +2255,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -2680,7 +2688,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -2740,7 +2748,6 @@ version="5.0" \Hnewline - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2947,6 +2954,7 @@ version="5.0" \Hnewline + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{index} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3010,7 +3018,6 @@ version="5.0" \Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{multind} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3101,6 +3108,9 @@ version="5.0" \Hnewline + + + @@ -3182,7 +3192,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -3447,7 +3457,6 @@ version="5.0" \Hnewline - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3935,7 +3944,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -4316,7 +4325,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -4620,7 +4629,7 @@ version="5.0" \Hnewline \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -4937,6 +4946,8 @@ version="5.0" \Hnewline + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{prosper} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4955,13 +4966,14 @@ version="5.0" \Hnewline %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{beamer} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\:gobbleM#1->{} \Configure{BODY} {\HCode{\Hnewline\Hnewline} \:CheckOption{-xtpipes} \if:Option \Log:Note{Use the `-xtpipes' command line option to @@ -5207,6 +5219,7 @@ version="5.0" \Hnewline + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5246,6 +5259,7 @@ version="5.0" \Hnewline + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5278,6 +5292,8 @@ version="5.0" \Hnewline + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{algorithmic} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5324,8 +5340,6 @@ version="5.0" \Hnewline - - @@ -5457,7 +5471,6 @@ 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 82008ecf573..2a639b41333 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 (2019-03-18-15:25), generated from tex4ht-html0.tex +% html0.4ht (2020-02-18-14:18), 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 2019-03-18-15:25} +\immediate\write-1{version 2020-02-18-14:18} \exit:ifnot{Preamble,% aa,% @@ -273,6 +273,18 @@ vanilla} \fi } +\ifx\InputIfFileExists\UnDef% +\def\input:if:fileexists#1#2#3{% + \openin15 #1.4ht% + \ifeof15% + #3% + \else% + \input #1% + \fi\closein15% +}% +\else +\let\input:if:fileexists\InputIfFileExists% +\fi% \Hinclude{\input #1.4ht}{fontmath} \Hinclude{\@ifpackageloaded{colortbl}{% \no:dupl{array}{\input array.4ht}% @@ -286,16 +298,13 @@ vanilla} \else \let\:temp\empty \no:dupl{#1}{% - \openin15 #1.4ht - \ifeof15 - \:CheckOption{debug}\if:Option - \:warning{No configuration file for - #1.\if .#2.tex\else #2\fi}% - \fi - \let\:temp\empty - \else - \def\:temp{\input #1.4ht }% - \fi \closein15 + \def\:warn:msg{} + \:CheckOption{debug}\if:Option + \def\:warn:msg{% + \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + } + \fi% + \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -1049,6 +1058,7 @@ vanilla} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{graphics} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1078,6 +1088,7 @@ vanilla} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1090,6 +1101,7 @@ vanilla} \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsbook} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1124,7 +1136,6 @@ vanilla} - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsppt} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1137,6 +1148,7 @@ vanilla} \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{babel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1163,6 +1175,7 @@ vanilla} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1398,7 +1411,6 @@ vanilla} - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{url} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1437,6 +1449,9 @@ vanilla} + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{moreverb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1452,6 +1467,7 @@ vanilla} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{psfig} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1483,6 +1499,7 @@ vanilla} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{index} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1508,6 +1525,10 @@ vanilla} + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{vanilla} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1622,8 +1643,6 @@ vanilla} - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{aa} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1746,6 +1765,7 @@ vanilla} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1864,7 +1884,6 @@ vanilla} - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1954,6 +1973,9 @@ vanilla} + + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/html32.4ht b/Master/texmf-dist/tex/generic/tex4ht/html32.4ht index 4d98d0c28a0..af9a521548e 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 (2019-03-18-15:25), generated from tex4ht-html32.tex +% html32.4ht (2020-02-18-14:18), 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 2019-03-18-15:25} +\immediate\write-1{version 2020-02-18-14:18} \exit:ifnot{CJK,% Preamble,% @@ -668,6 +668,18 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \fi } +\ifx\InputIfFileExists\UnDef% +\def\input:if:fileexists#1#2#3{% + \openin15 #1.4ht% + \ifeof15% + #3% + \else% + \input #1% + \fi\closein15% +}% +\else +\let\input:if:fileexists\InputIfFileExists% +\fi% \Hinclude{\input #1.4ht}{fontmath} \Hinclude{\@ifpackageloaded{colortbl}{% \no:dupl{array}{\input array.4ht}% @@ -681,16 +693,13 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \else \let\:temp\empty \no:dupl{#1}{% - \openin15 #1.4ht - \ifeof15 - \:CheckOption{debug}\if:Option - \:warning{No configuration file for - #1.\if .#2.tex\else #2\fi}% - \fi - \let\:temp\empty - \else - \def\:temp{\input #1.4ht }% - \fi \closein15 + \def\:warn:msg{} + \:CheckOption{debug}\if:Option + \def\:warn:msg{% + \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + } + \fi% + \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -7156,6 +7165,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{graphics} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -7185,6 +7195,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -7361,7 +7372,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsmath} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -7377,6 +7387,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsfonts} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -7393,7 +7404,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstex1} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -7436,6 +7446,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsppt} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -7517,6 +7528,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{babel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -7543,6 +7555,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8104,7 +8117,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{seslideb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8452,6 +8464,8 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{CJK} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8465,6 +8479,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{moreverb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8481,6 +8496,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{fancyvrb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8614,6 +8630,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{index} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8639,6 +8656,10 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{vanilla} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8703,6 +8724,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ntheorem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8787,6 +8809,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{frenchb} @@ -8871,8 +8894,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{emulateapj} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8902,8 +8923,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{aa} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -9133,6 +9152,7 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -9385,7 +9405,6 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{th4} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -9607,6 +9626,9 @@ j{01F0}H{021E}h{021F}\i{01D0}\j{01F0}% + + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht index 022b22bfe18..2a6dd11864d 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 (2019-09-12-14:02), generated from tex4ht-ooffice.tex +% ooffice.4ht (2020-02-18-14:19), 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 2019-09-12-14:02} +\immediate\write-1{version 2020-02-18-14:19} \exit:ifnot{Preamble,% algorithmicx,% @@ -751,6 +751,18 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew \fi } +\ifx\InputIfFileExists\UnDef% +\def\input:if:fileexists#1#2#3{% + \openin15 #1.4ht% + \ifeof15% + #3% + \else% + \input #1% + \fi\closein15% +}% +\else +\let\input:if:fileexists\InputIfFileExists% +\fi% \Hinclude{\input #1.4ht}{fontmath} \Hinclude{\@ifpackageloaded{colortbl}{% \no:dupl{array}{\input array.4ht}% @@ -764,16 +776,13 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew \else \let\:temp\empty \no:dupl{#1}{% - \openin15 #1.4ht - \ifeof15 - \:CheckOption{debug}\if:Option - \:warning{No configuration file for - #1.\if .#2.tex\else #2\fi}% - \fi - \let\:temp\empty - \else - \def\:temp{\input #1.4ht }% - \fi \closein15 + \def\:warn:msg{} + \:CheckOption{debug}\if:Option + \def\:warn:msg{% + \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + } + \fi% + \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -6978,7 +6987,6 @@ style:display-name="Footnote anchor" style:family="text"> - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{footnote-dw} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8252,7 +8260,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{url} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -8635,6 +8642,9 @@ Y{0178}\i{00EF}% + + + @@ -8778,7 +8788,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{apacite} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -13428,6 +13437,10 @@ Y{0178}\i{00EF}% + + + + @@ -13716,7 +13729,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{pstricks} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -13740,6 +13752,7 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{pst-all} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -13770,6 +13783,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{curve} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14028,6 +14042,7 @@ Y{0178}\i{00EF}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{enumerate} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14133,7 +14148,6 @@ Y{0178}\i{00EF}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{linguex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14217,6 +14231,7 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{covington} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14486,7 +14501,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ulem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14553,7 +14567,6 @@ Y{0178}\i{00EF}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{paralist} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14848,6 +14861,7 @@ Y{0178}\i{00EF}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{listings} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -14972,7 +14986,6 @@ Y{0178}\i{00EF}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{lineno} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -15107,7 +15120,6 @@ Y{0178}\i{00EF}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{soul} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -15259,6 +15271,7 @@ Y{0178}\i{00EF}% + \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooimpress.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooimpress.4ht index 77abc97418e..fe6f63aaee0 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 (2019-03-18-15:26), generated from tex4ht-ooimpress.tex +% ooimpress.4ht (2020-02-18-14:19), 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 2019-03-18-15:26} +\immediate\write-1{version 2020-02-18-14:19} \exit:ifnot{foils,% g-brief,% @@ -88,6 +88,18 @@ tex4ht} \fi } +\ifx\InputIfFileExists\UnDef% +\def\input:if:fileexists#1#2#3{% + \openin15 #1.4ht% + \ifeof15% + #3% + \else% + \input #1% + \fi\closein15% +}% +\else +\let\input:if:fileexists\InputIfFileExists% +\fi% \Hinclude{\input #1.4ht}{fontmath} \Hinclude{\@ifpackageloaded{colortbl}{% \no:dupl{array}{\input array.4ht}% @@ -101,16 +113,13 @@ tex4ht} \else \let\:temp\empty \no:dupl{#1}{% - \openin15 #1.4ht - \ifeof15 - \:CheckOption{debug}\if:Option - \:warning{No configuration file for - #1.\if .#2.tex\else #2\fi}% - \fi - \let\:temp\empty - \else - \def\:temp{\input #1.4ht }% - \fi \closein15 + \def\:warn:msg{} + \:CheckOption{debug}\if:Option + \def\:warn:msg{% + \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + } + \fi% + \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -237,6 +246,10 @@ tex4ht} + + + + @@ -488,6 +501,13 @@ tex4ht} + + + + + + + @@ -880,6 +900,8 @@ tex4ht} + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/tei.4ht b/Master/texmf-dist/tex/generic/tex4ht/tei.4ht index b1888a42127..3926ab9ce09 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 (2019-03-18-15:26), generated from tex4ht-tei.tex +% tei.4ht (2020-02-18-14:19), 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 2019-03-18-15:26} +\immediate\write-1{version 2020-02-18-14:19} \exit:ifnot{Preamble,% amsart,% @@ -205,6 +205,18 @@ url} \fi } +\ifx\InputIfFileExists\UnDef% +\def\input:if:fileexists#1#2#3{% + \openin15 #1.4ht% + \ifeof15% + #3% + \else% + \input #1% + \fi\closein15% +}% +\else +\let\input:if:fileexists\InputIfFileExists% +\fi% \Hinclude{\input #1.4ht}{fontmath} \Hinclude{\@ifpackageloaded{colortbl}{% \no:dupl{array}{\input array.4ht}% @@ -218,16 +230,13 @@ url} \else \let\:temp\empty \no:dupl{#1}{% - \openin15 #1.4ht - \ifeof15 - \:CheckOption{debug}\if:Option - \:warning{No configuration file for - #1.\if .#2.tex\else #2\fi}% - \fi - \let\:temp\empty - \else - \def\:temp{\input #1.4ht }% - \fi \closein15 + \def\:warn:msg{} + \:CheckOption{debug}\if:Option + \def\:warn:msg{% + \:warning{No configuration file for #1.\if .#2.tex\else #2\fi}% + } + \fi% + \def\:temp{\input:if:fileexists{#1.4ht}{}{\:warn:msg}}% }% \fi \:temp} \edef\:temp{\noexpand\Hinclude @@ -1047,6 +1056,7 @@ url} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{graphics} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1080,6 +1090,7 @@ url} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1277,6 +1288,8 @@ url} + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1469,7 +1482,6 @@ url} - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{url} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1731,6 +1743,14 @@ url} + + + + + + + + @@ -1920,6 +1940,8 @@ url} + + -- cgit v1.2.3