From a5bf2a9c12d868210211134afe9df4b7d226cc01 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 26 Jun 2010 00:19:36 +0000 Subject: struktex 101 (25jun10) git-svn-id: svn://tug.org/texlive/trunk@19160 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/struktex/strukdoc.sty | 11 +- Master/texmf-dist/tex/latex/struktex/struktex.sty | 427 ++++++++++++---------- Master/texmf-dist/tex/latex/struktex/struktxf.sty | 11 +- Master/texmf-dist/tex/latex/struktex/struktxp.sty | 22 +- 4 files changed, 247 insertions(+), 224 deletions(-) (limited to 'Master/texmf-dist/tex/latex/struktex') diff --git a/Master/texmf-dist/tex/latex/struktex/strukdoc.sty b/Master/texmf-dist/tex/latex/struktex/strukdoc.sty index e173a21a170..ac4c37e8647 100644 --- a/Master/texmf-dist/tex/latex/struktex/strukdoc.sty +++ b/Master/texmf-dist/tex/latex/struktex/strukdoc.sty @@ -6,7 +6,7 @@ %% %% struktex.dtx (with options: `strukdoc') %% -%% Copyright (C) 1989-2006 by Jobst Hoffmann. All rights reserved. +%% Copyright (C) 1989-2010 by Jobst Hoffmann. All rights reserved. %% %% IMPORTANT COPYRIGHT NOTICE: %% @@ -19,12 +19,13 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2006/08/20} -\def\fileversion{v8.3b} +{% + \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {% + \ProvidesPackage{strukdoc}[#2/#3/#4 v#7 support for reading and writing files verbatim (Jobst Hoffmann)]} + \@svn@ $Date: 2010-06-25 13:00:22 +0200 (Fr, 25 Jun 2010) $$Revision: 101 $ % +} %% \RequirePackage{ifpdf} -\ProvidesPackage{strukdoc} - [\filedate\space\fileversion\space (Jobst Hoffmann)] \newif\ifcolor \IfFileExists{color.sty}{\colortrue}{} \ifpdf \RequirePackage[colorlinks]{hyperref}\else \def\href#1{\texttt}\fi diff --git a/Master/texmf-dist/tex/latex/struktex/struktex.sty b/Master/texmf-dist/tex/latex/struktex/struktex.sty index 3efd7984836..d78fff5c349 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktex.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktex.sty @@ -6,7 +6,7 @@ %% %% struktex.dtx (with options: `struktex') %% -%% Copyright (C) 1989-2006 by Jobst Hoffmann. All rights reserved. +%% Copyright (C) 1989-2010 by Jobst Hoffmann. All rights reserved. %% %% IMPORTANT COPYRIGHT NOTICE: %% @@ -19,12 +19,12 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2006/08/20} -\def\fileversion{v8.3b} -\ProvidesPackage{struktex} - [\filedate\space\fileversion\space Nassi Shneidermann Charts (Jobst Hoffmann)] +{% + \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {% + \ProvidesPackage{struktex}[#2/#3/#4 v#7 Nassi Shneiderman Charts (Jobst Hoffmann)]} + \@svn@ $Date: 2010-06-25 13:00:22 +0200 (Fr, 25 Jun 2010) $$Revision: 101 $ % +} %% -\@ifundefined{StrukTeX}{}{\endinput} \RequirePackage{ifthen} \RequirePackage{struktxf} \RequirePackage{struktxp} @@ -101,38 +101,32 @@ \newbox\TextBox@nss \newdimen\TextBoxHt@nss \DeclareMathSymbol\varnothing{\mathord}{AMSb}{"3F} \let\emptyset\varnothing -\def\filler@nss% -{% +\def\filler@nss{% \iffiller\ensuremath{\emptyset}\fi% } -\def\c@nter@nss% -{% +\def\c@nter@nss{% \leftskip=0pt plus 2em \rightskip=\leftskip \parfillskip=0pt \spaceskip=.333em \xspaceskip=.5em \pretolerance=9999 \tolerance=9999 \hyphenpenalty=9999 \exhyphenpenalty=9999% } \def\Position@nss{}% -\newcommand{\PositionNSS}[1]% -{% +\newcommand{\PositionNSS}[1]{% \def\Position@nss{#1}% } -\def\struktogramm(#1,#2)% -{% +\def\struktogramm(#1,#2){% \let\ifthenelse=\ifthenelse@nss% \let\ifend=\ifend@nss% \ifdraft@nss\let\struktogramm@nss=\struktogramm@Proof\fi% \@ifnextchar [{\struktogramm@nss(#1,#2)}{\struktogramm@nss(#1,#2)[]}% } -\def\endstruktogramm% -{% +\def\endstruktogramm{% \endstr@kt% \end{picture}% \end{minipage}% \setlength{\unitlength}{\savelength@nss}% } -\def\struktogramm@NoProof(#1,#2)[#3]% -{% +\def\struktogramm@NoProof(#1,#2)[#3]{% \def\next{#3} \setlength{\savelength@nss}{\unitlength} \setlength{\unitlength}{0.001mm} @@ -141,8 +135,7 @@ \begin{picture}(#1000,#2000)% \str@kt{0}{#2000}{#1000}% } -\def\struktogramm@Proof(#1,#2)[#3]% -{% +\def\struktogramm@Proof(#1,#2)[#3]{% \def\next{#3}% \setlength{\savelength@nss}{\unitlength}% \setlength{\unitlength}{0.001mm}% @@ -179,51 +172,44 @@ } \def\getoption{\@ifnextchar [{\getnum}{\param@nss=0\next}} \def\getnum[#1]{\param@nss=#1\next} -\def\str@kt#1#2#3% -{% - \global\gx@nss=#1\global\gy@nss=#2\global\gsize@nss=#3% - \begingroup% - \x@nss=\gx@nss\y@nss=\gy@nss\xsize@nss=\gsize@nss% -} -\def\endstr@kt% -{% - \global\gy@nss=\y@nss% - \endgroup% - \ydepth@nss=\gy@nss% -} -\def\set@nss#1#2% -{% - \setbox\TextBox@nss=\hbox{#1}% - \tempxx@nss=\xsize@nss\advance\tempxx@nss by-#2% - \ifdim\wd\TextBox@nss>\tempxx@nss\unitlength% - \setbox\TextBox@nss=\vbox{\hsize=\tempxx@nss\unitlength\noindent#1}% - \fi% -} -\def\block@nss#1#2% -{% - \tempy@nss=#1\TextBoxHt@nss=\ht\TextBox@nss% - \advance\TextBoxHt@nss by\dp\TextBox@nss% - \advance\TextBoxHt@nss by 2mm% - \ifdim\TextBoxHt@nss<\tempy@nss\unitlength% - \TextBoxHt@nss=\tempy@nss\unitlength% - \fi% - \TextBoxHt@nss=0.00536\TextBoxHt@nss% - \ydepth@nss=\TextBoxHt@nss\advance\y@nss by-\ydepth@nss% - \ifx#21% - \put(\x@nss,\y@nss)% - {% - \framebox(\xsize@nss,\ydepth@nss){\box\TextBox@nss}% - }% - \else% - \ifx#20% - \put(\x@nss,\y@nss)% - {% - \makebox(\xsize@nss,\ydepth@nss){\box\TextBox@nss}% - }% - \else% - \advance\y@nss by \ydepth@nss% - \fi% - \fi% +\def\str@kt#1#2#3{% + \global\gx@nss=#1\global\gy@nss=#2\global\gsize@nss=#3% + \begingroup% + \x@nss=\gx@nss\y@nss=\gy@nss\xsize@nss=\gsize@nss% +} +\def\endstr@kt{% + \global\gy@nss=\y@nss% + \endgroup% + \ydepth@nss=\gy@nss% +} +\def\set@nss#1#2{% + \setbox\TextBox@nss=\hbox{#1}% + \tempxx@nss=\xsize@nss\advance\tempxx@nss by-#2% + \ifdim\wd\TextBox@nss>\tempxx@nss\unitlength% + \setbox\TextBox@nss=\vbox{\hsize=\tempxx@nss\unitlength\noindent#1}% + \fi% +} +\def\block@nss#1#2{% + \tempy@nss=#1% + \TextBoxHt@nss=\ht\TextBox@nss% + \advance\TextBoxHt@nss by\dp\TextBox@nss% + \advance\TextBoxHt@nss by 2mm% + \ifdim\TextBoxHt@nss<\tempy@nss\unitlength% + \TextBoxHt@nss=\tempy@nss\unitlength% + \fi% + \TextBoxHt@nss=0.00536\TextBoxHt@nss% + \ydepth@nss=\TextBoxHt@nss\advance\y@nss by-\ydepth@nss% + \ifx#21% + \put(\x@nss,\y@nss){% + \framebox(\xsize@nss,\ydepth@nss){\box\TextBox@nss}% + }% + \else\ifx#20% + \put(\x@nss,\y@nss){% + \makebox(\xsize@nss,\ydepth@nss){\box\TextBox@nss}% + }% + \else% + \advance\y@nss by \ydepth@nss% + \fi\fi% } \def\declarationtitle{\ifnum\language=\languageNGerman Speicherplatz bereitstellen: \else providing memory space\fi} @@ -268,21 +254,21 @@ } \newcommand{\description@nss}[2]{\item[#1] \{#2\}} \def\assign{\let\next=\@assign\getoption}% -\def\@assign#1% -{% - \tempx@nss=\xsize@nss\divide\tempx@nss by 6% - \set@nss{#1}{\tempx@nss}\tempy@nss=\number\param@nss000% - \block@nss{\tempy@nss}{1}% +\def\@assign#1{% + \tempx@nss=\xsize@nss\divide\tempx@nss by 6% + \set@nss{#1}{\tempx@nss}% + \tempy@nss=\number\param@nss000% + \block@nss{\tempy@nss}{1}% } \def\sub{\let\next=\@sub\getoption} \def\@sub#1% {% - \@assign{#1}\tempx@nss=\xsize@nss\divide\tempx@nss by 20% - \tempxx@nss=\x@nss\advance\tempxx@nss by \tempx@nss% - \put(\tempxx@nss,\y@nss){\line(0,1){\ydepth@nss}}% - \tempxx@nss=\x@nss\advance\tempxx@nss by \xsize@nss% - \advance\tempxx@nss by -\tempx@nss% - \put(\tempxx@nss,\y@nss){\line(0,1){\ydepth@nss}}% + \@assign{#1}\tempx@nss=\xsize@nss\divide\tempx@nss by 20% + \tempxx@nss=\x@nss\advance\tempxx@nss by \tempx@nss% + \put(\tempxx@nss,\y@nss){\line(0,1){\ydepth@nss}}% + \tempxx@nss=\x@nss\advance\tempxx@nss by \xsize@nss% + \advance\tempxx@nss by -\tempx@nss% + \put(\tempxx@nss,\y@nss){\line(0,1){\ydepth@nss}}% } \def\exit{\let\next=\@exit\getoption} \def\@exit#1% @@ -326,11 +312,8 @@ \newdimen\thislength@nss \countdef\gindhelp@nss=234 \def\ifthenelse@nss{\let\next=\@ifthenelse@nss\getoption} -\def\@ifthenelse@nss#1#2#3#4#5% -{% - %\ifthenelse{\boolean{anygradient}}% - %{% - \ifanygradient +\def\@ifthenelse@nss#1#2#3#4#5{% + \ifanygradient \xx@nss=#1 \advance\xx@nss by #2% \ifnum\number\param@nss000>0% \tempyy@nss=\number\param@nss000% @@ -397,12 +380,10 @@ \xdef\shape{\shape\the\thislength@nss}% \ifnum\index@nss<\tempy@nss% \repeat% - %}% - %{% -\else + \else %\ifanygradient \ifnum\number\param@nss000>0% - \typeout{struktex warning:}% - \typeout{[...] not supplied without curves, emlines2, or pict2e}% + \typeout{struktex warning:}% + \typeout{[...] not supplied without curves, emlines2, or pict2e}% \fi% \tempx@nss=#1 \advance\tempx@nss by #2% \tempyy@nss=\xsize@nss \divide\tempyy@nss by \tempx@nss% @@ -416,74 +397,64 @@ \ifnum\tempy@nss<1 \tempy@nss=1\fi% \xdef\shape{}\index@nss=0% \loop% - \advance\index@nss by 1% - \condindent@nss=#1\multiply\condindent@nss by\index@nss% - \multiply\condindent@nss by 5000% - \xdef\shape{\shape\the\condindent@nss\unitlength}% - \condindent@nss=#1\advance\condindent@nss by #2% - \multiply\condindent@nss by\index@nss% - \multiply\condindent@nss by -5000% - \advance\condindent@nss by \xsize@nss% - \xdef\shape{\shape\the\condindent@nss\unitlength}% - \ifnum\index@nss<\tempy@nss% + \advance\index@nss by 1% + \condindent@nss=#1\multiply\condindent@nss by\index@nss% + \multiply\condindent@nss by 5000% + \xdef\shape{\shape\the\condindent@nss\unitlength}% + \condindent@nss=#1\advance\condindent@nss by #2% + \multiply\condindent@nss by\index@nss% + \multiply\condindent@nss by -5000% + \advance\condindent@nss by \xsize@nss% + \xdef\shape{\shape\the\condindent@nss\unitlength}% + \ifnum\index@nss<\tempy@nss% \repeat% - %}% - \fi - \put(\x@nss,\y@nss)% - {% - \framebox(\xsize@nss,\tempyy@nss)[tl]% - {% - \vbox% - {% - \hsize=\xsize@nss\unitlength% - \parshape=\tempy@nss \shape \c@nter@nss% - %dies sorgt f"ur den Einzug - \noindent\vrule width0pt height12pt \relax #3% - %hier wird der Text ausgegeben - }% - }% + \fi %\ifanygradient + \put(\x@nss,\y@nss){% + \framebox(\xsize@nss,\tempyy@nss)[tl]{% + \vbox{% + \hsize=\xsize@nss\unitlength% + \parshape=\tempy@nss \shape \c@nter@nss% + %dies sorgt f"ur den Einzug + \noindent\vrule width0pt height12pt \relax #3% + %hier wird der Text ausgegeben + }% }% - \divide\tempyy@nss by 2% - \xx@nss=\xsize@nss\advance\xx@nss by-\tempx@nss% - \advance\xx@nss by-\tempxx@nss% - \ifodd\xx@nss\advance\tempxx@nss by 1\fi% - \divide\xx@nss by 2\advance\tempxx@nss by \xx@nss% - \advance\tempx@nss by \xx@nss% - \put(\x@nss,\y@nss){\makebox(\tempx@nss,\tempyy@nss){#4}}% - \xx@nss=\x@nss\advance\xx@nss by \tempx@nss% - \put(\xx@nss,\y@nss){\makebox(\tempxx@nss,\tempyy@nss){#5}}% - \str@kt{\x@nss}{\y@nss}{\tempx@nss}% -} -\def\change% -{% + }% + \divide\tempyy@nss by 2% + \xx@nss=\xsize@nss\advance\xx@nss by-\tempx@nss% + \advance\xx@nss by-\tempxx@nss% + \ifodd\xx@nss\advance\tempxx@nss by 1\fi% + \divide\xx@nss by 2\advance\tempxx@nss by \xx@nss% + \advance\tempx@nss by \xx@nss% + \put(\x@nss,\y@nss){\makebox(\tempx@nss,\tempyy@nss){#4}}% + \xx@nss=\x@nss\advance\xx@nss by \tempx@nss% + \put(\xx@nss,\y@nss){\makebox(\tempxx@nss,\tempyy@nss){#5}}% + \str@kt{\x@nss}{\y@nss}{\tempx@nss}% +} +\def\change{% \endstr@kt\str@kt{\xx@nss}{\y@nss}{\tempxx@nss}% } -\def\ifend@nss% -{% - \global\gy@nss=\y@nss\endgroup\tempy@nss=\gy@nss% - \ifnum\tempy@nss<\ydepth@nss% - \y@nss=\tempy@nss\advance\ydepth@nss by-\tempy@nss% - \put(\x@nss,\y@nss)% - {% - \framebox(\tempx@nss,\ydepth@nss)% - {% - \ifnum\ydepth@nss>5000\filler@nss\fi% - }% +\def\ifend@nss{% + \global\gy@nss=\y@nss\endgroup\tempy@nss=\gy@nss% + \ifnum\tempy@nss<\ydepth@nss% + \y@nss=\tempy@nss\advance\ydepth@nss by-\tempy@nss% + \put(\x@nss,\y@nss){% + \framebox(\tempx@nss,\ydepth@nss){% + \ifnum\ydepth@nss>5000\filler@nss\fi% + }% + }% + \else% + \ifnum\tempy@nss>\ydepth@nss% + \y@nss=\ydepth@nss\advance\tempy@nss by-\ydepth@nss% + \put(\xx@nss,\y@nss){% + \framebox(\tempxx@nss,\tempy@nss){% + \ifnum\tempy@nss>5000\filler@nss\fi% }% + }% \else% - \ifnum\tempy@nss>\ydepth@nss% - \y@nss=\ydepth@nss\advance\tempy@nss by-\ydepth@nss% - \put(\xx@nss,\y@nss)% - {% - \framebox(\tempxx@nss,\tempy@nss)% - {% - \ifnum\tempy@nss>5000\filler@nss\fi% - }% - }% - \else% - \y@nss=\ydepth@nss% - \fi% + \y@nss=\ydepth@nss% \fi% + \fi% } \def\forever{\let\next=\@forever\getoption} \def\@forever{ @@ -514,16 +485,20 @@ \let\dfr\forever \let\dfrend\foreverend \def\while{\let\next=\@while\getoption} -\def\@while#1{\tempx@nss=\xsize@nss\divide\tempx@nss by 6 - \set@nss{#1\hskip\xsize@nss\unitlength}{\tempx@nss} - \tempy@nss=\number\param@nss000 \block@nss{\tempy@nss}{0} - \tempy@nss=\y@nss\advance\y@nss by \ydepth@nss - \tempx@nss=\x@nss\advance\tempx@nss by \ydepth@nss - \tempxx@nss=\xsize@nss\advance\tempxx@nss by -\ydepth@nss - \str@kt{\tempx@nss}{\tempy@nss}{\tempxx@nss} } -\def\whileend{\endstr@kt\tempy@nss=\y@nss\advance\tempy@nss by-\ydepth@nss - \y@nss=\ydepth@nss - \put(\x@nss,\y@nss){\framebox(\xsize@nss,\tempy@nss){}} } +\def\@while#1{% + \tempx@nss=\xsize@nss\divide\tempx@nss by 6 + \set@nss{#1\hskip\xsize@nss\unitlength}{\tempx@nss} + \tempy@nss=\number\param@nss000 \block@nss{\tempy@nss}{0} + \tempy@nss=\y@nss\advance\y@nss by \ydepth@nss + \tempx@nss=\x@nss\advance\tempx@nss by \ydepth@nss + \tempxx@nss=\xsize@nss\advance\tempxx@nss by -\ydepth@nss + \str@kt{\tempx@nss}{\tempy@nss}{\tempxx@nss}% +} +\def\whileend{% + \endstr@kt\tempy@nss=\y@nss\advance\tempy@nss by-\ydepth@nss + \y@nss=\ydepth@nss + \put(\x@nss,\y@nss){\framebox(\xsize@nss,\tempy@nss){}}% +} \def\until{\let\next=\@until\getoption} \def\@until#1{\tempx@nss=\xsize@nss\divide\tempx@nss by 6 \set@nss{#1\hskip\xsize@nss\unitlength}{\tempx@nss} @@ -540,11 +515,10 @@ \put(\x@nss,\y@nss){\makebox(\xsize@nss,\tempy@nss) {\box\TextBox@nss}}} \def\case{\let\next=\@case\getoption} -\def\@case#1#2#3#4% -{ - \tempxx@nss=\number#2 - \ifanygradient% - %{% +\def\@case#1#2#3#4{% + \tempxx@nss=\number#2% + \ifanygradient% + %{% \ifnum\number\param@nss000>0 \tempyy@nss=\number\param@nss000% \ifodd\number#1 @@ -647,15 +621,13 @@ {% \makebox(\tempx@nss,\tempy@nss)[lb]{\raise3pt\hbox{~#4}}% }% - \ydepth@nss=1000000 - \str@kt{\x@nss}{\y@nss}{\tempx@nss} + \ydepth@nss=1000000% + \str@kt{\x@nss}{\y@nss}{\tempx@nss}% } -\def\switch% -{% +\def\switch{% \@ifnextchar [{\@switch}{\@switch[l]}% } -\def\@switch[#1]#2% -{ +\def\@switch[#1]#2{% \global\gy@nss=\y@nss\endgroup \tempyy@nss=\gy@nss \ifnum\tempyy@nss<\ydepth@nss @@ -667,45 +639,99 @@ {\makebox(\tempx@nss,\tempy@nss)[#1b]{\raise3pt\hbox{~#2~}}} \str@kt{\x@nss}{\y@nss}{\tempx@nss} } -\def\caseend% -{ - \global\gy@nss=\y@nss\endgroup - \tempyy@nss=\gy@nss - \ifnum\tempyy@nss<\ydepth@nss - \ydepth@nss=\tempyy@nss - \fi - \x@nss=\xx@nss - \y@nss=\ydepth@nss - \tempyy@nss=\yy@nss - \advance\tempyy@nss by -\ydepth@nss - \put(\x@nss,\y@nss){\framebox(\xsize@nss,\tempyy@nss){}} - \tempxx@nss=\x@nss - \loop - \put(\tempxx@nss,\y@nss){\line(0,1){\tempyy@nss}} - \advance\tempyy@nss by -\condindent@nss - \advance\tempxx@nss by \tempx@nss - \xx@nss=\tempxx@nss - \advance\xx@nss by -\x@nss - \advance\xx@nss by 100 - \ifnum \xx@nss<\xsize@nss - \repeat +\def\caseend{% + \global\gy@nss=\y@nss\endgroup + \tempyy@nss=\gy@nss + \ifnum\tempyy@nss<\ydepth@nss + \ydepth@nss=\tempyy@nss + \fi + \x@nss=\xx@nss + \y@nss=\ydepth@nss + \tempyy@nss=\yy@nss + \advance\tempyy@nss by -\ydepth@nss + \put(\x@nss,\y@nss){\framebox(\xsize@nss,\tempyy@nss){}} + \tempxx@nss=\x@nss + \loop + \advance\tempyy@nss by -\condindent@nss + \advance\tempxx@nss by \tempx@nss + \put(\tempxx@nss,\y@nss){\line(0,1){\tempyy@nss}} + \xx@nss=\tempxx@nss + \advance\xx@nss by -\x@nss + \advance\xx@nss by \tempx@nss + \advance\xx@nss by 100 + \ifnum \xx@nss<\xsize@nss + \repeat +} +\def\inparallel{\let\next=\@inparallel\getoption} +\def\@inparallel#1#2{% +\tempyy@nss=\number\param@nss000% +\tempxx@nss=\xsize@nss +\advance\tempxx@nss by 1500% prevent rounding errors +\divide\tempxx@nss by 3000% +\yy@nss=\y@nss\advance\yy@nss by -2000% +\multiput(\x@nss,\yy@nss)(3000, 0){\tempxx@nss}{\line(1,0){1500}}% +\advance\yy@nss by -2000% +\multiput(\x@nss,\yy@nss)(3000, 0){\tempxx@nss}{\line(1,0){1500}}% +\xx@nss=\x@nss% +\advance\xx@nss by \xsize@nss% +\divide\xsize@nss by #1% +\tempx@nss=\xsize@nss\divide\tempx@nss by 6% +\begingroup +\y@nss=\yy@nss% +\set@nss{#2}{\tempx@nss}% +\block@nss{\tempyy@nss}{0}% +\tempyy@nss=\TextBoxHt@nss% +} +\def\inparallelend{% + \global\tempy@nss=\y@nss% + \global\tempyy@nss=\tempyy@nss% + \endgroup +\begingroup% +\tempx@nss=\xsize@nss% +\divide\tempx@nss by 2% +\advance\xx@nss by -\tempx@nss% +\tempx@nss=\x@nss% +\loop% +\advance\tempx@nss by \xsize@nss% +\put(\tempx@nss,\tempy@nss){\line(0,1){\tempyy@nss}}% +\tempxx@nss=\tempx@nss% +\advance\tempxx@nss by \xsize@nss% +\ifnum \tempxx@nss<\xx@nss% +\repeat +\endgroup +\multiput(\x@nss,\tempy@nss)(3000, 0){\tempxx@nss}{\line(1,0){1500}}% +\advance\tempy@nss by -2000% +\multiput(\x@nss,\tempy@nss)(3000, 0){\tempxx@nss}{\line(1,0){1500}}% +\advance\tempy@nss by -2000% +\advance\tempyy@nss by 8000% +\advance\xx@nss by -\x@nss% +\put(\x@nss,\tempy@nss){\framebox(\xx@nss,\tempyy@nss){}}% +\xsize@nss=\xx@nss% +\y@nss=\tempy@nss% +} +\def\task{\let\next=\@task\getoption} +\def\@task#1{% + \advance\x@nss by \xsize@nss% + \y@nss=\yy@nss% + \set@nss{#1}{\tempx@nss}% + \ifnum\number\param@nss000>\tempyy@nss% + \tempyy@nss=\number\param@nss000% + \fi% + \block@nss{\tempyy@nss}{0}% } \newbox\CenterBox@nss% -\def\centernss% -{% +\def\centernss{% \begin{trivlist}% \item[] \strut% \setbox\CenterBox@nss=\hbox% \bgroup% } -\def\endcenternss% -{% +\def\endcenternss{% \egroup% \strut\hfill\box\CenterBox@nss\hfill\strut% \end{trivlist}% } -\def\CenterNssFile#1% -{% +\def\CenterNssFile#1{% \begin{trivlist}% \item[] \setbox\CenterBox@nss=\hbox{\input{#1.nss}}% \strut\hfill\box\CenterBox@nss\hfill\strut% @@ -714,19 +740,16 @@ \let\centernssfile=\CenterNssFile \newcommand\assert{\let\next=\assert@nss\getoption}% \newcommand\assert@nss[1]{}% -\ifthenelse{\boolean{verification}} -{ +\ifthenelse{\boolean{verification}}{% \countdef\xsizeo@nss=232% \countdef\ydeptho@nss=233% - \renewcommand{\assert@nss}[1]% - {% + \renewcommand{\assert@nss}[1]{% \tempx@nss=\xsize@nss\divide\tempx@nss by 6% \set@nss{#1}{\tempx@nss}\tempy@nss=\number\param@nss000% \assertblock@nss{\tempy@nss}{1}% } %% - \newcommand{\assertblock@nss}[2]% - {% + \newcommand{\assertblock@nss}[2]{% \tempy@nss=#1\TextBoxHt@nss=\ht\TextBox@nss% \advance\TextBoxHt@nss by\dp\TextBox@nss% \advance\TextBoxHt@nss by 2mm% diff --git a/Master/texmf-dist/tex/latex/struktex/struktxf.sty b/Master/texmf-dist/tex/latex/struktex/struktxf.sty index 87f796e70fb..492e955878d 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktxf.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktxf.sty @@ -6,7 +6,7 @@ %% %% struktex.dtx (with options: `struktxf') %% -%% Copyright (C) 1989-2006 by Jobst Hoffmann. All rights reserved. +%% Copyright (C) 1989-2010 by Jobst Hoffmann. All rights reserved. %% %% IMPORTANT COPYRIGHT NOTICE: %% @@ -19,10 +19,11 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2006/08/20} -\def\fileversion{v8.3b} -\ProvidesPackage{struktxf} - [\filedate\space\fileversion\space Fonts for Nassi Shneidermann Charts (Jobst Hoffmann)] +{% + \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {% + \ProvidesPackage{struktxf}[#2/#3/#4 v#7 Fonts for Nassi Shneiderman Charts (Jobst Hoffmann)]} + \@svn@ $Date: 2010-06-25 13:00:22 +0200 (Fr, 25 Jun 2010) $$Revision: 101 $ % +} %% \@ifundefined{nat}{}{\endinput} \DeclareSymbolFont{italics}{\encodingdefault}{\rmdefault}{m}{it}% diff --git a/Master/texmf-dist/tex/latex/struktex/struktxp.sty b/Master/texmf-dist/tex/latex/struktex/struktxp.sty index ea5a703c949..8be0b86de27 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktxp.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktxp.sty @@ -6,7 +6,7 @@ %% %% struktex.dtx (with options: `struktxp') %% -%% Copyright (C) 1989-2006 by Jobst Hoffmann. All rights reserved. +%% Copyright (C) 1989-2010 by Jobst Hoffmann. All rights reserved. %% %% IMPORTANT COPYRIGHT NOTICE: %% @@ -19,10 +19,11 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2006/08/20} -\def\fileversion{v8.3b} -\ProvidesPackage{struktxp} - [\filedate\space\fileversion\space Keywords for Nassi Shneidermann Charts (Jobst Hoffmann)] +{% + \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {% + \ProvidesPackage{struktxp}[#2/#3/#4 v#7 Keywords for Nassi Shneiderman Charts (Jobst Hoffmann)]} + \@svn@ $Date: 2010-06-25 13:00:22 +0200 (Fr, 25 Jun 2010) $$Revision: 101 $ % +} %% \@ifundefined{pVariable}{}{\endinput} \newcommand{\pExpFont@nss}{\small\sffamily} @@ -117,21 +118,18 @@ }% \yyI#1,!,% } -\def\pComment% -{% +\def\pComment{% \bgroup% \pCommentFont@nss% \let\next=% } -{ +{% \catcode`\#=6% - \gdef\pUseKeyFont@nss#1% - {% + \gdef\pUseKeyFont@nss#1{% \ifmmode\else\let\mbox=\relax\fi% \mbox{\pKeyFont@nss{#1}}\egroup% } - \gdef\pUseExpFont@nss#1% - {% + \gdef\pUseExpFont@nss#1{% \ifmmode\else\let\mbox=\relax\fi% \mbox{\pExpFont@nss{#1}}\egroup% } -- cgit v1.2.3