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

karl at gnu.org.ua karl at gnu.org.ua
Mon Oct 26 01:52:04 CET 2020 

Author: karl
Date: 2020-10-26 02:52:04 +0200 (Mon, 26 Oct 2020)
New Revision: 834

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-mkht.tex
Log:
set up for installing scripts; update copyright years, https://tug.org

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2020-10-25 11:29:13 UTC (rev 833)
+++ trunk/lit/ChangeLog	2020-10-26 00:52:04 UTC (rev 834)
@@ -1,9 +1,15 @@
+2020-10-25  Karl Berry  <karl at freefriends.org>
+
+	* tex4ht-mkht.tex: more copyright 2020, https for tug.org.
+	* Makefile (diff-scripts, install-scripts): new targets.
+	(install_data, inst_dir_scripts): new variables.
+
 2020-10-25  Michal Hoftich  <michal.h21 at gmail.com>
 
-	* tex4ht-mkht.tex (all .unix and .bat files that use plain TeX): use etex
-	in shell scripts for plain TeX.
-	* tex4ht-4ht.tex (plain.4ht): declare configurations for spacing commands in
-	plain TeX.
+	* tex4ht-mkht.tex (all .unix and .bat files that use plain TeX):
+	use etex in shell scripts for plain TeX.
+	* tex4ht-4ht.tex (plain.4ht): declare configurations for spacing
+	commands in plain TeX.
 
 2020-10-18  Michal Hoftich  <michal.h21 at gmail.com>
 
@@ -12,54 +18,54 @@
 
 2020-10-17  Michal Hoftich  <michal.h21 at gmail.com>
 
-	* tex4ht-4ht.tex (usepackage.4ht, graphics-hooks.4ht): adapted Graphics for
+	* tex4ht-4ht.tex (usepackage.4ht,graphics-hooks.4ht): adapted Graphics for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, xcolor-hooks.4ht): adapted Xcolor for
+	* tex4ht-4ht.tex (usepackage.4ht,xcolor-hooks.4ht): adapted Xcolor for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, caption-hooks.4ht): adapted Caption for
+	* tex4ht-4ht.tex (usepackage.4ht,caption-hooks.4ht): adapted Caption for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, pdfbase-hooks.4ht): adapted Pdfbase for
+	* tex4ht-4ht.tex (usepackage.4ht,pdfbase-hooks.4ht): adapted Pdfbase for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, tikz-hooks.4ht): adapted Tikz for
+	* tex4ht-4ht.tex (usepackage.4ht,tikz-hooks.4ht): adapted Tikz for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, fontspec-hooks.4ht, polyglossia-hooks.4ht): 
+	* tex4ht-4ht.tex (usepackage.4ht,fontspec-hooks.4ht, polyglossia-hooks.4ht): 
 	adapted Fontspec and Polyglossia for the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, ctex-hooks.4ht): adapted Ctex for
+	* tex4ht-4ht.tex (usepackage.4ht,ctex-hooks.4ht): adapted Ctex for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, xecjk-hooks.4ht): adapted xeCJK for
+	* tex4ht-4ht.tex (usepackage.4ht,xecjk-hooks.4ht): adapted xeCJK for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, xecjk-hooks.4ht): adapted xeCJK for
+	* tex4ht-4ht.tex (usepackage.4ht,xecjk-hooks.4ht): adapted xeCJK for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, savetrees-hooks.4ht): adapted savetrees for
+	* tex4ht-4ht.tex (usepackage.4ht,savetrees-hooks.4ht): adapted savetrees for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, expl3-hooks.4ht): adapted expl3 for
+	* tex4ht-4ht.tex (usepackage.4ht,expl3-hooks.4ht): adapted expl3 for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, showframe-hooks.4ht): adapted showframe for
+	* tex4ht-4ht.tex (usepackage.4ht,showframe-hooks.4ht): adapted showframe for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, esopic-hooks.4ht): adapted eso-pic for
+	* tex4ht-4ht.tex (usepackage.4ht,esopic-hooks.4ht): adapted eso-pic for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, xrhyper-hooks.4ht): adapted xr-hyper for
+	* tex4ht-4ht.tex (usepackage.4ht,xrhyper-hooks.4ht): adapted xr-hyper for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, xr-hooks.4ht): adapted xr for
+	* tex4ht-4ht.tex (usepackage.4ht,xr-hooks.4ht): adapted xr for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, fancyhdr-hooks.4ht): adapted fancyhdr for
+	* tex4ht-4ht.tex (usepackage.4ht,fancyhdr-hooks.4ht): adapted fancyhdr for
 	the new package hook mechanism.
-	* tex4ht-4ht.tex (usepackage.4ht, cleveref-hooks.4ht): adapted cleveref for
+	* tex4ht-4ht.tex (usepackage.4ht,cleveref-hooks.4ht): adapted cleveref for
 	the new package hook mechanism. 
