[tex4ht-commits] [SCM] tex4ht updated: r924 - in trunk: . doc/mn lit lit/archive lit/extra- [more]
karl at gnu.org.ua
karl at gnu.org.ua
Mon May 3 00:55:22 CEST 2021
Author: karl
Date: 2021-05-02 22:55:22 +0000 (Sun, 02 May 2021)
New Revision: 924
Added:
trunk/doc/mn/README
trunk/lit/archive/
trunk/lit/archive/Makefile.exp
trunk/lit/archive/fls2d
trunk/lit/archive/fls2x
trunk/lit/archive/flslg2d
Removed:
trunk/NEWS
trunk/lit/Makefile.exp
trunk/lit/extra-bin/fls2d
trunk/lit/extra-bin/fls2x
trunk/lit/extra-bin/flslg2d
Modified:
trunk/Makefile
trunk/README
trunk/doc/mn/Makefile
trunk/lit/ChangeLog
trunk/lit/Makefile
trunk/lit/README
Log:
support for installation of source files in TeX Live
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2021-05-02 18:23:20 UTC (rev 923)
+++ trunk/Makefile 2021-05-02 22:55:22 UTC (rev 924)
@@ -1,37 +1,17 @@
# $Id: Makefile 7 2009-09-17 20:57:49Z karl $
# This file is public domain. Written originally 2009, Karl Berry.
-pkg = tex4ht
-version = 1.1
-relname = $(pkg)-$(version)
+# These commands diff and install the doc and source files from
+# development to a TeX Live repository. CTAN mirrors them from TL.
-ctandir = ctan
-texmfdir = $(ctandir)/texmf
-4htdir = $(texmfdir)/tex/generic/tex4ht
-htfontsdir = $(texmfdir)/tex4ht/ht-fonts
-docdir = $(texmfdir)/doc/generic/tex4ht
-4htfiles = $(wildcard lit/*.4ht) lit/tex4ht.sty
-htfontsfiles = lit/tex4ht.dir/texmf/tex4ht/ht-fonts/*
-docfiles = $(wildcard doc/mn/*.html) $(wildcard doc/mn/*.css) $(wildcard doc/mn/*.tex)
+tl-diff: tl-diff-doc tl-diff-src
+tl-diff-doc:
+ cd doc/mn && $(MAKE) diff-doc
+tl-diff-src:
+ cd lit && $(MAKE) diff-source
-.PHONY: ctan
-
-dist: $(relname).tar.gz
-$(relname).tar.gz: force
- rm -f $@
- tar -czf $@ --owner=0 --group=0 \
- --transform="s,^,$(relname)/," --exclude-vcs \
- *
- tar tf $@ | head
-# * won't really work, just a placeholder.
-
-force:
-
-ctan:
- @rm -rf $(ctan)
- @mkdir -p $(4htdir) $(htfontsdir) $(docdir)
- @cp $(4htfiles) $(4htdir)
- @cp -r $(htfontsfiles) $(htfontsdir)
- @cp $(docfiles) $(docdir)
- cd $(ctandir) && zip -r tex4ht-ctan.zip texmf
-
+tl-install: tl-install-doc tl-install-src
+tl-install-doc:
+ cd doc/mn && $(MAKE) install-doc
+tl-install-src:
+ cd lit && $(MAKE) install-src
Modified: trunk/README
===================================================================
--- trunk/README 2021-05-02 18:23:20 UTC (rev 923)
+++ trunk/README 2021-05-02 22:55:22 UTC (rev 924)
@@ -5,10 +5,10 @@
TeX-related documents to HTML, XML, and other related formats.
It is released under the LaTeX Project Public License, v1.3 or later.
-Home page: http://tug.org/tex4ht
-General mailing list: http://lists.tug.org/tex4ht
-Commits mailing list: http://lists.tug.org/tex4ht-commits
-Development project: http://puszcza.gnu.org.ua/projects/tex4ht/
+Home page: https://tug.org/tex4ht
+General mailing list: https://lists.tug.org/tex4ht
+Commits mailing list: https://lists.tug.org/tex4ht-commits
+Development project: https://puszcza.gnu.org.ua/projects/tex4ht/
Bug reports: please include enough information for the maintainers to
reproduce the problem. Generally speaking, that means:
@@ -25,13 +25,13 @@
Installation:
Unfortunately, we cannot write a simple description of how to install
tex4ht. We hope to improve this in the future. For terse information
- on how it is installed in TeX Live, see the file
+ on how it was installed in TeX Live, see the file
http://tug.org/svn/texlive/trunk/Master/tlpkg/bin/tl-update-4ht.
-------------------------------------------------------------------------------
TeX4ht was created by Eitan Gurari at Ohio State University,
who died unexpectedly in June 2009. We miss you, Eitan.
With the permission and encouragement of Eitan's family,
-CV Radhakrishnan, Karl Berry, and others have taken over maintenance of the
+Michal Hoftich, Karl Berry, and others have taken over maintenance of the
package, and welcome other volunteers. Any involvement, from bug reports
to major new development, is appreciated.
Modified: trunk/doc/mn/Makefile
===================================================================
--- trunk/doc/mn/Makefile 2021-05-02 18:23:20 UTC (rev 923)
+++ trunk/doc/mn/Makefile 2021-05-02 22:55:22 UTC (rev 924)
@@ -10,7 +10,7 @@
endif
tex = $(dev) etex -interaction=nonstopmode -file-line-error
-bld: clean
+all: clean
# chmod -R a+rwX . # as received from OSU
$(tex) mn && $(tex) mn && $(tex) mn
$(dev) tex4ht mn </dev/null
@@ -21,11 +21,11 @@
inst_dir = /r/tug/home/texlive/karl/Master/texmf-dist/doc/generic/tex4ht
# look for "Only in /..." for files in TL now that should be removed.
-dif:
+diff-doc:
diff -u0 $(inst_dir) . | grep -v '<small>Generated '
# have to add new files by hand.
-install:
+install install-doc:
cp -p `(cd $(inst_dir) && \ls)` $(inst_dir)
svn status $(inst_dir)
Index: trunk/doc/mn/README
===================================================================
--- trunk/doc/mn/README 2021-05-02 18:23:20 UTC (rev 923)
+++ trunk/doc/mn/README 2021-05-02 22:55:22 UTC (rev 924)
Property changes on: trunk/doc/mn/README
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog 2021-05-02 18:23:20 UTC (rev 923)
+++ trunk/lit/ChangeLog 2021-05-02 22:55:22 UTC (rev 924)
@@ -1,5 +1,12 @@
2021-05-02 Karl Berry <karl at freefriends.org>
+ * Makefile (diff-src, install-src, list-src): new targets
+ to handle source files, found via svn status -v.
+ * README: update.
+ * archive/: move Makefile.exp and extra-bin/fls* here,
+ so we don't install them as current source files.
+ Still hope to use them one day.
+
* tex4ht-4ht.tex (polyglossia.4ht, tuenc-xetex-input.4ht): 2021.
(aa.4ht): \write version.
Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile 2021-05-02 18:23:20 UTC (rev 923)
+++ trunk/lit/Makefile 2021-05-02 22:55:22 UTC (rev 924)
@@ -663,6 +663,9 @@
rm -f *.fls
rm -f tex4ht-dir.tex
+mostlyclean:
+ rm -f $(derived)
+
clean1:
rm -f $(f).[0-s]* $(f).[u-z]* $(f).trc
@@ -694,6 +697,7 @@
inst_dir_4ht = $(texmf)/tex/generic/tex4ht
inst_dir_top = $(texmf)/tex4ht
inst_dir_scripts = $(texmf)/scripts/tex4ht
+inst_dir_source = $(texmf)/source/tex4ht
# Simple command to "install" from dev to TL.
# (Other methods are also used.)
@@ -720,7 +724,27 @@
$(install_data) $$f $$inst_f; done
#
-# Let's write out the commands for updating fonts.
+# Checking and updating source files from development vs. TeX Live,
+# from whence they get to CTAN.
+
+srcfiles = $(shell svn status -v | awk '{print $$NF}' \
+ | egrep -v '^\.|^archive|ProTex.sty$$')
+
+# Diff source files from installed to dev.
+diff-src:
+ for f in $(srcfiles); do $(diff) $$f $(inst_dir_source)/$$f; done
+#
+# Install from dev to installed.
+install-src:
+ for f in $(srcfiles); do $(install_data) $$f $(inst_dir_source); done
+#
+# Just list the files.
+list-src:
+ @echo $(srcfiles) | tr ' ' '\n'
+
+#
+# Checking and updating font support files.
+#
ht_fonts_instdir = $(inst_dir_top)/ht-fonts
#
install-unicode-4hf:
@@ -796,6 +820,7 @@
-cd $(inst_dir_4ht) && for f in *; do \
grep 'write-1.*version' $$f >/dev/null || echo $$f; done
+#
# diff one specified file, as in "make d1 d=filename.4ht".
diff1 d1:
$(diff) $(inst_dir_4ht)/$(d) .
@@ -804,9 +829,6 @@
diff = diff -u0 --ignore-all-space --ignore-blank-lines \
--ignore-matching-lines='write-1.version\|, generated from\|Copyright'
-# simple abbrev.
+# final simple abbrev for convenience.
upmake upm:
svn update && make
-
-mostlyclean:
- rm -f $(derived)
Modified: trunk/lit/README
===================================================================
--- trunk/lit/README 2021-05-02 18:23:20 UTC (rev 923)
+++ trunk/lit/README 2021-05-02 22:55:22 UTC (rev 924)
@@ -1,14 +1,23 @@
$Id$
This file is public domain. Originally written 2010, Karl Berry.
-Eitan devised his own literate programming system, which supports
-multiple output files from a single source (http://ctan.org/pkg/protex).
-The files here are such "literate" source files. They are processed
-with (ht)(la)tex, as given by commands at the top.
+Sources for TeX4ht, https://tug.org/tex4ht.
+Eitan Gurari (the original author of tex4ht) devised his own literate
+programming system, which supports multiple output files from a single
+source (https://ctan.org/pkg/protex). The files here are such "literate"
+source files. They are processed with (ht)(la)tex, as given by commands
+at the top of each file and in the Makefile.
+
The extra-bin subdirectory contains do-nothing scripts named xmllint
and vcss, which are called for validation via tex4ht-env.tex. (Of
course they won't be used unless ./extra-bin is early enough in PATH.)
The real xmllint can take a long time to run, and fails to find the
-DTD on the tex4ht-docbook*.html output, for no apparent reason.
+DTD on the tex4ht-docbook*.html output.
+The Makefile has commands to build the derived files (e.g., *.4ht) from
+the *.tex sources, compare them against an installed system, etc. Much
+work remains to be done to make it a clean build, but it's a start.
+
+Bug reports and patches are most welcome. See https://tug.org/tex4ht
+for contact and other information.
More information about the tex4ht-commits
mailing list.