struktex update (19aug06)

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

8 files changed, 258 insertions, 2 deletions

diff --git a/Master/texmf-dist/doc/latex/struktex/struktex-test-1.pdf b/Master/texmf-dist/doc/latex/struktex/struktex-test-1.pdf
deleted file mode 100644
index 9996b77cf17..00000000000
--- a/Master/texmf-dist/doc/latex/struktex/struktex-test-1.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex-test-1.tex b/Master/texmf-dist/doc/latex/struktex/struktex-test-1.tex
index 6473d80cca5..97f3e957275 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex-test-1.tex
+++ b/Master/texmf-dist/doc/latex/struktex/struktex-test-1.tex
@@ -6,7 +6,7 @@
 %%
 %% struktex.dtx  (with options: `example2')
 %% 
-\documentclass{article}
+\documentclass[draft]{article}
 \usepackage{struktex}
 
 \begin{document}
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex-test-2.pdf b/Master/texmf-dist/doc/latex/struktex/struktex-test-2.pdf
deleted file mode 100644
index 05399c865aa..00000000000
--- a/Master/texmf-dist/doc/latex/struktex/struktex-test-2.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex-test-3.pdf b/Master/texmf-dist/doc/latex/struktex/struktex-test-3.pdf
deleted file mode 100644
index 001f06b653a..00000000000
--- a/Master/texmf-dist/doc/latex/struktex/struktex-test-3.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex-test-4.tex b/Master/texmf-dist/doc/latex/struktex/struktex-test-4.tex
new file mode 100644
index 00000000000..46b51469d96
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/struktex/struktex-test-4.tex
@@ -0,0 +1,89 @@
+%%
+%% This is file `struktex-test-4.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% struktex.dtx  (with options: `example5')
+%% 
+%%
+\documentclass{article}
+
+\usepackage{struktxp,struktxf}
+
+\makeatletter
+\newlength{\fdesc@len}
+\newcommand{\fdesc@label}[1]%
+{%
+    \settowidth{\fdesc@len}{{\fdesc@font #1}}%
+    \advance\hsize by -2em
+    \ifdim\fdesc@len>\hsize%               % term > labelwidth
+        \parbox[b]{\hsize}%
+        {%
+            \fdesc@font #1%
+        }\\%
+    \else%                                      % term < labelwidth
+    \ifdim\fdesc@len>\labelwidth%               % term > labelwidth
+        \parbox[b]{\labelwidth}%
+        {%
+            \makebox[0pt][l]{{\fdesc@font #1}}\\%
+        }%
+    \else%                                      % term < labelwidth
+        {\fdesc@font #1}%
+    \fi\fi%
+    \hfil\relax%
+}
+\newenvironment{fdescription}[1][\tt]%
+{%
+    \def\fdesc@font{#1}
+    \begin{quote}%
+    \begin{list}{}%
+    {%
+        \renewcommand{\makelabel}{\fdesc@label}%
+        \setlength{\labelwidth}{120pt}%
+        \setlength{\leftmargin}{\labelwidth}%
+        \addtolength{\leftmargin}{\labelsep}%
+    }%
+}%
+{%
+    \end{list}%
+    \end{quote}%
+}
+\makeatother
+
+\pLanguage{Java}
+
+\begin{document}
+
+\begin{fdescription}
+ \item[\index{Methoden>drawImage(Image img,
+                                    int dx1,
+                                    int dy1,
+                                    int dx2,
+                                    int dy2,
+                                    int sx1,
+                                    int sy1,
+                                    int sx2,
+                                    int sy2,
+                                    ImageObserver observer)=%
+       \Expr{\pKey{public} \pKey{abstract} \pKey{boolean} drawImage(Image img,
+                                    \pKey{int} dx1,
+                                    \pKey{int} dy1,
+                                    \pKey{int} dx2,
+                                    \pKey{int} dy2,
+                                    \pKey{int} sx1,
+                                    \pKey{int} sy1,
+                                    \pKey{int} sx2,
+                                    \pKey{int} sy2,
+                                    ImageObserver observer)}}%
+       \pExp{public abstract boolean drawImage(Image img, int dx1, int
+         dy1, int dx1, int dy2, int sx1, int sy1, int sx2, int sy2,
+         ImageObserver observer)}]%
+ \ldots
+\end{fdescription}
+\end{document}
+%%
+%% End of file `struktex-test-5.tex'.
+%% 
+%%
+%% End of file `struktex-test-4.tex'.
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf b/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf
index 18c812eab5b..e6f0cdcb2c0 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
new file mode 100644
index 00000000000..1545000103a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.el
@@ -0,0 +1,167 @@
+
+;;; struktex.el --- AUCTeX style for `struktex.sty'
+
+;; Copyright (C) 2006 Free Software Foundation, Inc.
+
+;; Author: J. Hoffmann <j.hoffmann@fh-aachen.de>
+;; Maintainer: j.hoffmann@fh-aachen.de
+;; Created: 2006/01/17
+;; 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.
+   (LaTeX-add-environments
+    "centernss"
+    '("struktogramm" LaTeX-env-struktogramm)
+    '("declaration" LaTeX-env-declaration))
+   (TeX-add-symbols
+    '("PositionNSS" 1)
+    '("assert" [ "Height" ] "Assertion")
+    '("assign" [ "Height" ] "Statement")
+    "StrukTeX"
+    '("case" TeX-mac-case)
+    "switch" "condition"
+    "caseend"
+    '("declarationtitle" "Title")
+    '("description" "Name" "Meaning")
+    "emptyset"
+    '("exit" [ "Height" ] "What" )
+    '("forever" TeX-mac-forever)
+    "foreverend"
+    '("ifthenelse" TeX-mac-ifthenelse)
+    "ifend"
+    "change"
+    "sProofOn"
+    "sProofOff"
+    '("until" TeX-mac-until)
+    "untilend"
+    '("while" TeX-mac-while)
+    "whileend"
+    '("return" [ "Height" ] "Return value")
+    '("sub" [ "Height" ] "Task")
+    '("CenterNssFile" TeX-arg-file)
+    '("centernssfile" TeX-arg-file))
+   (TeX-run-style-hooks
+    "pict2e"
+    "emlines2"
+    "curves"
+    "struktxp"
+    "struktxf"
+    "ifthen")
+   ;; Filling
+   ;; Fontification
+   ))
+
+(defun LaTeX-env-struktogramm (environment)
+  "Insert ENVIRONMENT with width, height specifications and optional title."
+  (let ((width (read-string "Width: "))
+        (height (read-string "Height: "))
+        (title (read-string "Title (optional): ")))
+    (LaTeX-insert-environment environment
+                              (concat
+                               (format "(%s,%s)" width height)
+                               (if (not (zerop (length title)))
+                                   (format "[%s]" title))))))
+
+(defun LaTeX-env-declaration (environment)
+  "Insert ENVIRONMENT with an optional title."
+  (let ((title (read-string "Title (optional): ")))
+    (LaTeX-insert-environment environment
+                               (if (not (zerop (length title)))
+                                   (format "[%s]" title)))))
+
+(defun TeX-mac-case (macro)
+  "Insert \case with all arguments.
+These are optional height and the required arguments slope, number of cases,
+condition, and the text of the first case"
+  (let ((height (read-string "Height (optional): "))
+        (slope (read-string "Slope: "))
+        (number (read-string "Number of cases: "))
+        (condition (read-string "Condition: "))
+        (text (read-string "Text: ")))
+    (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")))
+
+(defun TeX-mac-forever (macro)
+  "Insert \forever-block with all arguments.
+This is only the optional height"
+  (let ((height (read-string "Height (optional): ")))
+    (insert (if (not (zerop (length height)))
+                (format "[%s]" height)))
+    (end-of-line)
+    (newline-and-indent)
+    (newline-and-indent)
+    (insert "\\foreverend")))
+
+(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"
+  (let ((height (read-string "Height (optional): "))
+        (lslope (read-string "Left slope: "))
+        (rslope (read-string "Right slope: "))
+        (condition (read-string "Condition: "))
+        (conditionvl (read-string "Condition value left: "))
+        (conditionvr (read-string "Condition value right: ")))
+    (insert (concat (if (not (zerop (length height)))
+                        (format "[%s]" height))
+                    (format "{%s}{%s}{%s}{%s}{%s}"
+                            lslope rslope condition conditionvl conditionvr)))
+    (end-of-line)
+    (newline-and-indent)
+    (newline-and-indent)
+    (insert "\\change")
+    (end-of-line)
+    (newline-and-indent)
+    (newline-and-indent)
+    (insert "\\ifend")))
+
+(defun TeX-mac-until (macro)
+  "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: ")))
+    (insert (concat (if (not (zerop (length height)))
+                        (format "[%s]" height))
+                    (format "{%s}" condition)))
+    (end-of-line)
+    (newline-and-indent)
+    (newline-and-indent)
+    (insert "\\untilend")))
+
+(defun TeX-mac-while (macro)
+  "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: ")))
+    (insert (concat (if (not (zerop (length height)))
+                        (format "[%s]" height))
+                    (format "{-%s-}" condition)))
+    (end-of-line)
+    (newline-and-indent)
+    (newline-and-indent)
+    (insert "\\whileend")))
+
+(defvar LaTeX-struktex-package-options '("curves" "draft" "emlines" "final"
+                                         "pict2e" "anygradient" "verification"
+                                         "nofiller")
+  "Package options for the struktex package.")
+
+;;; struktex.el ends here.
diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.mk b/Master/texmf-dist/doc/latex/struktex/struktex.mk
index d30263a2e3c..ce41e66c00a 100644
--- a/Master/texmf-dist/doc/latex/struktex/struktex.mk
+++ b/Master/texmf-dist/doc/latex/struktex/struktex.mk
@@ -35,7 +35,7 @@
 # user tree:
 #INSTALLTEXMF=$(HOME)/texmf
 # Try to use user's tree known by kpsewhich:
-INSTALLTEXMF=`kpsewhich --expand-var '$$HOMETEXMF'`
+INSTALLTEXMF=`kpsewhich --expand-var '$$TEXMFHOME'`
 # Try to use the local tree known by kpsewhich:
 #INSTALLTEXMF=`kpsewhich --expand-var '$$TEXMFLOCAL'`
 # But you may set INSTALLTEXMF to every directory you want.