From 9b04abeb14b00989e5ceeb706bd3ca9f634645a2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 Apr 2012 22:26:23 +0000 Subject: struktex v141 (11apr12) git-svn-id: svn://tug.org/texlive/trunk@25916 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/struktex/THIS_IS_VERSION_v133 | 1 - .../doc/latex/struktex/THIS_IS_VERSION_v141 | 1 + .../texmf-dist/doc/latex/struktex/struktex.de.pdf | Bin 438846 -> 438791 bytes .../texmf-dist/doc/latex/struktex/struktex.en.pdf | Bin 417527 -> 417967 bytes .../texmf-dist/source/latex/struktex/struktex.dtx | 41 +++++++++++++++------ Master/texmf-dist/tex/latex/struktex/strukdoc.sty | 2 +- Master/texmf-dist/tex/latex/struktex/struktex.sty | 3 +- Master/texmf-dist/tex/latex/struktex/struktxf.sty | 2 +- Master/texmf-dist/tex/latex/struktex/struktxp.sty | 2 +- 9 files changed, 35 insertions(+), 17 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v133 create mode 100644 Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v141 (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v133 b/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v133 deleted file mode 100644 index fb4dcfe3210..00000000000 --- a/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v133 +++ /dev/null @@ -1 +0,0 @@ -VERSION v133 of 2010/09/21 diff --git a/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v141 b/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v141 new file mode 100644 index 00000000000..f40845ca8b0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/struktex/THIS_IS_VERSION_v141 @@ -0,0 +1 @@ +VERSION v141 of 2012/04/10 diff --git a/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf b/Master/texmf-dist/doc/latex/struktex/struktex.de.pdf index 14fc8e03a52..d5ae4e46500 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.en.pdf b/Master/texmf-dist/doc/latex/struktex/struktex.en.pdf index a1bd1bbdee0..4476dd4f6b7 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/source/latex/struktex/struktex.dtx b/Master/texmf-dist/source/latex/struktex/struktex.dtx index a709470cc87..d6ebdf5d6a8 100644 --- a/Master/texmf-dist/source/latex/struktex/struktex.dtx +++ b/Master/texmf-dist/source/latex/struktex/struktex.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 1995 - 2010 Jobst Hoffmann, FH Aachen, Campus J"ulich +% Copyright (C) 1995 - 2012 Jobst Hoffmann, FH Aachen, Campus J"ulich % % ------------------------------------------------------------------------------------------- % @@ -17,6 +17,7 @@ % % \fi % +% \changes{v141}{12/04/10}{updated copyright} % \changes{v131}{10/09/21}{some more layout changes} % \changes{v130}{10/09/21}{some changes in the layout of the source, % removed typos} @@ -34,7 +35,7 @@ % \ProvidesPackage{struktxf}[#2/#3/#4 v#7 Fonts for Nassi Shneiderman Charts (Jobst Hoffmann)]} % \ProvidesPackage{struktxp}[#2/#3/#4 v#7 Keywords for Nassi Shneiderman Charts (Jobst Hoffmann)]} % \ProvidesPackage{strukdoc}[#2/#3/#4 v#7 support for reading and writing files verbatim (Jobst Hoffmann)]} -% \@svn@ $Date: 2010-09-21 21:32:08 +0200 (Di, 21 Sep 2010) $$Revision: 133 $ % +% \@svn@ $Date: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ % %} % \fi % \CheckSum{2473} ^^A set to 0 to inactivate the CheckSum @@ -46,7 +47,7 @@ % Kommentar einleitet, wenn diese Datei eingelesen wird. % % Stil-Option `struktex' zum Gebrauch mit LaTeX2e -% Copyright (C) 1995-2010 Jobst Hoffmann, alle Rechte vorbehalten. +% Copyright (C) 1995-2012 Jobst Hoffmann, alle Rechte vorbehalten. % % % Das Kopieren dieser Datei ist nur zul"assig, wenn @@ -300,15 +301,16 @@ % \section{\ifnum\language=\languageNGerman Lizenzvereinbarung\else % License\fi} % -% This package is copyright \copyright{} 1995 -- 2010 by: +% This package is copyright \copyright{} 1995 -- 2012 by: % \begin{quote} % Jobst Hoffmann, c/o University of Applied Sciences Aachen \\ % Aaachen, Germany \\ % E-Mail: j.hoffmann\_(at)\_fh-aachen.de % \end{quote} -% This program can be redistributed and/or modified under the terms of the LaTeX -% Project Public License, distributed from the CTAN archives as file |macros/latex/base/lppl.txt|; -% either version 1 of the License, or (at your option) any later version. +% This program can be redistributed and/or modified under the terms of the LaTeX +% Project Public License, distributed from the CTAN archives as file +% |macros/latex/base/lppl.txt|; either version 1 of the License, or (at +% your option) any later version. % % % \section{\ifnum\language=\languageNGerman Vorwort\else Preface\fi} @@ -787,9 +789,15 @@ % \end{quote} % \fi % +% \changes{v141}{12/04/10}{added description of default values} +% \changes{v141}{12/04/10}{added description of language option} % \ifnum\language=\languageNGerman % Die folgenden Optionen stehen zur Verf"ugung: % \begin{enumerate} +% \item |english|, |ngerman| oder |german|: +% +% Die jeweilige Option legt die Sprache für definierte Werte wie +% |\sTrue| fest, Standardwert ist |english|. % \item |emlines|, |curves| oder |pict2e|: % % Durch Angabe einer der drei Optionen ist es m"oglich, beliebige @@ -803,7 +811,7 @@ % Niepraschk) im Prinzip obsolet, aus Kompatibilit"atsgr"unden wird er % weiter unterst"utzt. Durch die Angabe einer der genannten Option wird % das jeweilige Paket (\textsf{emlines2.sty}, \textsf{curves.sty} bzw. -% \textsf{pict2e.sty}) automatisch geladen. +% \textsf{pict2e.sty}) automatisch geladen, Standardwert ist |pict2e|. % \item |verification|: % % Nur wenn diese Option gesetzt ist, steht \cs{assert} als Kommando zur @@ -818,13 +826,18 @@ % beziehungsweise die endg"ultige Fassung zu kennzeichnen (vgl. % |\sProofOn|/|\sProofOff|). Im Entwurfsmodus werden die vier Eckpunkte % eines Struktogramms in der vom Benutzer vorgegebenen Gr"o"se -% ausgegeben, diese Markierung f"allt in der endg"ultigen Fassung weg. +% ausgegeben, diese Markierung f"allt in der endg"ultigen Fassung +% weg. Der Standardwert ist |final|. % \end{enumerate} % Nach dem Laden der |.sty|-Datei stehen verschiedene Kommandos und Umgebungen % zur Verf"ugung, die das Zeichnen der Struktogramme erm"oglichen.% % \else% % The following options are available: % \begin{enumerate} +% \item |english|, |ngerman| oder |german|: +% +% This option defines the language of defined values as |\sTrue|, +% default: |english|. % \item |emlines|, |curves|, or |pict2e|: % % If you set one of these options, any ascent can be drawn in the @@ -833,7 +846,7 @@ % use |pict2e|; |curves| is included just for compatibility. In all % cases the required packages (\textsf{emline2.sty}, % \textsf{curves.sty}, or \textsf{pict2e} resp.) will be loaded -% automatically. +% automatically; the default value is |pict2e|. % \item |verification|: % % Only if this option is set, the command \cs{assert} is available. @@ -845,7 +858,8 @@ % These options serve as usual to diffentiate between the draft and the % final version of a structured box chart (see |\sProofOn|). While in % the draft mode the user given size of the chart is denoted by the -% four bullets, the final version leaves out these markers. +% four bullets, the final version leaves out these markers; the default +% value is |final|. % \end{enumerate} % After loading the |.sty|-file there are different commands and environments, % which enable the draw of structured box charts. @@ -1341,7 +1355,7 @@ % Ein einfaches Struktogramm wird mit den folgenden Anweisungen erzeugt: % \begin{verbatimwrite}{struktex.tmp} % \sProofOn -% \begin{struktogramm}(70,20)[1.\ Versuch] +% \begin{struktogramm}(70,12)[1.\ Versuch] % \assign{Quadratwurzel von $\pi$ berechnen und ausgeben} % \end{struktogramm} % \sProofOff @@ -4423,8 +4437,11 @@ These are the optional height and the required argument condition" % \else% % Now load additional packages and process the options.% % \fi +% \changes{v141}{12/04/10}{added `ExecuteOptions call for settings default +% values} % \changes{v104}{10/08/15}{corrected `ProcessOptions call} % \begin{macrocode} +\ExecuteOptions{pict2e,english,final} \ProcessOptions*\relax \ifcurves% \RequirePackage{curves} diff --git a/Master/texmf-dist/tex/latex/struktex/strukdoc.sty b/Master/texmf-dist/tex/latex/struktex/strukdoc.sty index 53f17538f69..7eb36f49908 100644 --- a/Master/texmf-dist/tex/latex/struktex/strukdoc.sty +++ b/Master/texmf-dist/tex/latex/struktex/strukdoc.sty @@ -21,7 +21,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01]{% \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-09-21 21:32:08 +0200 (Di, 21 Sep 2010) $$Revision: 133 $ % + \@svn@ $Date: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ % } %% \RequirePackage{ifpdf} diff --git a/Master/texmf-dist/tex/latex/struktex/struktex.sty b/Master/texmf-dist/tex/latex/struktex/struktex.sty index 31b44fa89f3..b50a93eeb97 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktex.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktex.sty @@ -21,7 +21,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01]{% \def\@svn@ $#1Date: #2-#3-#4 #5$$#6Revision: #7$ {% \ProvidesPackage{struktex}[#2/#3/#4 v#7 Nassi Shneiderman Charts (Jobst Hoffmann)]} - \@svn@ $Date: 2010-09-21 21:32:08 +0200 (Di, 21 Sep 2010) $$Revision: 133 $ % + \@svn@ $Date: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ % } %% \RequirePackage{ifthen} @@ -98,6 +98,7 @@ \let\ifdraft@nss\iffalse \let\iffinal@nss\iftrue } +\ExecuteOptions{pict2e,english,final} \ProcessOptions*\relax \ifcurves% \RequirePackage{curves} diff --git a/Master/texmf-dist/tex/latex/struktex/struktxf.sty b/Master/texmf-dist/tex/latex/struktex/struktxf.sty index f5a75484291..41d67053e3e 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktxf.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktxf.sty @@ -21,7 +21,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01]{% \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-09-21 21:32:08 +0200 (Di, 21 Sep 2010) $$Revision: 133 $ % + \@svn@ $Date: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ % } %% \@ifundefined{nat}{}{\endinput} diff --git a/Master/texmf-dist/tex/latex/struktex/struktxp.sty b/Master/texmf-dist/tex/latex/struktex/struktxp.sty index 764ec8cd111..12ae81da143 100644 --- a/Master/texmf-dist/tex/latex/struktex/struktxp.sty +++ b/Master/texmf-dist/tex/latex/struktex/struktxp.sty @@ -21,7 +21,7 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01]{% \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-09-21 21:32:08 +0200 (Di, 21 Sep 2010) $$Revision: 133 $ % + \@svn@ $Date: 2012-04-10 21:57:12 +0200 (Di, 10 Apr 2012) $$Revision: 141 $ % } %% \RequirePackage{url} -- cgit v1.2.3