struktex 101 (25jun10)

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

7 files changed, 71 insertions, 41 deletions

diff --git a/Master/texmf-dist/doc/latex/struktex/LIESMICH b/Master/texmf-dist/doc/latex/struktex/LIESMICH
index 3ac4380bf25..1d26234b8c7 100644
--- a/Master/texmf-dist/doc/latex/struktex/LIESMICH
+++ b/Master/texmf-dist/doc/latex/struktex/LIESMICH
@@ -1,5 +1,5 @@
 #
-# $Revision: 1.3 $
+# $Revision: 52 $
 #
 Das LaTeX-Paket "struktex.dtx" enthaelt Makros zur Erzeugung von
 Nassi-Shneidermann-Struktogrammen.
@@ -20,4 +20,4 @@ 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 Lizens.
+zu Details dieser Lizenz.
diff --git a/Master/texmf-dist/doc/latex/struktex/README b/Master/texmf-dist/doc/latex/struktex/README
index f34ba08ef2a..d22bd8dd049 100644
--- a/Master/texmf-dist/doc/latex/struktex/README
+++ b/Master/texmf-dist/doc/latex/struktex/README
@@ -1,5 +1,5 @@
 #
-# $Revision: 1.3 $
+# $Revision: 52 $
 #
 The LaTeX package "struktex.dtx" contains some macros which
 generate Nassi Shneidermann structure charts
diff --git a/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v101 b/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v101
new file mode 100644
index 00000000000..2e20fe7c45a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v101
@@ -0,0 +1 @@
+VERSION v101 of 2010/06/25
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf b/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf
index 2e2f98956a9..13a488ebb7f 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 13a65de84d1..fbdbf17bac0 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.el
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.el
@@ -3,8 +3,8 @@
 
 ;; Copyright (C) 2006 Free Software Foundation, Inc.
 
-;; Author: J. Hoffmann <j.hoffmann@fh-aachen.de>
-;; Maintainer: j.hoffmann@fh-aachen.de
+;; Author: J. Hoffmann <j.hoffmann_at_fh-aachen.de>
+;; Maintainer: j.hoffmann_at_fh-aachen.de
 ;; Created: 2006/01/17
 ;; Keywords: tex
 
