schemata (30jan16)

git-svn-id: svn://tug.org/texlive/trunk@39510 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 169 insertions, 83 deletions

diff --git a/Master/texmf-dist/doc/generic/schemata/Makefile b/Master/texmf-dist/doc/generic/schemata/Makefile
index ecf28b60b06..b10f10c47b4 100644
--- a/Master/texmf-dist/doc/generic/schemata/Makefile
+++ b/Master/texmf-dist/doc/generic/schemata/Makefile
@@ -1,48 +1,35 @@
-engine ?= pdflatex	# Override on the command line
-
-# The default builds the distribution uploaded to CTAN.
-dist:		fullpdf clean
-
-# Making this target includes the code listing
-fullpdf	:	sty
-		$(engine) schemata.dtx
-		makeindex -s gglo.ist -o schemata.gls schemata.glo
-		makeindex -s gind.ist -o schemata.ind schemata.idx
-		$(engine) schemata.dtx
-		$(engine) schemata.dtx
-
-# This target omits the code listing.
-pdf	:	sty
-		$(engine) -draftmode "\AtBeginDocument{\OnlyDescription} \input schemata.dtx"
-		makeindex -s gglo.ist -o schemata.gls schemata.glo
-		makeindex -s gind.ist -o schemata.ind schemata.idx
-		$(engine) "\AtBeginDocument{\OnlyDescription} \input schemata.dtx"
-		$(engine) "\AtBeginDocument{\OnlyDescription} \input schemata.dtx"
-
-# Build the package.
-sty	:	schemata.dtx schemata.ins
-		$(engine) schemata.ins
-
-# Instead of using the shell to see if files exist, take advantage of rm.
-clean	:
-		rm -f schemata.aux
-		rm -f schemata.glo
-		rm -f schemata.gls
-		rm -f schemata.idx
-		rm -f schemata.ilg
-		rm -f schemata.ind
-		rm -f schemata.log
-		rm -f schemata.out
-		rm -f schemata.toc
-		rm -f schemata.hd
-		rm -f schemata.top
-		rm -f texput.*
-
-# Remove all but the barest source files.
-clobber	:	clean
-		rm -f schemata.dvi
-		rm -f schemata.pdf
-		rm -f schemata.sty
-		touch schemata.*
-
-
+NAME  = schemata
+SHELL = bash
+PWD   = $(shell pwd)
+VERS  = $(shell ltxfileinfo -v $(NAME).dtx|sed -e 's/^v//')
+LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
+UTREE = $(shell kpsewhich --var-value TEXMFHOME)
+all:	$(NAME).pdf
+	test -e README.txt && mv README.txt README || exit 0
+$(NAME).pdf: $(NAME).dtx
+	pdflatex -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+	if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
+	if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+clean:
+	rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out,toc} README.txt
+distclean: clean
+	rm -f $(NAME).{pdf,sty} README
+inst: all
+	mkdir -p $(UTREE)/{tex,source,doc}/generic/$(NAME)
+	cp $(NAME).dtx $(UTREE)/source/generic/$(NAME)
+	cp Makefile $(UTREE)/source/generic/$(NAME)
+	cp $(NAME).sty $(UTREE)/tex/generic/$(NAME)
+	cp $(NAME).pdf $(UTREE)/doc/generic/$(NAME)
+install: all
+	sudo mkdir -p $(LOCAL)/{tex,source,doc}/generic/$(NAME)
+	sudo cp $(NAME).dtx $(LOCAL)/source/generic/$(NAME)
+	sudo cp Makefile $(LOCAL)/source/generic/$(NAME)
+	sudo cp $(NAME).sty $(LOCAL)/tex/generic/$(NAME)
+	sudo cp $(NAME).pdf $(LOCAL)/doc/generic/$(NAME)
+zip: all
+	ln -sf . $(NAME)
+	zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README,Makefile,$(NAME).{pdf,dtx}}
+	rm $(NAME)
diff --git a/Master/texmf-dist/doc/generic/schemata/README b/Master/texmf-dist/doc/generic/schemata/README
index be60fa73138..b3a599bae3b 100644
--- a/Master/texmf-dist/doc/generic/schemata/README
+++ b/Master/texmf-dist/doc/generic/schemata/README
@@ -1,59 +1,79 @@
-The schemata package
-Charles P. Schaum
-charles dot schaum at comcast dot net
-v0.7 from 2013/09/23
+|
+--------:| ----------------------------------------------------------------
+schemata:| Generic package to aid construction of topical categories
+  Author:| Charles P. Schaum
+  E-mail:| charles dot schaum at comcast dot net
+ License:| Released under the LaTeX Project Public License v1.3c or later
+     See:| http://www.latex-project.org/lppl.txt
 