+	* tex4ht-4ht.tex (usepackage.4ht,imakeidx-hooks.4ht): adapted imakeidx for
+	hooks.
 	* tex4ht-4ht.tex: added tutorial on how to write early package patching
-	hooks.
-	* tex4ht-4ht.tex (usepackage.4ht, imakeidx-hooks.4ht): adapted imakeidx for
 	the new package hook mechanism. 
 
 2020-10-16  Michal Hoftich  <michal.h21 at gmail.com>
 
-	* tex4ht-cond4ht.tex (cond4ht.4ht, docbook.4ht, html0.4ht, html32.4ht,
-	html4.4ht, mktex4ht.4ht, ooffice.4ht, ooimpress.4ht, tei.4ht): strip leading
-	quotes from files that we try to find .4ht files for.
-	https://puszcza.gnu.org.ua/bugs/?486#postcomment
+	* tex4ht-cond4ht.tex (cond4ht.4ht, docbook.4ht, html0.4ht,
+	html32.4ht, html4.4ht, mktex4ht.4ht, ooffice.4ht, ooimpress.4ht,
+	tei.4ht): strip leading quotes from files that we try to find
+	.4ht files for. https://puszcza.gnu.org.ua/bugs/?486#postcomment
 	* tex4ht-4ht.tex (catchfile-sty-hooks.4ht): removed unnecessary file.
-	* tex4ht-sty.tex (tex4ht.sty): changed the early package hook mechanism to
-	speed up things.
+	* tex4ht-sty.tex (tex4ht.sty): changed the early package hook
+	mechanism to speed up things.
 	https://puszcza.gnu.org.ua/bugs/?486#postcomment
 	* tex4ht-4ht.tex (usepackage.4ht): adapded Minted for the new package hook
 	mechanism.
@@ -83,9 +89,9 @@
 
 	* tex4ht-4ht.tex (fancyvrb.4ht): fixed spurious blank lines that were
 	sometimes produced.
-	* tex4ht-4ht.tex (latex.4ht): fixed \,, \;, \: and other similar commands.
-	Their definition had been added to LaTeX kernel and their behaviour changed, 
-	resulting in possible fatal error.
+	* tex4ht-4ht.tex (latex.4ht): fixed \,, \;, \: and other similar
+	commands. Their definition had been added to LaTeX kernel and
+	their behaviour changed, resulting in possible fatal error.
 	https://tug.org/pipermail/tex4ht/2020q4/002735.html
 
 2020-09-28  Michal Hoftich  <michal.h21 at gmail.com>
@@ -93,8 +99,8 @@
 	* tex4ht-html4.tex (html4.4ht): use <pre> element for fancy verbatim.
 	https://tex.stackexchange.com/q/564532/2891
 	* tex4ht-4ht.tex (minted.4ht),
-	tex4ht-html4.tex (html4.4ht): added support for colored Minted listings.
-	https://tex.stackexchange.com/a/564579/2891
+	* tex4ht-html4.tex (html4.4ht): added support for colored Minted
+	listings. https://tex.stackexchange.com/a/564579/2891
 
 2020-09-22  Michal Hoftich  <michal.h21 at gmail.com>
 
@@ -116,13 +122,14 @@
 
 2020-09-13  Michal Hoftich  <michal.h21 at gmail.com>
 
-	* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): removed space handling regular
-	expressions, they seem to be unnecessary with current MathJax.
+	* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): removed space
+	handling regular expressions, they seem to be unnecessary with
+	current MathJax.
 
 2020-09-08  Michal Hoftich  <michal.h21 at gmail.com>
 
-	* tex4ht-mathml.tex (mathml.4ht): removed some weird code from configuration
-	for \text.. commands. It produced invalid MathML.
+	* tex4ht-mathml.tex (mathml.4ht): removed some weird code from
+	configuration for \text.. commands. It produced invalid MathML.
 
 2020-09-02  Michal Hoftich  <michal.h21 at gmail.com>
 

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2020-10-25 11:29:13 UTC (rev 833)
+++ trunk/lit/Makefile	2020-10-26 00:52:04 UTC (rev 834)
@@ -668,7 +668,42 @@
 endif
 
 # 

