[tex4ht-commits] [SCM] tex4ht updated: r195 - in trunk/lit: . extra-bin

deimi at gnu.org.ua deimi at gnu.org.ua
Mon Oct 3 14:44:20 CEST 2016


Author: deimi
Date: 2016-10-03 15:44:20 +0300 (Mon, 03 Oct 2016)
New Revision: 195

Added:
   trunk/lit/extra-bin/
   trunk/lit/extra-bin/vcss
   trunk/lit/extra-bin/xmllint
Removed:
   trunk/lit/html4.4ht-released
   trunk/lit/vcss
   trunk/lit/xmllint
Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
Log:
amend Makefile: set PATH, set -recorder option for tex/latex; move vcss and xmllint to ./extra-bin; unlink html4.4ht-released

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2016-09-30 09:51:40 UTC (rev 194)
+++ trunk/lit/ChangeLog	2016-10-03 12:44:20 UTC (rev 195)
@@ -1,3 +1,18 @@
+2016-10-03 Deimantas Galcius <deimantas.galcius at gmail.com>
+
+	* Makefile (PATH): set PATH to look into $extra_bin and $ht_bin;
+	TeXLive 2016 (DVD) does not ship with 'xhlatex', so we find it in $ht_bin.
+	* Makefile (tex_options): set '-recorder' option to $tex_opts. We want to know
+	deps/derived files
+	* Makefile (clean): add '*.fls' for removal
+	* Makefile (ht tex): replace with $(HTTEX) which respects $tex_opts
+	* Makefile ("-d./" in htlatex calls): replace "-d./" with "".
+	"-d./" means move generated files to current folder, which does not make sense.
+	* Makefile (html4): Amend $(tex4ht_html4_derived) rule. No dependency on
+	html4.4ht-released
+	* Remove (html4.4-released): Delete file. (hopefully) not needed any more.
+	* Makefile: change $(dev_null) to "".
+
 2016-09-29 Deimantas Galcius <deimantas.galcius at gmail.com>
 
 	* common-info.tex (CleanComment): fix CleanComment to not

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2016-09-30 09:51:40 UTC (rev 194)
+++ trunk/lit/Makefile	2016-10-03 12:44:20 UTC (rev 195)
@@ -3,11 +3,22 @@
 # 
 # todo: look for xx below
 
+SHELL := /bin/sh
+extra_bin := ./extra-bin
+ht_bin := ../bin/ht/unix
+PATH := $(shell echo $$PATH)
+# setting PATH as TeX Live 2016 (DVD) does not ship with 'xhlatex'
+# and look for xmlint/vcss in ./extra-bin
+export PATH:=$(ht_bin):$(extra_bin):$(PATH)
+
+
 wd = work.dir
-tex_opts = --interaction=nonstopmode #--file-line-error
+tex_opts = --interaction=nonstopmode -recorder #--file-line-error
 tex_1opt = "$(tex_opts)" # must be quoted, passing to shell script
 dev_null = </dev/null    # when we don't call tex directly.
 
+HTTEX = ht "tex $(tex_opts)"  # set tex options for plain tex
+
 default: all
 
 common = tex4ht-cpright.tex common.tex common-code.tex ProTex.sty AlProTex.sty
@@ -207,87 +218,83 @@
 	tex $(tex_opts) cond4ht.4ht
 
 $(tex4ht_docbook_derived): tex4ht-docbook.tex $(common)
-	xhlatex $< "html,3" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3" "" "" $(tex_1opt)
 
 $(tex4ht_docbook_xtpipes_derived): tex4ht-docbook-xtpipes.tex $(common)
-	xhlatex $< "html,3" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3" "" "" $(tex_1opt)
 
 $(tex4ht_env_derived): tex4ht-env.tex $(common)
-	htlatex $< "xhtml,3" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,3" "" "" $(tex_1opt)
 
 $(tex4ht_fonts_cjk_derived): tex4ht-fonts-cjk.tex
-	ht tex $< $(dev_null)
+	$(HTTEX) $< ""
 
 $(tex4ht_fonts_cjk_utf8_derived): tex4ht-fonts-cjk-utf8.tex
-	ht tex $< $(dev_null)
+	$(HTTEX) $< ""
 
 $(tex4ht_fonts_noncjk_derived) $(tex4ht_fonts_modern_derived): \
   tex4ht-fonts-noncjk.tex tex4ht-fonts-modern.tex $(common)
-	ht tex $< $(dev_null)
+	$(HTTEX) $< ""
 
 $(tex4ht_htcmd_derived): tex4ht-htcmd.tex $(common)
-	ht tex $< $(dev_null)
+	$(HTTEX) $< ""
 
 $(tex4ht_html_speech_derived): tex4ht-html-speech.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_html_speech_xtpipes_derived): tex4ht-html-speech-xtpipes.tex $(common)
-	htlatex $< "html,next,3" "" "-d./" $(tex_1opt)
+	htlatex $< "html,next,3" "" "" $(tex_1opt)
 
 $(tex4ht_html0_derived): tex4ht-html0.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_html32_derived): tex4ht-html32.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
-# must create/update html4.4ht-released by hand.
 $(tex4ht_html4_derived): tex4ht-html4.tex $(common)