-Abstract
+Short description:
+The schemata package helps the creation of topical outlines that illustrate the breakdown of concepts and categories in academic texts from the late medieval to early modern periods.
 
-The schemata package facilitates the creation of topical schemata, outlines that use braces (or facsimiles thereof) to illustrate the breakdown of concepts and categories in Scholastic thought from late medieval and early modern periods. This packages functions with both plain TeX and LaTeX.
+Files  Distribution
 
-Files
+README       This file
+schemata.pdf Documentation
 
-README		This file 	(normally in TEXMFDIST/doc/generic/schemata)
-schemata.pdf	Documentation	(normally in TEXMFDIST/doc/generic/schemata)
-
-Makefile	Automates building with GNU make 3.81
-schemata.ins	Installer
-schemata.dtx	LaTeX file containing both code and documentation. 
+Makefile     Automates building with GNU make 3.81
+schemata.dtx Documented LaTeX file containing both code and documentation
 
 Installation
 
-Unpack schemata.zip.
+Unpack schemata-XX.zip in an appropriate directory.
+
+Note that the instructions below assume that you are using a *nix-
+compatible computer. If that is otherwise, you will need to modify
+these instructions to your needs.
+
+If you have a make utility compatible with GNU make you can type
+
+make inst
+
+to install the package into your $TEXMFHOME tree or
 
-Generate the file schemata.sty, e.g.:
-	$ pdflatex schemata.ins
+make install
 
-Usually this will go in TEXMFDIST/tex/generic/schemata.
+to install the package into your $TEXMFLOCAL tree for all users.
 
-Generate the documentation:
-	$ pdflatex schemata.dtx
-	$ makeindex -s gglo.ist -o schemata.gls schemata.glo
-	$ makeindex -s gind.ist -o schemata.ind schemata.idx
-	$ pdflatex schemata.dtx
-	$ pdflatex schemata.dtx
+Manually, you can generate the package files. First you generate the
+installer driver, README, and style files, with a preliminary PDF:
 
-I used GNU make to automate the process:
-	$ make
+pdflatex -shell-escape -recorder -interaction=batchmode schemata.dtx
 
-Create the directories listed above. For TeX Live, TEXMFDIST is often /usr/local/texmf/<year>/texmf-dist on Posix-compliant systems. Manual installation calls rather for /usr/local/texlive/texmf-local or ~/texmf.
+Next you generate the PDF with a table of contents and all cross-references
+validated, so that the index entries will not move:
 
-MacTeX and MikTeX differ. Please refer to your distribution manual.
+pdflatex --recorder --interaction=nonstopmode schemata.dtx
 
-Copy the distribution files to their appropriate destinations.
+The next commands generate the glossary/index and final pdf file
 
-Run mktexlsr with the appropriate level of permissions.
+makeindex -q -s gglo.ist -o schemata.gls schemata.glo
+makeindex -q -s gind.ist -o schemata.ind schemata.idx
+pdflatex --recorder --interaction=nonstopmode schemata.dtx
+pdflatex --recorder --interaction=nonstopmode schemata.dtx
 
-Source distribution notes:
+Normally you create the following manual installation directories for user:
 
-Testing notes:
+$TEXMFHOME/source/generic/schemata dtx file
+$TEXMFHOME/tex/generic/schemata sty file
+$TEXMFHOME/doc/generic/schemata pdf file
 
-This package is designed purposefully to be very basic.
+and you create the following manual installation directories for local site:
 
