summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/struktex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-25 21:51:59 +0000
committerKarl Berry <karl@freefriends.org>2017-06-25 21:51:59 +0000
commit08ac04da4c2782bf535e914c4cbb56795854b3b1 (patch)
tree60e697e6e73d897291945e58c386f36bb4c33a36 /Master/texmf-dist/tex/latex/struktex
parent0baef83f46e61ff1d06c181a1bd8e0df785ff73e (diff)
struktex (25jun17)
git-svn-id: svn://tug.org/texlive/trunk@44699 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/struktex')
-rw-r--r--Master/texmf-dist/tex/latex/struktex/strukdoc.sty6
-rw-r--r--Master/texmf-dist/tex/latex/struktex/struktex.sty102
-rw-r--r--Master/texmf-dist/tex/latex/struktex/struktxf.sty6
-rw-r--r--Master/texmf-dist/tex/latex/struktex/struktxp.sty6
4 files changed, 82 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/struktex/strukdoc.sty b/Master/texmf-dist/tex/latex/struktex/strukdoc.sty
index 7eb36f49908..ebe887f4338 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-2010 by Jobst Hoffmann. All rights reserved.
+%% Copyright (C) 1989-2017 by Jobst Hoffmann. All rights reserved.
%%
%% IMPORTANT COPYRIGHT NOTICE:
%%
@@ -19,9 +19,9 @@
%% to
%% j.hoffmann_(at)_fh-aachen.de
\NeedsTeXFormat{LaTeX2e}[1999/12/01]{%
- \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {%
+ \def\@git@ $#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: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ %
+ %% git revision information
}
%%
\RequirePackage{ifpdf}
diff --git a/Master/texmf-dist/tex/latex/struktex/struktex.sty b/Master/texmf-dist/tex/latex/struktex/struktex.sty
index b50a93eeb97..73d15d58263 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-2010 by Jobst Hoffmann. All rights reserved.
+%% Copyright (C) 1989-2017 by Jobst Hoffmann. All rights reserved.
%%
%% IMPORTANT COPYRIGHT NOTICE:
%%
@@ -19,9 +19,9 @@
%% to
%% j.hoffmann_(at)_fh-aachen.de
\NeedsTeXFormat{LaTeX2e}[1999/12/01]{%
- \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {%
+ \def\@git@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {%
\ProvidesPackage{struktex}[#2/#3/#4 v#7 Nassi Shneiderman Charts (Jobst Hoffmann)]}
- \@svn@ $Date: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ %
+ %% git revision information
}
%%
\RequirePackage{ifthen}
@@ -98,6 +98,21 @@
\let\ifdraft@nss\iffalse
\let\iffinal@nss\iftrue
}
+\newboolean{debug}
+\DeclareOption{debug}%
+{%
+ \setboolean{debug}{true}
+}
+\DeclareOption{nodebug}%
+{%
+ \setboolean{debug}{false}
+}
+\newboolean{outer}
+\DeclareOption{outer}%
+{%
+ \setboolean{outer}{true}
+}
+%% \ifnum\language=\languageNGerman%
\ExecuteOptions{pict2e,english,final}
\ProcessOptions*\relax
\ifcurves%
@@ -107,6 +122,14 @@
\else\ifpictIIe
\RequirePackage{pict2e}
\fi\fi\fi
+\ifthenelse{\boolean{debug}}{
+ \typeout{debug active}}{
+ \typeout{debug inactive}
+ \renewcommand{\dbgString@nss}[1]{}
+ \renewcommand{\dbgCount@nss}[2][]{}
+ \renewcommand{\dbgCoord@nss}[3][]{}
+ \renewcommand{\dbgMark@nss}[3][]{}
+}
\def\StrukTeX{S\kern-.05emt\kern-.05em\raise.5ex\hbox{r}%
\kern-.1667emu\kern-.05em\lower.5ex\hbox{k}%
\kern-.2emT\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}
@@ -219,6 +242,7 @@
\else
\setbox\TextBox@nss=\hbox to \tempxx@nss\unitlength{#1\hss}%
\fi%
+ \dbgString@nss{Ende \string\set@nss}
}
\def\block@nss#1#2{%
\dbgString@nss{Beginn \string\block@nss}
@@ -469,9 +493,17 @@
\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}}%
+ \ifouter%
+ \put(\x@nss,\y@nss){\makebox(\tempx@nss,\tempyy@nss)[l]{\hspace{1em}#4}}%
+ \else%\outer
+ \put(\x@nss,\y@nss){\makebox(\tempx@nss,\tempyy@nss){#4}}%
+ \fi %\outer
\xx@nss=\x@nss\advance\xx@nss by \tempx@nss%
- \put(\xx@nss,\y@nss){\makebox(\tempxx@nss,\tempyy@nss){#5}}%
+ \ifouter%
+ \put(\xx@nss,\y@nss){\makebox(\tempxx@nss,\tempyy@nss)[r]{#5\hspace{1em}}}%
+ \else%\outer
+ \put(\xx@nss,\y@nss){\makebox(\tempxx@nss,\tempyy@nss){#5}}%
+ \fi %\outer
\str@kt{\x@nss}{\y@nss}{\tempx@nss}%
\dbgString@nss{Ende \string\@ifthenelse@nss}
}
@@ -503,32 +535,44 @@
\fi%
\dbgString@nss{Ende \string\ifend@nss}
}
+\def\forloop@nss{\let\next=\@forloop@nss\getoption}
+\def\@forloop@nss#1{
+ \def\argi{#1}
+ \dbgString@nss{Beginn \string\@forloop}
+ \tempx@nss=\xsize@nss
+ \divide\tempx@nss by 6
+ \ifx\argi\empty%
+ \set@nss{\mbox{\rule{0mm}{2ex}}}{\tempx@nss}%
+ \else%
+ \set@nss{#1\hskip\xsize@nss\unitlength}{\tempx@nss}%
+ \fi%
+ \tempy@nss=\number\param@nss000
+ \block@nss{\tempy@nss}{0}
+ \advance\x@nss by \ydepth@nss
+ \tempxx@nss=\xsize@nss
+ \advance\tempxx@nss by -\ydepth@nss
+ \tempy@nss=\ydepth@nss
+ \str@kt{\x@nss}{\y@nss}{\tempxx@nss}
+}
+\def\forloopend@nss{
+ \endstr@kt
+ \advance\x@nss by-\tempy@nss
+ \advance\ydepth@nss by -\tempy@nss
+ \tempyy@nss=\ydepth@nss
+ \ydepth@nss=-\ydepth@nss
+ \advance\ydepth@nss by \y@nss
+ \advance\ydepth@nss by \tempy@nss
+ \y@nss=\tempyy@nss
+ \put(\x@nss,\y@nss){\framebox(\xsize@nss,\ydepth@nss){}}
+ \dbgString@nss{Ende \string\@forloop@nss}
+}
+\let\forallin=\forloop@nss
+\let\forallinend=\forloopend@nss
\def\forever{\let\next=\@forever\getoption}
-\def\@forever{
- \tempx@nss=\xsize@nss
- \divide\tempx@nss by 6
- \set@nss{\mbox{\rule{0mm}{3ex}}}{\tempx@nss}
- \tempy@nss=\number\param@nss000
- \block@nss{\tempy@nss}{2}
- \advance\x@nss by \ydepth@nss
- \advance\y@nss by -\ydepth@nss
- \tempxx@nss=\xsize@nss
- \advance\tempxx@nss by -\ydepth@nss
- \tempy@nss=\ydepth@nss
- \str@kt{\x@nss}{\y@nss}{\tempxx@nss}
-}
-\def\foreverend{
- \endstr@kt
- \advance\x@nss by-\tempy@nss
- \advance\ydepth@nss by -\tempy@nss
- \tempyy@nss=\ydepth@nss
- \ydepth@nss=-\ydepth@nss
- \advance\ydepth@nss by \y@nss
- \advance\ydepth@nss by \tempy@nss
- \y@nss=\tempyy@nss
- \put(\x@nss,\y@nss){\framebox(\xsize@nss,\ydepth@nss){}}
- \put(\x@nss,\y@nss){\makebox(\xsize@nss,\tempy@nss){\box\TextBox@nss}}
+\def\@forever{%
+ \@forloop@nss{}%
}
+\let\foreverend=\forloopend@nss
\let\dfr\forever
\let\dfrend\foreverend
\def\while{\let\next=\@while\getoption}
diff --git a/Master/texmf-dist/tex/latex/struktex/struktxf.sty b/Master/texmf-dist/tex/latex/struktex/struktxf.sty
index 41d67053e3e..57da9e5c4f6 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-2010 by Jobst Hoffmann. All rights reserved.
+%% Copyright (C) 1989-2017 by Jobst Hoffmann. All rights reserved.
%%
%% IMPORTANT COPYRIGHT NOTICE:
%%
@@ -19,9 +19,9 @@
%% to
%% j.hoffmann_(at)_fh-aachen.de
\NeedsTeXFormat{LaTeX2e}[1999/12/01]{%
- \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {%
+ \def\@git@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {%
\ProvidesPackage{struktxf}[#2/#3/#4 v#7 Fonts for Nassi Shneiderman Charts (Jobst Hoffmann)]}
- \@svn@ $Date: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ %
+ %% git revision information
}
%%
\@ifundefined{nat}{}{\endinput}
diff --git a/Master/texmf-dist/tex/latex/struktex/struktxp.sty b/Master/texmf-dist/tex/latex/struktex/struktxp.sty
index 12ae81da143..1ed31e7da05 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-2010 by Jobst Hoffmann. All rights reserved.
+%% Copyright (C) 1989-2017 by Jobst Hoffmann. All rights reserved.
%%
%% IMPORTANT COPYRIGHT NOTICE:
%%
@@ -19,9 +19,9 @@
%% to
%% j.hoffmann_(at)_fh-aachen.de
\NeedsTeXFormat{LaTeX2e}[1999/12/01]{%
- \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {%
+ \def\@git@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {%
\ProvidesPackage{struktxp}[#2/#3/#4 v#7 Keywords for Nassi Shneiderman Charts (Jobst Hoffmann)]}
- \@svn@ $Date: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ %
+ %% git revision information
}
%%
\RequirePackage{url}