struktex (25jun17)

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

11 files changed, 290 insertions, 132 deletions

diff --git a/Master/texmf-dist/doc/latex/struktex/LIESMICH b/Master/texmf-dist/doc/latex/struktex/LIESMICH
deleted file mode 100644
index 1d26234b8c7..00000000000
--- a/Master/texmf-dist/doc/latex/struktex/LIESMICH
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Revision: 52 $
-#
-Das LaTeX-Paket "struktex.dtx" enthaelt Makros zur Erzeugung von
-Nassi-Shneidermann-Struktogrammen.
-
-Es besteht aus sechs Dateien:
-    LIESMICH          - diese Datei
-    README            - diese Datei in einer englischen Version
-    struktex.dtx      - das eigentliche Paket mit integrierter zweisprachiger
-                        Dokumentation
-    struktex.ins      - das Installationsskript
-    struktex.de.pdf   - die Dokumentation in deutscher Sprache
-    struktex.en.pdf   - die Dokumentation in englischer Sprache
-    
-Weitere Informationen sind der Dokumentation zu entnehmen.
-
-Hinweise auf Fehler nehme ich genauso wie Vorschlaege fuer die weitere 
-Entwicklung gerne entgegen unter j.hoffmann@fh-aachen.de.
-
-Diese Dateien unterliegen der LaTeX Project Public License. 
-Vgl. http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html 
-zu Details dieser Lizenz.
diff --git a/Master/texmf-dist/doc/latex/struktex/LIESMICH.md b/Master/texmf-dist/doc/latex/struktex/LIESMICH.md
new file mode 100644
index 00000000000..781ba9a518f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/struktex/LIESMICH.md
@@ -0,0 +1,64 @@
+StrukTeX - Zeichnen von Nassi-Shneidermann-Struktogrammen
+=========================================================
+
+Das LaTeX-Paket `StrukTeX` stellt Makros zur Erzeugung von
+Nassi-Shneidermann-Struktogrammen bereit.
+
+Das Paket besteht aus sechs Dateien:
+* `LIESMICH`             - diese Datei
+* `README`               - diese Datei in einer englischen Version
+* `struktex.dtx`         - der Quellcode des Paketes integrierter
+                           zweisprachiger Dokumentation
+* `struktex.ins`         - das Installationsskript
+
+Installation
+------------
+
+Mit
+    tex struktex.ins
+werden weitere Dateien erzeugt:
+
+ * `struktex.sty`         - das eigentliche Paket
+ * `struktex.el`          - eine Stil Datei zur Benutzung mit AUCTeX
+
+ * `strukdoc.sty`        \
+ * `struktxf.sty`        |
+ * `struktxp.sty`        |
+ * `struktex-test-0.nss` |- Dateien für die Formatierung der
+ * `struktex-test-1.tex` |  Dokumentation
+ * `struktex-test-2.tex` |
+ * `struktex-test-3.tex` |
+ * `struktex-test-4.tex` /
+
+ * `struktex.makemake`    - Skript zur Erstellung der Datei `Makefile`
+                           aus der Datei
+ * `struktex.mk`
+
+Mit
+    pdflatex struktex.dtx
+    makeindex -s gind.ist struktex.idx
+    pdflatex struktex.dtx
+    pdflatex struktex.dtx
+wird dann die formatierte deutschsprachige Dokumentation erzeugt.
+
+Für die Formatierung der Dokumentation werden neben den genannten
+Dateien die folgenden Pakete benötigt:
+ * `color`
+ * `hyperref`
+ * `ifthen`
+ * `nameref`
+ * `pict2e` (empfohlen) oder `curves` oder `emlines`
+ * `url`
+
+Abschließend müssen die Dateien `struktex.sty`, struktxf.sty`,
+`struktxp.sty`, `struktex.el` (emacs-AUCTeX-Unterstützung)
+und `struktex.pdf` in die üblichen Verzeichnisse kopiert werden.
+
+Weitere Informationen sind der Dokumentation zu entnehmen.
+
+Hinweise auf Fehler nehme ich genauso wie Vorschlaege fuer die weitere
+Entwicklung gerne entgegen unter j.hoffmann |at| fh-aachen.de.
+
+Diese Dateien unterliegen der LaTeX Project Public License.
+Vgl. http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+zu Details dieser Lizenz.
diff --git a/Master/texmf-dist/doc/latex/struktex/README b/Master/texmf-dist/doc/latex/struktex/README
deleted file mode 100644
index d22bd8dd049..00000000000
--- a/Master/texmf-dist/doc/latex/struktex/README
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# $Revision: 52 $
-#
-The LaTeX package "struktex.dtx" contains some macros which
-generate Nassi Shneidermann structure charts
-
-It consists of six files:
-    LIESMICH          - this file in a german version
-    README            - this file
-    struktex.dtx      - the actual package with integrated bi-lingual
-                        documentation
-    struktex.ins      - the installation script
-    struktex.de.pdf   - the documentation in german language
-    struktex.en.pdf   - the documentation in english language
-
-For further information see the documentation.
-
-At this moment the english documentation is very erroneous, I'm not an english 
-native speaker and some times I've missed updating the translation (the 
-package first was intended for internal use only). But I think the examples are 
-very helpful and speaking for themselves.
-
-Any hint as well as any proposal for further development are welcome at my
-email-address j.hoffmann@fh-aachen.de.
-
-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.
diff --git a/Master/texmf-dist/doc/latex/struktex/README.md b/Master/texmf-dist/doc/latex/struktex/README.md
new file mode 100644
index 00000000000..cb1faa2b911
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/struktex/README.md
@@ -0,0 +1,65 @@
+StrukTeX - Drawing of Nassi-Shneidermann Structured Box Charts
+==============================================================
+
+The LaTeX package `StrukTeX` provides macros for the generation of
+Nassi-Shneidermann structured box charts.
+
+The package consists of six files:
+* `README.md`            - this file
+* `LIESMICH.dm`          - this file in an german version
+* `struktex.dtx`         - the source code of the package with
+                           an integrated bilingual documentation
+* `struktex.ins`         - the installation script
+
+
+Installation
+------------
+
+With
+    tex struktex.ins
+several additional files are created:
+
+* `struktex.sty`         - the actual package
+* `struktex.el`          - a style file for use with AUCTeX
+
+* `strukdoc.sty`        \
+* `struktxf.sty`        |
+* `struktxp.sty`        |
+* `struktex-test-0.nss` |- Files for formatting the
+* `struktex-test-1.tex` |  documentation
+* `struktex-test-2.tex` |
+* `struktex-test-3.tex` |
+* `struktex-test-4.tex` /
+
+* `struktex.makemake`    - script for creating a `Makefile` file
+                           from the file
+* `struktex.mk`
+
+With
+    pdflatex "\def\primarylanguage{english}\input{struktex.dtx}"
+    makeindex -s gind.ist struktex.idx
+    pdflatex "\def\primarylanguage{english}\input{struktex.dtx}"
+    pdflatex "\def\primarylanguage{english}\input{struktex.dtx}"
+the formatted English-language documentation is generated.
+
+Finally, the files `struktex.sty`, `struktxf.sty`, `struktxp.sty`,
+`struktex.el` (emacs-AUCTeX-support) as well as
+`struktex.pdf` have to be copied into the usual directories.
+
+For the formatting of the documentation, besides the mentioned files
+the following packages are required:
+ * `color`
+ * `hyperref`
+ * `ifthen`
+ * `nameref`
+ * `pict2e` (empfohlen) oder `curves` oder `emlines`
+ * `url`
+
+Further information can be found in the documentation.
+
+I take notes for mistakes as well as suggestions for the further
+Development gladly under j.hoffmann | at | fh-aachen.de.
+
+This material issubject to the LaTeX Project Public License.
+See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+To details of this license.
diff --git a/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v141 b/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v141
deleted file mode 100644
index f40845ca8b0..00000000000
--- a/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v141
+++ /dev/null
@@ -1 +0,0 @@
-VERSION v141 of 2012/04/10
diff --git a/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v2.2-1 b/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v2.2-1
new file mode 100644
index 00000000000..32e8d388d0b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v2.2-1
@@ -0,0 +1 @@
+struktex version v2.2-1-g6fb75d1 of 2017-06-25
diff --git a/Master/texmf-dist/doc/latex/struktex/getversion.tex b/Master/texmf-dist/doc/latex/struktex/getversion.tex
deleted file mode 100644
index 1722ee6f8cf..00000000000
--- a/Master/texmf-dist/doc/latex/struktex/getversion.tex
+++ /dev/null
@@ -1,8 +0,0 @@
-
-\documentclass{ltxdoc}
-\nofiles
-\usepackage{struktex}
-\GetFileInfo{struktex.sty}
-\typeout{VERSION \fileversion\space of \filedate}
-\begin{document}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf b/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf
index d5ae4e46500..4e3a7cbd6f7 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.el b/Master/texmf-dist/doc/latex/struktex/struktex.el
index 05946964105..110f8ab27fd 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.el
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.el
@@ -1,22 +1,23 @@
 
 ;;; struktex.el --- AUCTeX style for `struktex.sty'
 
