struktex again

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

5 files changed, 27 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/struktex/getversion.tex b/Master/texmf-dist/doc/latex/struktex/getversion.tex
index 55054ff3256..1722ee6f8cf 100644
--- a/Master/texmf-dist/doc/latex/struktex/getversion.tex
+++ b/Master/texmf-dist/doc/latex/struktex/getversion.tex
@@ -1,8 +1,8 @@
 
-\documentclass[english]{ltxdoc}
+\documentclass{ltxdoc}
 \nofiles
 \usepackage{struktex}
 \GetFileInfo{struktex.sty}
-\typeout{VERSION \fileversion}
+\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 e6f0cdcb2c0..2e2f98956a9 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 1545000103a..13a65de84d1 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.el
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.el
@@ -78,26 +78,32 @@
                                    (format "[%s]" title)))))
 
 (defun TeX-mac-case (macro)
-  "Insert \case with all arguments.
+  "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 text of the first case"
+condition, and the texts for the different cases"
   (let ((height (read-string "Height (optional): "))
         (slope (read-string "Slope: "))
         (number (read-string "Number of cases: "))
         (condition (read-string "Condition: "))
-        (text (read-string "Text: ")))
+        (text (read-string "Case no. 1: "))
+        (count 1)
+        )
+    (setq number-int (string-to-number number))
     (insert (concat (if (not (zerop (length height)))
                         (format "[%s]" height))
                     (format "{%s}{%s}{%s}{%s}"
                             slope number condition text)))
-    (end-of-line)
-    (newline-and-indent)
-    (newline-and-indent)
-    (insert "\\switch{ }")
-    (end-of-line)
-    (newline-and-indent)
-    (newline-and-indent)
-    (insert "\\caseend")))
+    (while (< count number-int)
+      (end-of-line)
+      (newline-and-indent)
+      (newline-and-indent)
+      (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")))
 
 (defun TeX-mac-forever (macro)
   "Insert \forever-block with all arguments.
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf b/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf
index bae72de7690..12a5f4e114c 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 ce41e66c00a..d8edfaaabf7 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.mk
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.mk
@@ -66,6 +66,9 @@ 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_\\2+'`
 ########################################################################
 #   End of customization section
 ########################################################################
@@ -178,9 +181,12 @@ uninstall:
  rm -fr $(DOCDIR)
  rm -fr $(SRCDIR)
 
-pack: $(PACKAGE).de.pdf $(PACKAGE).en.pdf  $(PACKAGE).dtx  $(PACKAGE).ins \
+dist: $(PACKAGE).de.pdf $(PACKAGE).en.pdf  $(PACKAGE).dtx  $(PACKAGE).ins \
 LIESMICH README
- + tar cfvz  $(PACKAGE).tgz $^
+ + rm -f THIS_IS_VERSION_*
+ + $(VERSION_L) > THIS_IS_VERSION_$(VERSION_S)
+ + tar cfvz  $(PACKAGE)-$(VERSION_S).tgz $^ THIS_IS_VERSION_*
+ + rm getversion.log
 
 clean:
  -rm -f *.log *.aux *.brf *.idx *.ilg *.ind