-	cp html4.4ht-released html4.4ht && latex $(tex_opts) $<
-	cp html4.4ht-released html4.4ht && latex $(tex_opts) $<
-	cp html4.4ht-released html4.4ht && latex $(tex_opts) $<
 	latex $(tex_opts) $<
 
 $(tex4ht_info_html4_derived): tex4ht-info-html4.tex $(common_info)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_info_javahelp_derived): tex4ht-info-javahelp.tex $(common_info)
-	htlatex $< "html,sections+" "" "-d./" $(tex_1opt)
+	htlatex $< "html,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_info_mml_derived): tex4ht-info-mml.tex $(common_info)
-	htlatex $< "html,sections+" "" "-d./" $(tex_1opt)
+	htlatex $< "html,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_info_ooffice_derived): tex4ht-info-ooffice.tex $(common_info)
-	htlatex $< "html,sections+" "" "-d./" $(tex_1opt)
+	htlatex $< "html,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_info_svg_derived): tex4ht-info-svg.tex $(common_info)
-	htlatex $< "html,sections+" "" "-d./" $(tex_1opt)
+	htlatex $< "html,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_info_derived): tex4ht-info.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_javahelp_derived): tex4ht-javahelp.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_javahelp_xtpipes_derived): tex4ht-javahelp-xtpipes.tex $(common)
-	htlatex $< "xhtml,next,3" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,next,3" "" "" $(tex_1opt)
 
 $(tex4ht_jsmath_derived): tex4ht-jsmath.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_jsml_xtpipes_derived): tex4ht-jsml-xtpipes.tex $(common)
-	htlatex $< "xhtml,next,3" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,next,3" "" "" $(tex_1opt)
 
 $(tex4ht_jsml_derived): tex4ht-jsml.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_mathltx_derived): tex4ht-mathltx.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_mathml_derived): tex4ht-mathml.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_mathplayer_derived): tex4ht-mathplayer.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_mkht_derived): tex4ht-mkht.tex $(common)
 	latex $(tex_opts) $<
@@ -295,46 +302,46 @@
 	latex $(tex_opts) mkht-scripts.4ht
 
 $(tex4ht_moz_derived): tex4ht-moz.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_oo_xtpipes_derived): tex4ht-oo-xtpipes.tex $(common)
-	htlatex $< "xhtml,next,3" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,next,3" "" "" $(tex_1opt)
 
 $(tex4ht_ooffice_derived): tex4ht-ooffice.tex $(common)
-	htlatex $< "xhtml,4,sections+" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,4,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_ooimpress_derived): tex4ht-ooimpress.tex $(common)
-	htlatex $< "xhtml,4,sections+" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,4,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_options_derived): tex4ht-options.tex $(common)
-	mk4ht xhlatex $< $(dev_null)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_sty_derived): tex4ht-sty.tex $(common)
-	ht tex $< $(dev_null)
+	$(HTTEX) $< ""
 
 $(tex4ht_svg_derived): tex4ht-svg.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_t4ht_derived): tex4ht-t4ht.tex $(common)
-	ht tex $< $(dev_null)
+	$(HTTEX) $< ""
 
 $(tex4ht_tei_derived): tex4ht-tei.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_unicode_derived): tex4ht-unicode.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_word_derived): tex4ht-word.tex $(common)
-	xhlatex $< "html,3,sections+" "" "-d./" $(tex_1opt)
+	xhlatex $< "html,3,sections+" "" "" $(tex_1opt)
 
 $(tex4ht_xhtml_xtpipes_derived): tex4ht-xhtml-xtpipes.tex $(common)
-	htlatex $< "xhtml,3,next" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,3,next" "" "" $(tex_1opt)
 
 $(tex4ht_xhtmml_xtpipes_derived): tex4ht-xhtmml-xtpipes.tex $(common)
-	htlatex $< "xhtml,3,next" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,3,next" "" "" $(tex_1opt)
 
 $(xtpipes_derived): xtpipes.tex $(common)
-	htlatex $< "xhtml,3,next" "" "-d./" $(tex_1opt)
+	htlatex $< "xhtml,3,next" "" "" $(tex_1opt)
 # Derived files are generated in . and $(wd).
 # (corresponds to src/java for xtpipes.tex)
 
@@ -439,6 +446,7 @@
 	rm -rf $(wd)
 	rm -f *.4ct *.4tc *.aux *.css *.dvi *.idv *.lg *.log *.tmp *.trc *.xref
 	rm -f *.4es *.bat *.unix *.htf *.html *.png tmp
+	rm -f *.fls
 
 clean1:
 	rm -f $(f).[0-s]* $(f).[u-z]* $(f).trc

Index: trunk/lit/extra-bin/vcss
===================================================================
--- trunk/lit/extra-bin/vcss	2016-09-30 09:51:40 UTC (rev 194)
+++ trunk/lit/extra-bin/vcss	2016-10-03 12:44:20 UTC (rev 195)

Property changes on: trunk/lit/extra-bin/vcss
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/lit/extra-bin/xmllint
===================================================================
--- trunk/lit/extra-bin/xmllint	2016-09-30 09:51:40 UTC (rev 194)
+++ trunk/lit/extra-bin/xmllint	2016-10-03 12:44:20 UTC (rev 195)

Property changes on: trunk/lit/extra-bin/xmllint
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property


More information about the tex4ht-commits mailing list