From b78f8eca13b9e470f04335d921404e57b4ce1e46 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Aug 2006 22:30:34 +0000 Subject: struktex again git-svn-id: svn://tug.org/texlive/trunk@1995 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/struktex/getversion.tex | 4 +- .../texmf-dist/doc/latex/struktex/struktex.de.pdf | Bin 479494 -> 326076 bytes Master/texmf-dist/doc/latex/struktex/struktex.el | 28 ++++--- .../texmf-dist/doc/latex/struktex/struktex.en.pdf | Bin 291719 -> 310241 bytes Master/texmf-dist/doc/latex/struktex/struktex.mk | 10 ++- .../texmf-dist/source/latex/struktex/struktex.dtx | 83 +++++++++++++++------ .../texmf-dist/source/latex/struktex/struktex.ins | 2 +- Master/texmf-dist/tex/latex/struktex/strukdoc.sty | 4 +- Master/texmf-dist/tex/latex/struktex/struktex.sty | 4 +- Master/texmf-dist/tex/latex/struktex/struktxf.sty | 4 +- Master/texmf-dist/tex/latex/struktex/struktxp.sty | 4 +- Master/texmf-dist/tpm/struktex.tpm | 10 +-- 12 files changed, 100 insertions(+), 53 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 Binary files a/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf and b/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf differ 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 Binary files a/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf and b/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf differ 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 diff --git a/Master/texmf-dist/source/latex/struktex/struktex.dtx b/Master/texmf-dist/source/latex/struktex/struktex.dtx index 95c9352aed8..ecffa899543 100644 --- a/Master/texmf-dist/source/latex/struktex/struktex.dtx +++ b/Master/texmf-dist/source/latex/struktex/struktex.dtx @@ -18,8 +18,8 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\def\filedate{2006/01/20} -%\def\fileversion{v8.2a} +%\def\filedate{2006/08/20} +%\def\fileversion{v8.3b} %\ProvidesPackage{struktex} % [\filedate\space\fileversion\space Nassi Shneidermann Charts (Jobst Hoffmann)] %\ProvidesPackage{struktxf} @@ -28,13 +28,32 @@ % [\filedate\space\fileversion\space Keywords for Nassi Shneidermann Charts (Jobst Hoffmann)] % \fi % \CheckSum{2071} -% \def\docdate {2006/01/20} ^^A not style'able!! +% \def\docdate {2006/08/20} ^^A not style'able!! % % \iffalse meta-comment -% struktex.dtx $Revision: 7.11 $ -% $Date: 2006/08/16 20:30:43 $ +% struktex.dtx $Revision: 7.14 $ +% $Date: 2006/08/20 11:43:18 $ % $RCSfile: struktex.dtx,v $ % $Log: struktex.dtx,v $ +% Revision 7.14 2006/08/20 11:43:18 ax006ho +% - kleine Korrekturen (\fileversion ... aktualisiert) +% - Makefile erweitert: das Ziel "dist" erzeugt automatisch eine +% Datei THIS_IS_VERSION_... +% - Option english in der DAtei getversion.tex gestrichen +% +% Revision 7.13 2006/08/19 18:36:36 ax006ho +% - struktex.el kann nun case korrekt einfuegen: es wird die entsprechende +% Anzahl von switch-Kommandos mitsamt den zugehoerigen Argumenten +% eingefuegt +% +% Revision 7.12 2006/08/18 20:06:15 ax006ho +% - die zusaetzlichen Optionen draft und final wurden eingefuehrt +% - einige Tippfehler wurden korrigiert, Umlaute gegen die Ersatzdarstellung +% ausgetauscht +% - Beispiel 2 wurde geaendert: die Option draft wird bei Verzicht auf +% sProofOn benutzt +% - die Funktionalitaet von struktex.el wurde erweitert +% % Revision 7.11 2006/08/16 20:30:43 ax006ho % - AUCTeX Unterstuetzung verbessert % - kleinere Textkorrekturen @@ -210,6 +229,10 @@ % % \def\StrukTeXSty{\textsf{struktex.sty}} % +% \changes{v8.3b}{06/08/20}{Erweiterung im Makefile: f"ur dist wird automatisch +% eine Datei THIS_IS_VERSION_... erzeugt.} +% \changes{v8.3a}{06/08/19}{struktex.el erweitert: es wird die korrekte Anzahl +% von `switch{} generiert und mit Inhalt gef"ullt} % \changes{v8.3}{06/08/18}{Weitere Optionen "`draft"' und "`final"' eingef"uhrt} % \changes{v8.2a}{06/01/17}{struktex.el korrigiert und erweitert} % \changes{v8.1a}{05/09/01}{Erste (fehlerhafte) Version einer struktex.el Stil @@ -3664,6 +3687,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 ######################################################################## @@ -3776,9 +3802,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 @@ -3832,11 +3861,11 @@ sed -e "`echo \"s/^ /@/g\" | tr '@' '\011'`" struktex.mk > Makefile %<*getversion> % \fi % \begin{macrocode} -\documentclass[english]{ltxdoc} +\documentclass{ltxdoc} \nofiles \usepackage{struktex} \GetFileInfo{struktex.sty} -\typeout{VERSION \fileversion} +\typeout{VERSION \fileversion\space of \filedate} \begin{document} \end{document} % \end{macrocode} @@ -3966,26 +3995,32 @@ sed -e "`echo \"s/^ /@/g\" | tr '@' '\011'`" struktex.mk > Makefile (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" + "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: ")) (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}" + (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. @@ -4000,7 +4035,7 @@ 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, +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: ")) @@ -4010,7 +4045,7 @@ condition, and the possible values of the condition" (conditionvr (read-string "Condition value right: "))) (insert (concat (if (not (zerop (length height))) (format "[%s]" height)) - (format "{%s}{%s}{%s}{%s}{%s}" + (format "{%s}{%s}{%s}{%s}{%s}" lslope rslope condition conditionvl conditionvr))) (end-of-line) (newline-and-indent) diff --git a/Master/texmf-dist/source/latex/struktex/struktex.ins b/Master/texmf-dist/source/latex/struktex/struktex.ins index 61091dac070..bb4bac0ea11 100644 --- a/Master/texmf-dist/source/latex/struktex/struktex.ins +++ b/Master/texmf-dist/source/latex/struktex/struktex.ins @@ -1,5 +1,5 @@ %% -%% $Revision: 7.7 $ +%% $Revision: 7.8 $ %% %% This file will generate fast loadable files and documentation %% driver files from the doc files in this package when run through diff --git a/Master/texmf-dist/tex/latex/struktex/strukdoc.sty b/Master/texmf-dist/tex/latex/struktex/strukdoc.sty index 00e903018ec..e173a21a170 100644 --- a/Master/texmf-dist/tex/latex/struktex/strukdoc.sty +++ b/Master/texmf-dist/tex/latex/struktex/strukdoc.sty @@ -19,8 +19,8 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2006/01/20} -\def\fileversion{v8.2a} +\def\filedate{2006/08/20} +\def\fileversion{v8.3b} %% \RequirePackage{ifpdf} \ProvidesPackage{strukdoc} diff --git a/Master/texmf-dist/tex/latex/struktex/struktex.sty b/Master/texmf-dist/tex/latex/struktex/struktex.sty index 701d27b3be4..3efd7984836 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktex.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktex.sty @@ -19,8 +19,8 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2006/01/20} -\def\fileversion{v8.2a} +\def\filedate{2006/08/20} +\def\fileversion{v8.3b} \ProvidesPackage{struktex} [\filedate\space\fileversion\space Nassi Shneidermann Charts (Jobst Hoffmann)] %% diff --git a/Master/texmf-dist/tex/latex/struktex/struktxf.sty b/Master/texmf-dist/tex/latex/struktex/struktxf.sty index cd0f59f4f60..87f796e70fb 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktxf.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktxf.sty @@ -19,8 +19,8 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2006/01/20} -\def\fileversion{v8.2a} +\def\filedate{2006/08/20} +\def\fileversion{v8.3b} \ProvidesPackage{struktxf} [\filedate\space\fileversion\space Fonts for Nassi Shneidermann Charts (Jobst Hoffmann)] %% diff --git a/Master/texmf-dist/tex/latex/struktex/struktxp.sty b/Master/texmf-dist/tex/latex/struktex/struktxp.sty index f3f89049f13..ea5a703c949 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktxp.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktxp.sty @@ -19,8 +19,8 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2006/01/20} -\def\fileversion{v8.2a} +\def\filedate{2006/08/20} +\def\fileversion{v8.3b} \ProvidesPackage{struktxp} [\filedate\space\fileversion\space Keywords for Nassi Shneidermann Charts (Jobst Hoffmann)] %% diff --git a/Master/texmf-dist/tpm/struktex.tpm b/Master/texmf-dist/tpm/struktex.tpm index d7f7ee4b54b..c74aa434424 100644 --- a/Master/texmf-dist/tpm/struktex.tpm +++ b/Master/texmf-dist/tpm/struktex.tpm @@ -3,7 +3,7 @@ struktex Package - 2006/08/19 23:36:54 + 2006/08/20 22:30:17 8.0f rahtz Draw Nassi-Schneidermann charts @@ -16,16 +16,16 @@ preference). [description copied from TeX Catalogue] Jobst Hoffmann - 1001943 + 1098680 - + texmf-dist/tex/latex/struktex/strukdoc.sty texmf-dist/tex/latex/struktex/struktex.sty texmf-dist/tex/latex/struktex/struktxf.sty texmf-dist/tex/latex/struktex/struktxp.sty texmf-dist/tpm/struktex.tpm - + texmf-dist/doc/latex/struktex/LIESMICH texmf-dist/doc/latex/struktex/README texmf-dist/doc/latex/struktex/getversion.tex @@ -40,7 +40,7 @@ texmf-dist/doc/latex/struktex/struktex.en.pdf texmf-dist/doc/latex/struktex/struktex.makemake texmf-dist/doc/latex/struktex/struktex.mk - + texmf-dist/source/latex/struktex/struktex.dtx texmf-dist/source/latex/struktex/struktex.ins -- cgit v1.2.3