-For testing purposes, the make file permits one to change the typesetting engine on the command line. The default is to build the package with pdflatex. See Makefile for more details.
+$TEXMFLOCAL/source/generic/schemata dtx file
+$TEXMFLOCAL/tex/generic/schemata sty file
+$TEXMFLOCAL/doc/generic/schemata pdf file
+
+The above environment variables often are /usr/local/texlive/texmf-local for
+$TEXMFLOCAL and ~/texmf for $TEXMFHOME.
+
+Run mktexlsr with the appropriate level of permissions to complete the install.
+
+This packages works with LaTeX and plain TeX.
 
 License
 
-This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
+This material is subject to the LaTeX Project Public License:
+http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
 
 Happy TeXing!
-
diff --git a/Master/texmf-dist/doc/generic/schemata/README.txt b/Master/texmf-dist/doc/generic/schemata/README.txt
new file mode 100644
index 00000000000..b3a599bae3b
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/schemata/README.txt
@@ -0,0 +1,79 @@
+|
+--------:| ----------------------------------------------------------------
+schemata:| Generic package to aid construction of topical categories
+  Author:| Charles P. Schaum
+  E-mail:| charles dot schaum at comcast dot net
+ License:| Released under the LaTeX Project Public License v1.3c or later
+     See:| http://www.latex-project.org/lppl.txt
+
+Short description:
+The schemata package helps the creation of topical outlines that illustrate the breakdown of concepts and categories in academic texts from the late medieval to early modern periods.
+
+Files  Distribution
+
+README       This file
+schemata.pdf Documentation
+
+Makefile     Automates building with GNU make 3.81
+schemata.dtx Documented LaTeX file containing both code and documentation
+
+Installation
+
+Unpack schemata-XX.zip in an appropriate directory.
+
+Note that the instructions below assume that you are using a *nix-
+compatible computer. If that is otherwise, you will need to modify
+these instructions to your needs.
+
+If you have a make utility compatible with GNU make you can type
+
+make inst
+
+to install the package into your $TEXMFHOME tree or
+
+make install
+
+to install the package into your $TEXMFLOCAL tree for all users.
+
+Manually, you can generate the package files. First you generate the
+installer driver, README, and style files, with a preliminary PDF:
+
+pdflatex -shell-escape -recorder -interaction=batchmode schemata.dtx
+
+Next you generate the PDF with a table of contents and all cross-references
+validated, so that the index entries will not move:
+
+pdflatex --recorder --interaction=nonstopmode schemata.dtx
+
+The next commands generate the glossary/index and final pdf file
+
+makeindex -q -s gglo.ist -o schemata.gls schemata.glo
+makeindex -q -s gind.ist -o schemata.ind schemata.idx
+pdflatex --recorder --interaction=nonstopmode schemata.dtx
+pdflatex --recorder --interaction=nonstopmode schemata.dtx
+
+Normally you create the following manual installation directories for user:
+
+$TEXMFHOME/source/generic/schemata dtx file
+$TEXMFHOME/tex/generic/schemata sty file
+$TEXMFHOME/doc/generic/schemata pdf file
+
+and you create the following manual installation directories for local site:
+
+$TEXMFLOCAL/source/generic/schemata dtx file
+$TEXMFLOCAL/tex/generic/schemata sty file
+$TEXMFLOCAL/doc/generic/schemata pdf file
+
+The above environment variables often are /usr/local/texlive/texmf-local for
+$TEXMFLOCAL and ~/texmf for $TEXMFHOME.
+
+Run mktexlsr with the appropriate level of permissions to complete the install.
+
+This packages works with LaTeX and plain TeX.
+
+License
+
+This material is subject to the LaTeX Project Public License:
+http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+
+Happy TeXing!
diff --git a/Master/texmf-dist/doc/generic/schemata/schemata.hd b/Master/texmf-dist/doc/generic/schemata/schemata.hd
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/schemata/schemata.hd
diff --git a/Master/texmf-dist/doc/generic/schemata/schemata.pdf b/Master/texmf-dist/doc/generic/schemata/schemata.pdf
index ea77f26fd71..39d04c7c3b7 100644
--- a/Master/texmf-dist/doc/generic/schemata/schemata.pdf
+++ b/Master/texmf-dist/doc/generic/schemata/schemata.pdf