From affc79c45bfab740028ac1e6b8480c5465a42b01 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Aug 2006 23:37:56 +0000 Subject: struktex update (19aug06) git-svn-id: svn://tug.org/texlive/trunk@1989 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/struktex/strukdoc.sty | 6 +-- Master/texmf-dist/tex/latex/struktex/struktex.sty | 58 ++++++++++++++++------- Master/texmf-dist/tex/latex/struktex/struktxf.sty | 6 +-- Master/texmf-dist/tex/latex/struktex/struktxp.sty | 6 +-- 4 files changed, 50 insertions(+), 26 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 68288a5c496..00e903018ec 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-2005 by Jobst Hoffmann. All rights reserved. +%% Copyright (C) 1989-2006 by Jobst Hoffmann. All rights reserved. %% %% IMPORTANT COPYRIGHT NOTICE: %% @@ -19,8 +19,8 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2005/05/17} -\def\fileversion{v8.0f} +\def\filedate{2006/01/20} +\def\fileversion{v8.2a} %% \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 4f069cdbc36..701d27b3be4 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-2005 by Jobst Hoffmann. All rights reserved. +%% Copyright (C) 1989-2006 by Jobst Hoffmann. All rights reserved. %% %% IMPORTANT COPYRIGHT NOTICE: %% @@ -19,8 +19,8 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2005/05/17} -\def\fileversion{v8.0f} +\def\filedate{2006/01/20} +\def\fileversion{v8.2a} \ProvidesPackage{struktex} [\filedate\space\fileversion\space Nassi Shneidermann Charts (Jobst Hoffmann)] %% @@ -58,6 +58,24 @@ {% \setboolean{verification}{true} } +\newboolean{filler} +\setboolean{filler}{true} +\DeclareOption{nofiller}% +{% + \setboolean{filler}{false} +} +\let\ifdraft@nss\iffalse +\let\iffinal@nss\iftrue +\DeclareOption{draft}% +{% + \let\ifdraft@nss\iftrue + \let\iffinal@nss\iffalse +} +\DeclareOption{final}% +{% + \let\ifdraft@nss\iffalse + \let\iffinal@nss\iftrue +} \ProcessOptions \ifcurves% \RequirePackage{curves} @@ -84,11 +102,8 @@ \DeclareMathSymbol\varnothing{\mathord}{AMSb}{"3F} \let\emptyset\varnothing \def\filler@nss% -{ - \ifmmode% - \emptyset% - \else $\emptyset$% - \fi% +{% + \iffiller\ensuremath{\emptyset}\fi% } \def\c@nter@nss% {% @@ -106,6 +121,7 @@ {% \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% @@ -547,10 +563,12 @@ \curve(\x@nss, \y@nss, \xx@nss, \tempy@nss)% \else\ifpictIIe% \tempxxx@nss=\xx@nss + \advance\tempxxx@nss by -\x@nss \divide\tempxxx@nss by 1000 \tempyyy@nss=\tempy@nss \advance\tempyyy@nss by -\y@nss \divide\tempyyy@nss by 1000 + \advance\xx@nss by -\x@nss \put(\x@nss,\y@nss){\line(\tempxxx@nss, \tempyyy@nss){\xx@nss}} \fi\fi\fi% \else @@ -563,12 +581,17 @@ \else\ifcurves% \curve(\x@nss, \y@nss, \xx@nss, \tempy@nss)% \else\ifpictIIe% - \tempxxx@nss=\xx@nss - \divide\tempxxx@nss by 1000 - \tempyyy@nss=\tempy@nss - \advance\tempyyy@nss by -\y@nss - \divide\tempyyy@nss by 1000 - \put(\x@nss,\y@nss){\line(\tempxxx@nss, \tempyyy@nss){\xx@nss}} + \begingroup + \tempxxx@nss=\xx@nss + \advance\tempxxx@nss by -\x@nss + \divide\tempxxx@nss by 1000 + \tempyyy@nss=\tempy@nss + \advance\tempyyy@nss by -\y@nss + \divide\tempyyy@nss by 1000 + \advance\xx@nss by -\x@nss + \put(\x@nss,\y@nss){\line(\tempxxx@nss, + \tempyyy@nss){\xx@nss}} + \endgroup \fi\fi\fi% \advance\x@nss by \xsize@nss \ifemlines% @@ -689,18 +712,19 @@ \end{trivlist}% } \let\centernssfile=\CenterNssFile + \newcommand\assert{\let\next=\assert@nss\getoption}% + \newcommand\assert@nss[1]{}% \ifthenelse{\boolean{verification}} { \countdef\xsizeo@nss=232% \countdef\ydeptho@nss=233% - - \newcommand\assert{\let\next=\assert@nss\getoption}% - \newcommand{\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]% {% \tempy@nss=#1\TextBoxHt@nss=\ht\TextBox@nss% diff --git a/Master/texmf-dist/tex/latex/struktex/struktxf.sty b/Master/texmf-dist/tex/latex/struktex/struktxf.sty index dc9882024dc..cd0f59f4f60 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-2005 by Jobst Hoffmann. All rights reserved. +%% Copyright (C) 1989-2006 by Jobst Hoffmann. All rights reserved. %% %% IMPORTANT COPYRIGHT NOTICE: %% @@ -19,8 +19,8 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2005/05/17} -\def\fileversion{v8.0f} +\def\filedate{2006/01/20} +\def\fileversion{v8.2a} \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 fc42bc978f7..f3f89049f13 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-2005 by Jobst Hoffmann. All rights reserved. +%% Copyright (C) 1989-2006 by Jobst Hoffmann. All rights reserved. %% %% IMPORTANT COPYRIGHT NOTICE: %% @@ -19,8 +19,8 @@ %% to %% j.hoffmann@fh-aachen.de \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\filedate{2005/05/17} -\def\fileversion{v8.0f} +\def\filedate{2006/01/20} +\def\fileversion{v8.2a} \ProvidesPackage{struktxp} [\filedate\space\fileversion\space Keywords for Nassi Shneidermann Charts (Jobst Hoffmann)] %% -- cgit v1.2.3