-# painful, so let's write out the commands. --20mar17
+# The directories where tex4ht is installed in TeX Live,
+# i.e., where we will copy and commit updates.
+
+texmf = /r/tug/home/texlive/karl/Master/texmf-dist
+inst_dir_4ht = $(texmf)/tex/generic/tex4ht
+inst_dir_top = $(texmf)/tex4ht
+inst_dir_scripts = $(texmf)/scripts/tex4ht
+
+# Simple command to "install" from dev to TL.
+# (Other methods are also used.)
+install_data = cp -p
+
+# Diff and install the *.unix and *.bat scripts.
+# The suffix changes from .unix in development to .sh in TL,
+# and many of the scripts are not installed at all;
+# don't worry about that. We also won't worry about the 
+# Perl scripts (mk4ht) at present.
+# 
+diff-scripts:
+	for f in *.unix; do \
+	  inst_f=$(inst_dir_scripts)/`basename $$f .unix`.sh; \
+	  test -r $$inst_f || continue; \
+	  $(diff) $$inst_f $$f; done
+
+install-scripts:
+	for f in *.unix; do \
+	  inst_f=$(inst_dir_scripts)/`basename $$f .unix`.sh; \
+	  test -r $$inst_f || continue; \
+	  echo $(install_data) $$inst_f $$f; \
+	  $(install_data) $$inst_f $$f; done
+
+# not ready
+#for f in *.bat; do \
+	  
+# 

+# Let's write out the commands for updating fonts.
 ht_fonts_instdir = $(inst_dir_top)/ht-fonts
 #
 install-unicode-4hf:
@@ -705,15 +740,7 @@
 diff_files = $(filter-out %.htf %.4hf tex4ht.env% %.c lm-htf.tex mk4ht.perl,\
                           $(derived))
 
-#texmf = /usr/local/texlive/dev/texmf-dist
-texmf = /r/tug/home/texlive/karl/Master/texmf-dist
-inst_dir_4ht = $(texmf)/tex/generic/tex4ht
-inst_dir_top = $(texmf)/tex4ht
-#
-diff = diff -u0 --ignore-all-space --ignore-blank-lines \
-  --ignore-matching-lines='write-1.version\|, generated from\|Copyright'
-#
-# the --ignore-matching-lines only works when that's the only change in
+# the --ignore-matching-lines below only works when that's the only change in
 # the hunk, so ignore them all explicitly. also ignore commented changes.
 diff-all: #diff-htfonts
 	-for f in $(diff_files); do $(diff) $(inst_dir_4ht)/$$f .; done \
@@ -724,6 +751,10 @@
 diff1 d1:
 	$(diff) $(inst_dir_4ht)/$(d) .
 
+# the diff command used pervasively.
+diff = diff -u0 --ignore-all-space --ignore-blank-lines \
+  --ignore-matching-lines='write-1.version\|, generated from\|Copyright'
+
 # simple abbrev.
 upmake upm:
 	svn update && make

Modified: trunk/lit/tex4ht-mkht.tex
===================================================================
--- trunk/lit/tex4ht-mkht.tex	2020-10-25 11:29:13 UTC (rev 833)
+++ trunk/lit/tex4ht-mkht.tex	2020-10-26 00:52:04 UTC (rev 834)
@@ -1233,8 +1233,8 @@
 
 \<mkht-scripts\><<<-
 % mkht-scripts.4ht (?version), generated from ?jobname.tex
-% Copyright (C) 2009-2013 TeX Users Group
-% Copyright (C) ?CopyYear.2000. Eitan M. Gurari
+% Copyright 2009-2020 TeX Users Group
+% Copyright ?CopyYear.2000. Eitan M. Gurari
 ?<TeX4ht copyright?>
 
 \ifx \JOBNAME\UnDef
@@ -1833,7 +1833,7 @@
 % 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.
@@ -1843,8 +1843,8 @@
 
 \<perl copyright notice\><<<-
 # mk4ht (?version), generated from ?jobname.tex
-# Copyright (C) 2009-2013 TeX Users Group
-# Copyright (C) ?CopyYear.2003. Eitan M. Gurari
+# Copyright 2009-2020 TeX Users Group
+# Copyright ?CopyYear.2003. Eitan M. Gurari
 #
 # This work may be distributed and/or modified under the
 # conditions of the LaTeX Project Public License, either
@@ -1857,7 +1857,7 @@
 # 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 file, changing the
 # version identification be appreciated.
@@ -1866,8 +1866,8 @@
 % used in the generated scripts.
 \<MYcopyrightnotice\><<<-
 |Rem |ScriptFileName|AddExtn (?version), generated from ?jobname.tex
-|Rem Copyright (C) 2009-2013 TeX Users Group
-|Rem Copyright (C) ?CopyYear.2003. Eitan M. Gurari
+|Rem Copyright 2009-2020 TeX Users Group
+|Rem Copyright ?CopyYear.2003. Eitan M. Gurari
 |Rem
 |Rem This work may be distributed and/or modified under the
 |Rem conditions of the LaTeX Project Public License, either
@@ -1880,7 +1880,7 @@
 |Rem This work has the LPPL maintenance status "maintained".
 |Rem
 |Rem The Current Maintainer of this work
-|Rem is the TeX4ht Project <http://tug.org/tex4ht>.
+|Rem is the TeX4ht Project <https://tug.org/tex4ht>.
 |Rem
 |Rem If you modify this file, changing the
 |Rem version identification be appreciated.

More information about the tex4ht-commits mailing list.