diff options
author | Karl Berry <karl@freefriends.org> | 2020-11-29 17:13:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-11-29 17:13:23 +0000 |
commit | 1bc1ec22661bff3a64049fe0b421a3038d831c21 (patch) | |
tree | c3ccf23fcb01a17f10c309642206111553dcbd4b | |
parent | 25f34dbf24d58c95bf1cfb187e26b0ccf15d4d57 (diff) |
mkht sync
git-svn-id: svn://tug.org/texlive/trunk@57031 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/mkht.4ht | 30 |
2 files changed, 28 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht b/Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht index 66ec0c6be1b..3378a879008 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht @@ -1,6 +1,6 @@ -% mkht-scripts.4ht (2019-03-18-15:26), generated from tex4ht-mkht.tex -% Copyright (C) 2009-2013 TeX Users Group -% Copyright (C) 2000-2009 Eitan M. Gurari +% mkht-scripts.4ht (2020-11-23-10:05), generated from tex4ht-mkht.tex +% Copyright 2009-2020 TeX Users Group +% Copyright 2000-2009 Eitan M. Gurari % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -13,12 +13,12 @@ % This work has the LPPL maintenance status "maintained". % % The Current Maintainer of this work -% is the TeX4ht Project <http://tug.org/tex4ht>. +% is the TeX4ht Project <https://tug.org/tex4ht>. % % If you modify this program, changing the % version identification would be appreciated. % -\immediate\write-1{version \ifx \JOBNAME\UnDefined 2019-03-18-15:26\else |version\fi} +\immediate\write-1{version \ifx \JOBNAME\UnDefined 2020-11-23-10:05\else |version\fi} \ifx \JOBNAME\UnDef @@ -41,6 +41,7 @@ \Argchar{$} \Dirchar{-f/} \Rubycall{} +\Echooff{} \Remark{#} \ifOption{Needs}{% @@ -148,6 +149,7 @@ \Argchar{%} \Dirchar{} \Rubycall{call } +\Echooff{@echo off} \Remark{Rem } \ifOption{Needs}{\Script{% diff --git a/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht index c621ef81855..a186116620f 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht @@ -1,4 +1,4 @@ -% mkht.4ht (2020-10-30-18:23), generated from tex4ht-mkht.tex +% mkht.4ht (2020-11-23-10:05), generated from tex4ht-mkht.tex % Copyright 2009-2020 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -18,9 +18,9 @@ % If you modify this program, changing the % version identification would be appreciated. % -\immediate\write-1{version \ifx \JOBNAME\UnDefined 2020-10-30-18:23\else |version\fi} +\immediate\write-1{version \ifx \JOBNAME\UnDefined 2020-11-23-10:05\else |version\fi} -\immediate\write-1{version 2020-10-30-18:23} +\immediate\write-1{version 2020-11-23-10:05} \def\exit{\documentclass{article}\begin{document}\end{document}\endinput} \bgroup @@ -223,7 +223,7 @@ texinfo.tex file. >>> \<texinfo\><<< -tex |<@|>5 |<'|>|<texinfo definitions|>|<get parameters|>|empty>>> +etex |<@|>5 |<'|>|<texinfo definitions|>|<get parameters|>|empty>>> \<texinfo definitions\><<< @@ -324,6 +324,7 @@ mex |<@|>5 |<'|>|<tex definitions|>|<get parameters|>|empty>>> \def\Argchar{\bgroup \setcats \Acont}\def\Acont#1{\egroup\def\argchar{#1}} \def\Dirchar{\bgroup \setcats \Dicont}\def\Dicont#1{\egroup\def\dirchar{#1}} \def\Rubycall{\bgroup \setcats \Dcont}\def\Dcont#1{\egroup\def\rubyCall{#1}} +\def\Echooff{\bgroup \setcats \Dcont}\def\Dcont#1{\egroup\def\echoOff{#1}} \def\Ext{\bgroup \setcats \Econt} \def\Econt#1{\egroup\def\ext{#1}% \def\firstln{unix}\ifx \firstln\ext \def\firstln##1endfirstln{##1}% @@ -342,6 +343,7 @@ mex |<@|>5 |<'|>|<tex definitions|>|<get parameters|>|empty>>> \let\argchar=\relax \let\dirchar=\relax \let\rubyCall=\relax +\let\echoOff=\relax \let\ext=\relax \ifx \script\UnDef \let\script=\relax \fi \let\base=\relax @@ -374,22 +376,29 @@ mex |<@|>5 |<'|>|<tex definitions|>|<get parameters|>|empty>>> \<ruby call\><<< |rubyCall>>> +\<echo off\><<< +|echoOff>>> + \<unix line\><<< |firstln#!/bin/sh # stop at first error set -e -# no interaction on the TeX runs is desirable. -# Simpler to do it here than on the individual commands; +# No interaction on the TeX runs is desirable. +# Simpler to do that here than on the individual commands; # let's hope exec redirections are portable enough. exec </dev/null - endfirstln >>> +Despite the name, this macro is not for Windows. It is unconditionally +included in all the scripts. It should only be the copyright notice, +which somehow gets transformed for Unix. Thus we go to lots of trouble +to insert the at-echo off only for Windows. + \<windows line\><<< -@echo off -|Rem |ScriptFileName|AddExtn (2020-10-30-18:23), generated from tex4ht-mkht.tex +|<echo off|> +|Rem |ScriptFileName|AddExtn (2020-11-23-10:05), generated from tex4ht-mkht.tex |Rem Copyright 2009-2020 TeX Users Group |Rem Copyright 2003-2009 Eitan M. Gurari |Rem @@ -429,6 +438,7 @@ endfirstln \temp\argchar \temp\dirchar \temp\rubyCall + \temp\echoOff \temp\ext \temp\script \temp\base @@ -501,6 +511,7 @@ endfirstln \Argchar{$} \Dirchar{-f/} \Rubycall{} +\Echooff{} \Remark{#} \else @@ -517,6 +528,7 @@ endfirstln \Argchar{%} \Dirchar{} \Rubycall{call } +\Echooff{@echo off} \Remark{Rem } \else |