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

Tue Dec 12 00:23:52 CET 2023

Author: karl
Date: 2023-12-11 23:23:52 +0000 (Mon, 11 Dec 2023)
New Revision: 1419

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-env.tex
Log:
copyright 2023 for tex4ht.env files

Modified: trunk/lit/ChangeLog
===================================================================

--- trunk/lit/ChangeLog	2023-12-11 13:44:02 UTC (rev 1418)
+++ trunk/lit/ChangeLog	2023-12-11 23:23:52 UTC (rev 1419)
@@ -1,3 +1,11 @@
+2023-12-11  Karl Berry  <karl at freefriends.org>
+
+	* tex4ht-env.tex: copyright 2023, leading comments.
+	* Makefile (diff-env, update-env): new targets to handle
+	tex4ht.env[-*] files.
+	(update-env, update): rename these never-used
+	and non-working targets to dev-update-env and dev-update.
+
 2023-12-11  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-4ht.tex (biblatex.4ht): declare the \BibFileName in the aux

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2023-12-11 13:44:02 UTC (rev 1418)
+++ trunk/lit/Makefile	2023-12-11 23:23:52 UTC (rev 1419)
@@ -616,12 +616,12 @@
 update = cp -pr
 mkdir = install -d
 #
-update-env:
+dev-update-env:
 	$(mkdir) $(dest_base)/unix $(dest_base)/win32
 	$(update) tex4ht.env-unix $(dest_base)/unix/tex4ht.env
 	$(update) tex4ht.env-win32 $(dest_base)/win32/tex4ht.env
 
-update: all
+dev-update: all
 	$(update) $(tex4ht_bibtex2_derived) $(dest_src)/
 #
 	$(update) $(tex4ht_c_derived) $(dest_src)/
@@ -633,7 +633,7 @@
 #
 	$(update) $(tex4ht_docbook_derived) $(dest_texmf)/
 #
-	$(MAKE) update-env
+	$(MAKE) dev-update-env
 #
 	$(update) $(tex4ht_html_speech_xtpipes_derived) $(dest_texmf)/
 #
@@ -758,6 +758,11 @@
 # (Other methods are also used.)
 install_data = cp -p
 
+# svn status of installed tree.
+svnstatus st:
+	svn status $(inst_dir_all) | sed s,$(texmf),, # reduce output
+	@echo $(inst_dir_all)
+
 # 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;
@@ -817,11 +822,22 @@
 	./update-htfonts update $(ht_fonts_devdir) $(ht_fonts_instdir) | tee /tmp/htupd
 .PHONY: update-htfonts
 
-# svn status of results.
-svnstatus st:
-	svn status $(inst_dir_all) | sed s,$(texmf),, # reduce output
-	@echo $(inst_dir_all)
+# 

+# Checking and updating tex4ht.env files.
 
+# Where they are in the installed tree.
+env_instdir = $(inst_dir_top)/base
+
+# Compare only.
+diff-env: $(tex4ht_env_derived)
+	-$(diff) $(env_instdir)/unix/tex4ht.env tex4ht.env-unix
+	-$(diff) $(env_instdir)/win32/tex4ht.env tex4ht.env-win32
+
+# Compare and update.
+update-env:
+	$(install_data) tex4ht.env-unix $(env_instdir)/unix/tex4ht.env
+	$(install_data) tex4ht.env-win32 $(env_instdir)/win32/tex4ht.env
+
 # 

 # diff all files in the main TeX Live installation directory against
 # cwd (development). the --ignore-matching-lines below only works when
@@ -832,7 +848,7 @@
 # 
 # The diff-scripts output is usually empty, so we can run that;
 # but diff-htfonts is too verbose to run every time.
