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

[karl at gnu.org.ua]

Author: karl
Date: 2017-04-29 01:28:51 +0300 (Sat, 29 Apr 2017)
New Revision: 298

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/mktex4ht-cnf.tex
Log:
mktex4ht.4ht, tex4ht.sty: new 99% common dependencies

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2017-04-28 17:17:21 UTC (rev 297)
+++ trunk/lit/ChangeLog	2017-04-28 22:28:51 UTC (rev 298)
@@ -1,3 +1,13 @@
+2017-04-28  Karl Berry  <karl at freefriends.org>
+
+	* Makefile (common): include mktex4ht.4ht and tex4ht.sty.
+	(common_no_cond_sty): new variable without either of those.
+	(tex4ht_cond4ht_derived,tex4ht_sty_derived): use
+	  $(common_no_cond_sty) instead of $(common). 
+	(tex4ht_4ht_derived): depend on cond4ht.4ht.
+	
+	* mktex4ht-cnf.tex: copyright 2017.
+
 2017-04-28  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): fixed error which happened when 
@@ -3,15 +13,15 @@
 	xcolor haven't been loaded in the document. Fixed line widths.
 	Start paragraph after mdframed environment.
+	https://puszcza.gnu.org.ua/bugs/?217
 
 2017-04-27  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): use CSS instead of rules="groups"
-	attribute for vertical lines in tables
+	attribute for vertical lines in tables.
 	* tex4ht-4ht.tex (xcolor.4ht): new command \get:xcolorcss, for 
 	conversion from xcolor color spec to CSS colors.
 	* tex4ht-4ht.tex (mdframed.4ht),
-	* tex4ht-html4.tex (html4.4ht): added basic support for Mdframed
-	package.
-	https://puszcza.gnu.org.ua/bugs/?217.
+	* tex4ht-html4.tex (html4.4ht): added basic support for mdframed
+	package. https://puszcza.gnu.org.ua/bugs/?217
 
 2017-04-22  Karl Berry  <karl at freefriends.org>

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2017-04-28 17:17:21 UTC (rev 297)
+++ trunk/lit/Makefile	2017-04-28 22:28:51 UTC (rev 298)
@@ -24,7 +24,14 @@
 
 default: all
 
-common = tex4ht-cpright.tex common.tex common-code.tex ProTex.sty AlProTex.sty
+# 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.
+# 
+common_no_cond_sty = tex4ht-cpright.tex common.tex common-code.tex \
+  ProTex.sty AlProTex.sty
+common = mktex4ht.4ht tex4ht.sty $(common_no_cond_sty)
 common_info = $(common) common-info.tex
 derived = 
 
@@ -33,9 +40,8 @@
   algorithmic.4ht \
   biblatex.4ht book.4ht \
   caption.4ht color.4ht colortbl.4ht \
-  frenchb.4ht \
   fontspec.4ht fontspec-4ht.lua fontspec-luatex.4ht fontspec-xetex.4ht \
-  framed.4ht \
+    framed.4ht frenchb.4ht \
   geometry.4ht graphics.4ht graphicx.4ht \
   hyperref.4ht \
   latex.4ht lettrine.4ht listings.4ht \
@@ -235,7 +241,7 @@
 # 

 all: $(derived)
 
-$(tex4ht_4ht_derived): tex4ht-4ht.tex $(common)
+$(tex4ht_4ht_derived): tex4ht-4ht.tex cond4ht.4ht $(common)
 	tex $(tex_opts) $<
 
 $(tex4ht_bibtex2_derived): tex4ht-bibtex2.tex $(common)
@@ -244,7 +250,8 @@
 $(tex4ht_c_derived): tex4ht-c.tex $(common)
 	tex $(tex_opts) $<
 
-$(tex4ht_cond4ht_derived): tex4ht-cond4ht.tex mktex4ht-cnf.tex $(common)
+$(tex4ht_cond4ht_derived): tex4ht-cond4ht.tex mktex4ht-cnf.tex \
+                           $(common_no_cond_sty)
 	tex $(tex_opts) $<
 	tex $(tex_opts) cond4ht.4ht
 
@@ -356,7 +363,7 @@
 $(tex4ht_options_derived): tex4ht-options.tex $(common)
 	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
-$(tex4ht_sty_derived): tex4ht-sty.tex $(common)
+$(tex4ht_sty_derived): tex4ht-sty.tex $(common_no_cond_sty)
 	$(HTTEX) $< ""
 
 $(tex4ht_svg_derived): tex4ht-svg.tex $(common)

Modified: trunk/lit/mktex4ht-cnf.tex
===================================================================
--- trunk/lit/mktex4ht-cnf.tex	2017-04-28 17:17:21 UTC (rev 297)
+++ trunk/lit/mktex4ht-cnf.tex	2017-04-28 22:28:51 UTC (rev 298)
@@ -1,5 +1,5 @@
 % $Id$
-% Copyright 2016 TeX Users Group    
+% Copyright 2016-2017 TeX Users Group    
 % Released under LPPL 1.3c+.
 % See tex4ht-cpright.tex for license text.
 %


Property changes on: trunk/lit/mktex4ht-cnf.tex
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id
\ No newline at end of property