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

[Karl Berry]

Author: karl
Date: 2023-01-08 15:27:15 +0000 (Sun, 08 Jan 2023)
New Revision: 1282

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/mktex4ht-cnf.tex
   trunk/lit/tex4ht-html4.tex
Log:
update common dependency variables; first 2023 copyrights

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2023-01-01 22:05:02 UTC (rev 1281)
+++ trunk/lit/ChangeLog	2023-01-08 15:27:15 UTC (rev 1282)
@@ -1,3 +1,14 @@
+2023-01-08  Karl Berry  <karl at freefriends.org>
+
+	* Makefile (common_no_tex4ht_sty): rename to common_no_cond_sty,
+	since tex4ht.sty is what is left out. Mention that we also leave
+	out mktex4ht.4ht from all, since it's mostly just the list of packages.
+	(tex4ht_sty_derived): dependency is now $(common_no_tex4ht_sty).
+	(tex4ht_cond4ht_derived): can depend on $(common).
+	
+	* mktex4ht-cnf.tex,
+	* tex4ht-html4.tex (html4.4ht, html4-math.4ht): copyright 2023.
+
 2023-01-01  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4th-html4.tex (html4.4ht): set font size for \subsubsection 

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2023-01-01 22:05:02 UTC (rev 1281)
+++ trunk/lit/Makefile	2023-01-08 15:27:15 UTC (rev 1282)
@@ -72,18 +72,18 @@
 
 default: all
 
-# most files (not all, but it's not worth worrying about) read
-# mktex4ht.4ht, but we have to avoid depending on it for the file which
-# generates it (cond4ht), so we need two different variables.
-# Similarly for tex4ht.sty, though that is modified far less often.
+# tex4ht.sty is read by most (all?) files, but we have to avoid
+# depending on it for the file which generates it (tex4ht-sty.tex), so
+# we need two different variables.
 # 
-common_no_cond_sty = tex4ht-cpright.tex common.tex common-code.tex \
+common_no_tex4ht_sty = tex4ht-cpright.tex common.tex common-code.tex \
   ProTex.sty AlProTex.sty tex4ht-dir.tex
-# common = mktex4ht.4ht tex4ht.sty $(common_no_cond_sty)
 common = tex4ht.sty $(common_no_cond_sty)
-# Michal 10/05/2017: it seems that when mktex4ht.4ht is included as
-# common, it causes constant recompilations.
 common_info = $(common) common-info.tex
+#
+# mktex4ht.4ht is read by almost everything, but since it is mostly just
+# the list of packages, it changes often, without any particular need to
+# rebuild everything when it does. So leave it out.
 
 # Substitute directories used, especially for Java.
 tex4ht-dir.tex: tex4ht-dir.m4
@@ -389,8 +389,7 @@
 
 # 

 all: $(derived)
-	rm -f texput.log
-	texlua checklog.lua *.log
+	rm -f texput.log; texlua checklog.lua *.log
 
 $(tex4ht_4ht_derived): tex4ht-4ht.tex cond4ht.4ht $(common)
 	etex $(tex_opts) $<
@@ -401,8 +400,7 @@
 $(tex4ht_c_derived): tex4ht-c.tex $(common)
 	etex $(tex_opts) $<
 
-$(tex4ht_cond4ht_derived): tex4ht-cond4ht.tex mktex4ht-cnf.tex \
-                           $(common_no_cond_sty)
+$(tex4ht_cond4ht_derived): tex4ht-cond4ht.tex mktex4ht-cnf.tex $(common)
 	etex $(tex_opts) $<
 	etex $(tex_opts) cond4ht.4ht
 
@@ -548,7 +546,7 @@
 $(tex4ht_options_derived): tex4ht-options.tex $(common)
 	htlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
-$(tex4ht_sty_derived): tex4ht-sty.tex $(common_no_cond_sty)
+$(tex4ht_sty_derived): tex4ht-sty.tex $(common_no_tex4ht_sty)
 	$(HTTEX) $< ""
 
 $(tex4ht_svg_derived): tex4ht-svg.tex $(common)

Modified: trunk/lit/mktex4ht-cnf.tex
===================================================================
--- trunk/lit/mktex4ht-cnf.tex	2023-01-01 22:05:02 UTC (rev 1281)
+++ trunk/lit/mktex4ht-cnf.tex	2023-01-08 15:27:15 UTC (rev 1282)
@@ -2,7 +2,7 @@
 % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
 % Read by tex4ht-cond4ht.
 %
-% Copyright 2016-2020 TeX Users Group    
+% Copyright 2016-2023 TeX Users Group    
 % Released under LPPL 1.3c+.
 % See tex4ht-cpright.tex for license text.
 %

Modified: trunk/lit/tex4ht-html4.tex
===================================================================
--- trunk/lit/tex4ht-html4.tex	2023-01-01 22:05:02 UTC (rev 1281)
+++ trunk/lit/tex4ht-html4.tex	2023-01-08 15:27:15 UTC (rev 1282)
@@ -2,7 +2,7 @@
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
-% Copyright 2009-2022 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
 % Copyright 1996-2009 Eitan M. Gurari
 % Released under LPPL 1.3c+.
 % See tex4ht-cpright.tex for license text.
@@ -65,7 +65,7 @@
 
 \<html4\><<<
 % html4.4ht (|version), generated from |jobname.tex
-% Copyright 2009-2022 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
 % Copyright |CopyYear.1997. Eitan M. Gurari
 |<TeX4ht copywrite|>
 >>>
@@ -73,7 +73,7 @@
 
 \<html4-math\><<<
 % html4-math.4ht (|version), generated from |jobname.tex
-% Copyright 2009-2022 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
 % Copyright |CopyYear.1999. Eitan M. Gurari
 |<TeX4ht copywrite|>
 >>>