-;; Copyright (C) 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2006 - 2017 Free Software Foundation, Inc.
 
 ;; Author: J. Hoffmann <j.hoffmann_(at)_fh-aachen.de>
 ;; Maintainer: j.hoffmann_(at)_fh-aachen.de
-;; Created: 2006/01/17
+;; Created: 2017/06/06
 ;; Keywords: tex
 
 ;;; Commentary:
 ;;  This file adds support for `struktex.sty'
 
 ;;; Code:
+
 (TeX-add-style-hook
  "struktex"
  (lambda ()
-   ;; Add declaration to the list of environments which have an optional
-   ;; argument for each item.
+   ;; Add declaration to the list of environments which have
+   ;; an optional argument for each item.
    (add-to-list 'LaTeX-item-list
                 '("declaration" . LaTeX-item-argument))
    (LaTeX-add-environments
@@ -37,6 +38,8 @@
     '("exit" [ "Height" ] "What" )
     '("forever" TeX-mac-forever)
     "foreverend"
+    '("forallin" TeX-mac-forallin)
+    "forallin"
     '("ifthenelse" TeX-mac-ifthenelse)
     "change"
     "ifend"
@@ -65,7 +68,8 @@
    ))
 
 (defun LaTeX-env-struktogramm (environment)
-  "Insert ENVIRONMENT with width, height specifications and optional title."
+  "Insert ENVIRONMENT with width, height specifications and
+optional title."
   (let ((width (read-string "Width: "))
         (height (read-string "Height: "))
         (title (read-string "Title (optional): ")))
@@ -79,13 +83,14 @@
   "Insert ENVIRONMENT with an optional title."
   (let ((title (read-string "Title (optional): ")))
     (LaTeX-insert-environment environment
-                               (if (not (zerop (length title)))
-                                   (format "[%s]" title)))))
+                              (if (not (zerop (length title)))
+                                  (format "[%s]" title)))))
 
 (defun TeX-mac-case (macro)
-  "Insert \\case with all arguments, the needed \\switch(es) and the final \\caseend.
-These are optional height and the required arguments slope, number of cases,
-condition, and the texts for the different cases"
+  "Insert \\case with all arguments, the needed \\switch(es) and
+the final \\caseend. These are optional height and the required
+arguments slope, number of cases, condition, and the texts for
+the different cases"
   (let ((height (read-string "Height (optional): "))
         (slope (read-string "Slope: "))
         (number (read-string "Number of cases: "))
@@ -105,10 +110,24 @@ condition, and the texts for the different cases"
       (setq prompt (format "Case no. %d: " (+ 1 count)))
       (insert (format "\\switch{%s}" (read-string prompt)))
       (setq count (1+ count)))
-      (end-of-line)
-      (newline-and-indent)
-      (newline-and-indent)
-      (insert "\\caseend")))
+    (end-of-line)
+    (newline-and-indent)
+    (newline-and-indent)
+    (insert "\\caseend")))
+
+(defun TeX-mac-forallin (macro)
+  "Insert \\forallin-block with all arguments.
+This is the optional height and the description of the loop"
+  (let ((height (read-string "Height (optional): "))
+        (loop-description (read-string "Description of loop: ")))
+    (insert (concat (if (not (zerop (length height)))
+                        (format "[%s]" height))
+                    (format "{%s}"
+                            loop-description)))
+    (end-of-line)
+    (newline-and-indent)
+    (newline-and-indent)
+    (insert "\\forallinend")))
 
 (defun TeX-mac-forever (macro)
   "Insert \\forever-block with all arguments.
@@ -123,8 +142,9 @@ This is only the optional height"
 
 (defun TeX-mac-ifthenelse (macro)
   "Insert \\ifthenelse with all arguments.
-These are optional height and the required arguments left slope, right slope,
-condition, and the possible values of the condition"
+These are optional height and the required arguments
+left slope, right slope, condition, and the possible
+values of the condition"
   (let ((height (read-string "Height (optional): "))
         (lslope (read-string "Left slope: "))
         (rslope (read-string "Right slope: "))
@@ -134,7 +154,8 @@ condition, and the possible values of the condition"
     (insert (concat (if (not (zerop (length height)))
                         (format "[%s]" height))
                     (format "{%s}{%s}{%s}{%s}{%s}"
-                            lslope rslope condition conditionvl conditionvr)))
+                            lslope rslope condition conditionvl
+                            conditionvr)))
     (end-of-line)
     (newline-and-indent)
     (newline-and-indent)
@@ -145,9 +166,10 @@ condition, and the possible values of the condition"
     (insert "\\ifend")))
 
 (defun TeX-mac-inparallel (macro)
-  "Insert \\inparallel with all arguments, the needed \\task(es) and the final \\inparallelend.
-These are optional height and the required arguments number of tasks
-and the descriptions for the parallel tasks"
+  "Insert \\inparallel with all arguments, the needed \\task(s)
+and the final \\inparallelend. These are optional height and the
+required arguments number of tasks and the descriptions for the
+parallel tasks"
   (let ((height (read-string "Height (optional): "))
         (number (read-string "Number of parallel tasks: "))
         (text (read-string "Task no. 1: "))
@@ -164,10 +186,10 @@ and the descriptions for the parallel tasks"
       (setq prompt (format "Task no. %d: " (+ 1 count)))
       (insert (format "\\task{%s}" (read-string prompt)))
       (setq count (1+ count)))
-      (end-of-line)
-      (newline-and-indent)
-      (newline-and-indent)
-      (insert "\\inparallelend")))
+    (end-of-line)
+    (newline-and-indent)
+    (newline-and-indent)
+    (insert "\\inparallelend")))
 
 (defun TeX-mac-until (macro)
   "Insert \\until with all arguments.
@@ -197,7 +219,7 @@ These are the optional height and the required argument condition"
 
 (defvar LaTeX-struktex-package-options '("curves" "draft" "emlines" "final"
                                          "pict2e" "anygradient" "verification"
-                                         "nofiller")
+                                         "nofiller" "debug" "outer")
   "Package options for the struktex package.")
 
 ;;; struktex.el ends here.
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf b/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf
index 4476dd4f6b7..72365dd7db1 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.mk b/Master/texmf-dist/doc/latex/struktex/struktex.mk
index ae40f21f613..9af9cc9de5c 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.mk
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.mk
@@ -22,7 +22,7 @@
 #          - clean-example
 #
 # Author:  Jobst Hoffmann, Fachhochschule Aachen, Standort Juelich
-# Date:    2006/08/23
+# Date:    2017/06/06
 #-----------------------------------------------------------------------
 
 # The texmf-directory, where to install new stuff (see texmf.cnf)
@@ -66,53 +66,100 @@ DEMODIR=$(DOCDIR)/demo
 # It's not really a good solution, but it's a working solution.
 TEXINPUTS := $(PWD):$(TEXINPUTS)
 
-# To generate the version number of the distribution from the source
-VERSION_L := latex getversion | grep '^VERSION'
-VERSION_S := `latex getversion | grep '^VERSION' | \
-              sed 's+^VERSION \\(.*\\) of .*+\\1+'`
 ########################################################################
 #   End of customization section
 ########################################################################
 
-DVIPS = dvips
 LATEX = latex
 PDFLATEX = pdflatex
-
-# postscript viewer
-GV = gv
+TEX = TEX
 
 COMMON_OPTIONS = # \OnlyDescription\CodelineNumbered\PageIndex
 HISTORY_OPTIONS = \RecordChanges
 DEVELOPER_OPTIONS = \EnableCrossrefs\RecordChanges\AlsoImplementation\CodelineIndex
 
+# tarring options
+EXgit = --exclude .git --exclude .gitignore --exclude auto --exclude tests \
+ --exclude *.tgz --exclude *.bib
+
 # The name of the game
 PACKAGE = struktex
 
+DISTRIBUTION_FILES = ../$(PACKAGE)/$(PACKAGE).de.pdf \
+../$(PACKAGE)/$(PACKAGE).en.pdf \
+ ../$(PACKAGE)/$(PACKAGE).dtx \
+ ../$(PACKAGE)/$(PACKAGE).ins \
+ ../$(PACKAGE)/LIESMICH.md \
+ ../$(PACKAGE)/README.md
+PACKAGE_FILES_A = $(subst ../$(PACKAGE)/,,$(DISTRIBUTION_FILES))
+PACKAGE_FILES_B = $(subst $(PACKAGE).dtx ,,$(PACKAGE_FILES_A))
+PACKAGE_FILES_C = $(subst $(PACKAGE).ins ,,$(PACKAGE_FILES_B))
+PACKAGE_FILES_D = $(subst LIESMICH.md,,$(PACKAGE_FILES_C))
+PACKAGE_FILES = $(subst README.md,,$(PACKAGE_FILES_D))
+
+# To generate the version number of the distribution from the source
+VERSION_L := git describe --long | xargs git --no-pager show -s \
+         --date=short --format=format:"$(PACKAGE) version ???? of %ad%n" |\
+         sed -e "s/????/`git describe --long`/"
+VERSION_S := `git describe --long | \
+             sed 's+-g.*++'`
+
+## Main Targets
+
 # strip off the comments from the package
-$(PACKAGE).sty $(PACKAGE)-test-*.tex: $(PACKAGE).ins $(PACKAGE).dtx
- +$(LATEX) $<; \
-  sh $(PACKAGE).makemake
+$(PACKAGE).sty $(PACKAGE)-test-*.tex: $(PACKAGE).ins $(PACKAGE).dtx $(PACKAGE).sed
+ +$(TEX) $<; \
+  source $(PACKAGE).makemake; \
+  make revision_no; \
+  source $(PACKAGE).sed  # set version number
 
 all-de: $(PACKAGE).de.pdf
 
 all-en: $(PACKAGE).en.pdf
 
-# generate the documentation
-$(PACKAGE).de.dvi: $(PACKAGE).dtx $(PACKAGE).sty
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\input{$<}"
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\input{$<}"
- +mv $(<:.dtx=.dvi) $(<:.dtx=.de.dvi)
+# prepare the file with git revision information
+.PHONY: revision_no
+revision_no: $(PACKAGE).sed
+
+$(PACKAGE).sed: $(PACKAGE).dtx
+ printf "%b\n" "set_git_info() {" \
+    > $(PACKAGE).sed; \
+ printf "%b\n" "sed -i -e 's/^[ \\\\t]*%% git revision information$$/\\"  \
+    >> $(PACKAGE).sed; \
+ git describe --long | \
+    xargs git --no-pager show -s --format=format:\
+ "    \\\\@git@ \$$Date: %ci $$%%\%n" >> $(PACKAGE).sed; \
+ git describe --long | cut -c 2- |\
+    sed -e "s/^/      \$$Revision: /" -e "s/$$/ $$\\\\/" \
+    >> $(PACKAGE).sed; \
+ git describe --long | \
+    xargs git --no-pager show -s --format=format:"    %%%% \$$Author: %an $$\\%n" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "/' \$$1" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "};" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "for f in  \\\\" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "$(PACKAGE).sty \\\\" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "struktxf.sty \\\\" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "struktxp.sty \\\\" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "strukdoc.sty \\\\" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "; do \\\\" \
+    >> $(PACKAGE).sed; \
+ printf "%b\n" "  set_git_info \$$f; done" \
+    >> $(PACKAGE).sed; \
 
-$(PACKAGE).de.pdf: $(PACKAGE).dtx $(PACKAGE).sty
+# generate the documentation
+$(PACKAGE).de.pdf: $(PACKAGE).dtx $(PACKAGE).sty struktex.sed
  +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\input{$<}"
  +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\input{$<}"
  +mv $(<:.dtx=.pdf) $(<:.dtx=.de.pdf)
 
-$(PACKAGE).en.dvi: $(PACKAGE).dtx $(PACKAGE).sty
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\primarylanguage{english}\input{$<}"
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\primarylanguage{english}\input{$<}"
- +mv $(<:.dtx=.dvi) $(<:.dtx=.en.dvi)
-
 $(PACKAGE).en.pdf: $(PACKAGE).dtx $(PACKAGE).sty
  +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\primarylanguage{english}\input{$<}"
  +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\primarylanguage{english}\input{$<}"
@@ -120,46 +167,36 @@ $(PACKAGE).en.pdf: $(PACKAGE).dtx $(PACKAGE).sty
 
 # generate the documentation with revision history (only german)
 history: $(PACKAGE).dtx $(PACKAGE).sty
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(HISTORY_OPTIONS)}\input{$<}"
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(HISTORY_OPTIONS)}\input{$<}"
+ +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(HISTORY_OPTIONS)}\input{$<}"
+ +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(HISTORY_OPTIONS)}\input{$<}"
  +makeindex -s gind.ist                 $(PACKAGE).idx
  +makeindex -s gglo.ist -o $(PACKAGE).gls -t $(PACKAGE).glg $(PACKAGE).glo
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(HISTORY_OPTIONS)}\input{$<}"
+ +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(HISTORY_OPTIONS)}\input{$<}"
 
 # generate the documentation for the developer (revision history always
 # in german)
 develop-de: $(PACKAGE).dtx $(PACKAGE).sty
- +$(LATEX) "\AtBeginDocument{$(HISTORY_OPTIONS)$(DEVELOPER_OPTIONS)}\input{$<}"
- +$(LATEX) "\AtBeginDocument{$(HISTORY_OPTIONS)$(DEVELOPER_OPTIONS)}\input{$<}"
+ +$(PDFLATEX) "\AtBeginDocument{$(HISTORY_OPTIONS)$(DEVELOPER_OPTIONS)}\input{$<}"
+ +$(PDFLATEX) "\AtBeginDocument{$(HISTORY_OPTIONS)$(DEVELOPER_OPTIONS)}\input{$<}"
  +makeindex -s gind.ist                 $(PACKAGE).idx
  +makeindex -s gglo.ist -o $(PACKAGE).gls -t $(PACKAGE).glg $(PACKAGE).glo
- +$(LATEX) "\AtBeginDocument{$(HISTORY_OPTIONS)$(DEVELOPER_OPTIONS)}\input{$<}"
-ifneq (,$(findstring pdf,$(LATEX)))
+ +$(PDFLATEX) "\AtBeginDocument{$(HISTORY_OPTIONS)$(DEVELOPER_OPTIONS)}\input{$<}"
  +mv $(<:.dtx=.pdf) $(<:.dtx=.de.pdf)
-else
- +mv $(<:.dtx=.dvi) $(<:.dtx=.de.dvi)
-endif
 
 develop-en: $(PACKAGE).dtx $(PACKAGE).sty
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\primarylanguage{english}\input{$<}"
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\primarylanguage{english}\input{$<}"
+ +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\primarylanguage{english}\input{$<}"
+ +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\primarylanguage{english}\input{$<}"
  +makeindex -s gind.ist                 $(PACKAGE).idx
  +makeindex -s gglo.ist -o $(PACKAGE).gls -t $(PACKAGE).glg $(PACKAGE).glo
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\primarylanguage{english}\input{$<}"
-ifneq (,$(findstring pdf,$(LATEX)))
+ +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\primarylanguage{english}\input{$<}"
  +mv $(<:.dtx=.pdf) $(<:.dtx=.en.pdf)
-else
- +mv $(<:.dtx=.dvi) $(<:.dtx=.en.dvi)
-endif
 
 # format the example/test files
 test:
  for i in `seq 1 3`; do \
      f=$(PACKAGE)-test-$$i; \
      echo file: $$f; \
-     $(LATEX) $$f; \
-     $(DVIPS) -o $$f.ps $$f.dvi; \
-     $(GV) $$f.ps \&; \
+     $(PDFLATEX) $$f; \
  done
 
 install: $(PACKAGE).dtx $(PACKAGE).dvi
@@ -181,11 +218,40 @@ uninstall:
  rm -fr $(SRCDIR)
 
 dist: $(PACKAGE).de.pdf $(PACKAGE).en.pdf  $(PACKAGE).dtx  $(PACKAGE).ins \
-LIESMICH README
+LIESMICH.md README.md
  + rm -f THIS_IS_VERSION_*
  + $(VERSION_L) > THIS_IS_VERSION_$(VERSION_S)
  + tar cfvz  $(PACKAGE)-$(VERSION_S).tgz $^ THIS_IS_VERSION_*
- + rm getversion.log
+
+tds-zip:  $(PACKAGE_FILES)
+ + rm -f THIS_IS_VERSION_* *.zip; \
+ $(VERSION_L) | sed -e "s/??????????/$(VERSION_S)/" > THIS_IS_VERSION_$(VERSION_S); \
+ DOC_FILES="LIESMICH.md README.md THIS_IS_* $(PACKAGE).??.pdf"; \
+ MAKE_FILES="$(PACKAGE).m*"; \
+ SRC_FILES="$(PACKAGE).dtx $(PACKAGE).ins"; \
+ STY_FILES="struk*.sty"; \
+ TEST_FILES="./$(PACKAGE)-test*"; \
+ SUPPORT_FILES="./$(PACKAGE).el"; \
+ if [[ -d /tmp/texmf ]]; then \
+   rm -rf /tmp/texmf; \
+ fi; \
+ if [[ -f $(PACKAGE)-TDS.zip ]]; then \
+   rm $(PACKAGE)-TDS.zip; \
+ fi; \
+ mkdir -p /tmp/texmf/doc/latex/$(PACKAGE); \
+ mkdir -p /tmp/texmf/source/latex/$(PACKAGE); \
+ mkdir -p /tmp/texmf/tex/latex/$(PACKAGE); \
+ cp -a $${DOC_FILES} /tmp/texmf/doc/latex/$(PACKAGE); \
+ cp -a $${MAKE_FILES} /tmp/texmf/doc/latex/$(PACKAGE); \
+ cp -a $${SRC_FILES} /tmp/texmf/source/latex/$(PACKAGE); \
+ cp -a $${STY_FILES} /tmp/texmf/tex/latex/$(PACKAGE); \
+ cp -a $${TEST_FILES} /tmp/texmf/doc/latex/$(PACKAGE); \
+ cp -a $${SUPPORT_FILES} /tmp/texmf/doc/latex/$(PACKAGE); \
+ VERSION_SHORT="xxx"; \
+ pushd /tmp/texmf; \
+ zip -r /tmp/$(PACKAGE)-TDS.zip .; \
+ popd; \
+ mv /tmp/$(PACKAGE)-TDS.zip ./$(PACKAGE)-TDS-$(VERSION_S).zip
 
 clean:
  -rm -f *.log *.aux *.brf *.idx *.ilg *.ind
@@ -193,8 +259,8 @@ clean:
  -rm *.mk *.makemake
 
 realclean:  clean
- -rm -f *.sty *.cls *.ps *.dvi *.pdf
- -rm -f *test* getversion.* Makefile
+ -rm -f *.sty *.cls *.pdf
+ -rm -f *-test-* Makefile
 
 clean-test:
  rm $(PACKAGE)-test-*.* # this $-sign is needed for font-locking in XEmacs only