@@ -17,6 +17,8 @@
  (lambda ()
    ;; 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
     "centernss"
     '("struktogramm" LaTeX-env-struktogramm)
@@ -27,7 +29,7 @@
     '("assign" [ "Height" ] "Statement")
     "StrukTeX"
     '("case" TeX-mac-case)
-    "switch" "condition"
+    "switch" "Condition"
     "caseend"
     '("declarationtitle" "Title")
     '("description" "Name" "Meaning")
@@ -36,8 +38,11 @@
     '("forever" TeX-mac-forever)
     "foreverend"
     '("ifthenelse" TeX-mac-ifthenelse)
-    "ifend"
     "change"
+    "ifend"
+    '("inparallel" TeX-mac-inparallel)
+    '("task" "Description")
+    "inparallelend"
     "sProofOn"
     "sProofOff"
     '("until" TeX-mac-until)
@@ -78,7 +83,7 @@
                                    (format "[%s]" title)))))
 
 (defun TeX-mac-case (macro)
-  "Insert \case with all arguments, the needed \switch(es) and the final \caseend.
+  "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): "))
@@ -106,7 +111,7 @@ condition, and the texts for the different cases"
       (insert "\\caseend")))
 
 (defun TeX-mac-forever (macro)
-  "Insert \forever-block with all arguments.
+  "Insert \\forever-block with all arguments.
 This is only the optional height"
   (let ((height (read-string "Height (optional): ")))
     (insert (if (not (zerop (length height)))
@@ -117,7 +122,7 @@ This is only the optional height"
     (insert "\\foreverend")))
 
 (defun TeX-mac-ifthenelse (macro)
-  "Insert \ifthenelse with all arguments.
+  "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"
   (let ((height (read-string "Height (optional): "))
@@ -139,8 +144,33 @@ condition, and the possible values of the condition"
     (newline-and-indent)
     (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"
+  (let ((height (read-string "Height (optional): "))
+        (number (read-string "Number of parallel tasks: "))
+        (text (read-string "Task no. 1: "))
+        (count 1)
+        )
+    (setq number-int (string-to-number number))
+    (insert (concat (if (not (zerop (length height)))
+                        (format "[%s]" height))
+                    (format "{%s}{%s}" number text)))
+    (while (< count number-int)
+      (end-of-line)
+      (newline-and-indent)
+      (newline-and-indent)
+      (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")))
+
 (defun TeX-mac-until (macro)
-  "Insert \until with all arguments.
+  "Insert \\until with all arguments.
 These are the optional height and the required argument condition"
   (let ((height (read-string "Height (optional): "))
         (condition (read-string "Condition: ")))
@@ -153,7 +183,7 @@ These are the optional height and the required argument condition"
     (insert "\\untilend")))
 
 (defun TeX-mac-while (macro)
-  "Insert \while with all arguments.
+  "Insert \\while with all arguments.
 These are the optional height and the required argument condition"
   (let ((height (read-string "Height (optional): "))
         (condition (read-string "Condition: ")))
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf b/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf
index 12a5f4e114c..4ec917ca60b 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 d8edfaaabf7..ae40f21f613 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.mk
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.mk
@@ -21,8 +21,8 @@
 #          - clean
 #          - clean-example
 #
-# Author:  Jobst Hoffmann, Fachhochschule Aachen, Abt. Juelich
-# Date:    2003/04/18
+# Author:  Jobst Hoffmann, Fachhochschule Aachen, Standort Juelich
+# Date:    2006/08/23
 #-----------------------------------------------------------------------
 
 # The texmf-directory, where to install new stuff (see texmf.cnf)
@@ -48,13 +48,13 @@ TEXHASH=texhash
 ######### Edit following only, if you want to change defaults!
 
 # The directory, where to install *.cls and *.sty
-CLSDIR=$(INSTALLTEXMF)/tex/latex/jhf/$(PACKAGE)
+CLSDIR=$(INSTALLTEXMF)/tex/latex/$(PACKAGE)
 
 # The directory, where to install documentation
-DOCDIR=$(INSTALLTEXMF)/doc/latex/jhf/$(PACKAGE)
+DOCDIR=$(INSTALLTEXMF)/doc/latex/$(PACKAGE)
 
 # The directory, where to install the sources
-SRCDIR=$(INSTALLTEXMF)/source/latex/jhf/$(PACKAGE)
+SRCDIR=$(INSTALLTEXMF)/source/latex/$(PACKAGE)
 
 # The directory, where to install demo-files
 # If we have some, we have to add following 2 lines to install rule:
@@ -68,7 +68,8 @@ 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+'`
+VERSION_S := `latex getversion | grep '^VERSION' | \
+              sed 's+^VERSION \\(.*\\) of .*+\\1+'`
 ########################################################################
 #   End of customization section
 ########################################################################
@@ -80,47 +81,45 @@ PDFLATEX = pdflatex
 # postscript viewer
 GV = gv
 
-COMMON_OPTIONS = \OnlyDescription\CodelineNumbered
+COMMON_OPTIONS = # \OnlyDescription\CodelineNumbered\PageIndex
 HISTORY_OPTIONS = \RecordChanges
 DEVELOPER_OPTIONS = \EnableCrossrefs\RecordChanges\AlsoImplementation\CodelineIndex
 
+# The name of the game
 PACKAGE = struktex
 
+# strip off the comments from the package
+$(PACKAGE).sty $(PACKAGE)-test-*.tex: $(PACKAGE).ins $(PACKAGE).dtx
+ +$(LATEX) $<; \
+  sh $(PACKAGE).makemake
+
 all-de: $(PACKAGE).de.pdf
 
 all-en: $(PACKAGE).en.pdf
 
-# strip off the comments from the package
-$(PACKAGE).sty $(PACKAGE)-test-*.tex: $(PACKAGE).dtx
-
-$(PACKAGE).sty $(PACKAGE)-test-*.tex: $(PACKAGE).ins
- +$(LATEX) $<
-
 # generate the documentation
-$(PACKAGE).dvi: $(PACKAGE).sty
-
-$(PACKAGE).de.dvi: $(PACKAGE).dtx
+$(PACKAGE).de.dvi: $(PACKAGE).dtx $(PACKAGE).sty
  +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\input{$<}"
  +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\input{$<}"
  +mv $(<:.dtx=.dvi) $(<:.dtx=.de.dvi)
 
-$(PACKAGE).de.pdf: $(PACKAGE).dtx
+$(PACKAGE).de.pdf: $(PACKAGE).dtx $(PACKAGE).sty
  +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\input{$<}"
  +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\input{$<}"
  +mv $(<:.dtx=.pdf) $(<:.dtx=.de.pdf)
 
-$(PACKAGE).en.dvi: $(PACKAGE).dtx
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\selectlanguageEnglish{}\input{$<}"
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\selectlanguageEnglish{}\input{$<}"
+$(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
- +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\selectlanguageEnglish{}\input{$<}"
- +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\selectlanguageEnglish{}\input{$<}"
+$(PACKAGE).en.pdf: $(PACKAGE).dtx $(PACKAGE).sty
+ +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\primarylanguage{english}\input{$<}"
+ +$(PDFLATEX) "\AtBeginDocument{$(COMMON_OPTIONS)}\def\primarylanguage{english}\input{$<}"
  +mv $(<:.dtx=.pdf) $(<:.dtx=.en.pdf)
 
 # generate the documentation with revision history (only german)
-history: $(PACKAGE).dtx
+history: $(PACKAGE).dtx $(PACKAGE).sty
  +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(HISTORY_OPTIONS)}\input{$<}"
  +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(HISTORY_OPTIONS)}\input{$<}"
  +makeindex -s gind.ist                 $(PACKAGE).idx
@@ -129,7 +128,7 @@ history: $(PACKAGE).dtx
 
 # generate the documentation for the developer (revision history always
 # in german)
-develop-de: $(PACKAGE).dtx
+develop-de: $(PACKAGE).dtx $(PACKAGE).sty
  +$(LATEX) "\AtBeginDocument{$(HISTORY_OPTIONS)$(DEVELOPER_OPTIONS)}\input{$<}"
  +$(LATEX) "\AtBeginDocument{$(HISTORY_OPTIONS)$(DEVELOPER_OPTIONS)}\input{$<}"
  +makeindex -s gind.ist                 $(PACKAGE).idx
@@ -141,12 +140,12 @@ else
  +mv $(<:.dtx=.dvi) $(<:.dtx=.de.dvi)
 endif
 
-develop-en: $(PACKAGE).dtx
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\selectlanguageEnglish{}\input{$<}"
- +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\selectlanguageEnglish{}\input{$<}"
+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{$<}"
  +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\selectlanguageEnglish{}\input{$<}"
+ +$(LATEX) "\AtBeginDocument{$(COMMON_OPTIONS)$(DEVELOPER_OPTIONS)}\def\primarylanguage{english}\input{$<}"
 ifneq (,$(findstring pdf,$(LATEX)))
  +mv $(<:.dtx=.pdf) $(<:.dtx=.en.pdf)
 else