[tex4ht-commits] [SCM] tex4ht updated: r845 - trunk/lit

[karl at gnu.org.ua]

Author: karl
Date: 2020-11-23 20:05:43 +0200 (Mon, 23 Nov 2020)
New Revision: 845

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-mkht.tex
Log:
insert @echo off in scripts for Windows, not Unix

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2020-11-21 14:07:00 UTC (rev 844)
+++ trunk/lit/ChangeLog	2020-11-23 18:05:43 UTC (rev 845)
@@ -1,7 +1,16 @@
+2020-11-23  Karl Berry  <karl at freefriends.org>
+
+	* tex4ht-mkht.tex (texinfo): use etex rather than tex.
+	(\Echooff, \echoOff, <echo off>): new @echo off string.
+	(<windows line>): use it.
+	(\make): setup.
+	(<unix setup>, <ms setup>): define \Echooff as empty or "@echo off".
+	* Makefile (user_bin): new variable to allow per-user addition to PATH.
+
 2020-11-21  Michal Hoftich  <michal.h21 at gmail.com>
 
-	* tex4ht-4ht.tex (caption.4ht): fixed spurious separator between caption
-	number and text.
+	* tex4ht-4ht.tex (caption.4ht): fixed spurious separator between
+	caption number and text.
 	https://tex.stackexchange.com/q/571684/2891
 
 2020-11-20  Michal Hoftich  <michal.h21 at gmail.com>
@@ -17,8 +26,8 @@
 
 2020-11-09  Michal Hoftich  <michal.h21 at gmail.com>
 
-	* tex4ht-html4 (html4-math.4ht): fixed paragraph opening after \PicDisplay.
-	Also don't use the obsolete <center> element.
+	* tex4ht-html4 (html4-math.4ht): fixed paragraph opening after
+	\PicDisplay. Also don't use the obsolete <center> element.
 	https://tex.stackexchange.com/a/570077/2891
 
 2020-11-08  Karl Berry  <karl at freefriends.org>

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2020-11-21 14:07:00 UTC (rev 844)
+++ trunk/lit/Makefile	2020-11-23 18:05:43 UTC (rev 845)
@@ -6,12 +6,21 @@
 
 SHELL = /bin/sh
 
+# setting PATH as it's nice to find our own (development) scripts,
+# e.g., look for xmlint and vcss in ./extra-bin.
 extra_bin = ./extra-bin
 ht_bin = ../bin/ht/unix
 PATH := $(shell echo $$PATH)
-# setting PATH as it's nice to find our own (development) scripts,
-# e.g., look for xmlint/vcss in ./extra-bin
-export PATH := $(ht_bin):$(extra_bin):$(PATH)
+#
+# per-user addition to PATH. We need to use LaTeX out of current TeX Live,
+# since changes that affect tex4ht are often made. Include trailing :.
+ifeq ($(USER),karl)
+user_bin := /usr/local/texlive/dev/bin/x86_64-linux:
+else
+user_bin :=
+endif
+#
+export PATH := $(ht_bin):$(extra_bin):$(user_bin)$(PATH)
 
 homedir ?= tex4ht.dir
 wd = work.dir

Modified: trunk/lit/tex4ht-mkht.tex
===================================================================
--- trunk/lit/tex4ht-mkht.tex	2020-11-21 14:07:00 UTC (rev 844)
+++ trunk/lit/tex4ht-mkht.tex	2020-11-23 18:05:43 UTC (rev 845)
@@ -1,11 +1,7 @@
 % $Id$
-% (1)  latex tex4ht-mkht      
-% (2)  perl -c mk4ht.perl                (checking correctness)
-% (3)  latex mkht-scripts.4ht
-%    or
-% (1) xhlatex tex4ht-mkht "html,3" 
-% (2) perl -c mk4ht.perl
-% (3) xhlatex mkht-scripts.4ht "html,3"
+% (1) latex tex4ht-mkht      
+% (2) perl -c mk4ht.perl                (checking correctness)
+% (3) latex mkht-scripts.4ht
 %
 % Copyright 2009-2020 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
@@ -251,7 +247,7 @@
 >>>
 
 \<texinfo\><<<
-tex  |<@|>5 |<'|>|<texinfo definitions|>|<get parameters|>|empty>>>
+etex |<@|>5 |<'|>|<texinfo definitions|>|<get parameters|>|empty>>>
 
 
 \<texinfo definitions\><<<
@@ -1049,6 +1045,7 @@
 \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}%
   ?<unix shebang line?>}
 \def\Base{\bgroup \setcats \Bcont}   \def\Bcont#1{\egroup\def\base{#1}}
@@ -1064,6 +1061,7 @@
 \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
@@ -1096,21 +1094,28 @@
 \<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\><<<
- at echo off
+|<echo off|>
 ?<MYcopyrightnotice?>
 >>>
 
@@ -1132,6 +1137,7 @@
    \temp\argchar
    \temp\dirchar
    \temp\rubyCall
+   \temp\echoOff
    \temp\ext
    \temp\script
    \temp\base
@@ -1304,6 +1310,7 @@
 \Argchar{$}
 \Dirchar{-f/}
 \Rubycall{}
+\Echooff{}
 \Remark{#}
 ->>>
 
@@ -1319,6 +1326,7 @@
 \Argchar{%}
 \Dirchar{}
 \Rubycall{call }
+\Echooff{@echo off}
 \Remark{Rem }
 ->>>