-diff-all: diff-src diff-scripts diff-htfonts
+diff-all: diff-src diff-scripts diff-htfonts diff-env
 	@echo; echo '>>> $@'
 	-for f in $(inst_dir_4ht)/*; do $(diff) $$f .; done \
 	| tee /tmp/u | egrep -v '^ *[-+]%|^@@ |^- *$$|-1.version' \

Modified: trunk/lit/tex4ht-env.tex
===================================================================
--- trunk/lit/tex4ht-env.tex	2023-12-11 13:44:02 UTC (rev 1418)
+++ trunk/lit/tex4ht-env.tex	2023-12-11 23:23:52 UTC (rev 1419)
@@ -2,7 +2,7 @@
 %      latex tex4ht-env
 % or htlatex tex4ht-env "xhtml,3"
 %
-% Copyright 2009-2018 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 % Released under LPPL 1.3c+.
 % See tex4ht-cpright.tex for license text.
@@ -112,29 +112,32 @@
 %%%%%%%%%%%%%%%%%%%
 
 \<unix opening comment\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-% Notes:                                                            %
-%  1. Empty lines might be harmful                                  %
-%  2. Tagged script segments <tag>...</tag> are scanned only if     %
-%     their names are specified within -ctag switches of tex4ht.c   %
-%     and t4ht.c. When -c switches are not supplied, a -cdefault    %
-%     is implicitly assumed.                                        % 
-%        The tags <tag> and </tag>, but not their bodies, are       %
-%     ignored if they are not located at the start of their lines.  %
-%  3. Place this file in your work directory and/or root directory  %
-%     and/or in directory `xxx' of your choice. In the latest case, %
-%     compile tex4ht.c and t4ht.c with `#define ENVFILE xxx', or    %
-%     provide the address of the file to tex4ht and t4ht throught   %
-%     the -e switch                                                 %
-%  4. Under kpathsea, the substring `%%~' may be employed in        %
-%     commands to obtain the value of ${TEXMFDIST}.                 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
+%
+% Notes:
+% 1. Empty lines might be harmful.
+%
+% 2. Tagged script segments <tag>...</tag> are scanned only if
+%    their names are specified within -ctag switches of tex4ht.c
+%    and t4ht.c. When -c switches are not supplied, a -cdefault
+%    is implicitly assumed.
+%       The tags <tag> and </tag>, but not their bodies, are
+%    ignored if they are not located at the start of their lines.
+%
+% 3. Place this file in your work directory and/or root directory
+%    and/or in directory `xxx' of your choice. In the latest case,
+%    compile tex4ht.c and t4ht.c with `#define ENVFILE xxx', or
+%    provide the location of the file to tex4ht and t4ht with
+%    the -e switch.
+%
+% 4. Under kpathsea, the substring `%%~' may be employed in
+%    commands to obtain the value of ${TEXMFDIST}.
+%
 >>>
 
 
 \<win32 opening comment\><<<
-% See comments in the Unix tex4ht.env for how this file gets found,
-% except on Windows, we also look in the directory of tex4ht.exe/t4ht.exe.
+% See comments in the Unix tex4ht.env for how this file gets found --
+% except that on Windows, we also look in the directory of tex4ht.exe/t4ht.exe.
 >>>
 
 
@@ -1648,7 +1651,7 @@
 \<unix copyright\><<<
 % tex4ht.env-unix (@version), generated from @jobname.tex
 % (can be used as ~/.tex4ht)
-% Copyright 2009-2018 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
 % Copyright @CopyYear.1997. Eitan M. Gurari
 @<TeX4ht copyright@>>>>
 
@@ -1655,13 +1658,13 @@
 \<private copyright\><<<
 % tex4ht.env (private) (@version), generated from @jobname.tex
 % (can be used as ~/.tex4ht)
-% Copyright 2009-2018 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
 % Copyright @CopyYear.1997. Eitan M. Gurari
 @<TeX4ht copyright@>>>>
 
 \<win32 copyright\><<<
 % tex4ht.env-win32 (@version), generated from @jobname.tex
-% Copyright 2009-2018 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
 % Copyright @CopyYear.1997. Eitan M. Gurari
 @<TeX4ht copyright@>>>>
 

