diff options
-rwxr-xr-x | Build/tools/tpm-ctan-check | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/protocol/protest.dvi | bin | 860 -> 0 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/protocol/protest.tex | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/protocol/protocol.pdf | bin | 0 -> 280089 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/protocol/readme | 28 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/protocol/protocol.dtx | 100 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/protocol/protocol.ins | 53 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/protocol/protocol.cls | 74 | ||||
-rw-r--r-- | Master/texmf-dist/tpm/protocol.tpm | 10 | ||||
-rw-r--r-- | Master/texmf/lists/protocol | 2 |
10 files changed, 165 insertions, 105 deletions
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check index 4c1a626afcb..82d3d71a6df 100755 --- a/Build/tools/tpm-ctan-check +++ b/Build/tools/tpm-ctan-check @@ -64,7 +64,7 @@ my @WorkingTPM = qw( pauldoc pdf-trans pdfcprot pdfpages pdftex-def perception perltex pgf pictex pict2e placeins plari polynom poemscol powerdot - ppr-prv pracjourn preview probsoln psfrag psnfss pstricks + ppr-prv pracjourn preview probsoln protocol psfrag psnfss pstricks pstricks-add pst-3d pst-3dplot pst-barcode pst-blur pst-eucl pst-func pst-labo pst-lens pst-optic pst-osci pst-pdf pst-pdgr pst-slpe diff --git a/Master/texmf-dist/doc/latex/protocol/protest.dvi b/Master/texmf-dist/doc/latex/protocol/protest.dvi Binary files differdeleted file mode 100644 index be62c31757d..00000000000 --- a/Master/texmf-dist/doc/latex/protocol/protest.dvi +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/protocol/protest.tex b/Master/texmf-dist/doc/latex/protocol/protest.tex index 965914f2315..10f75909839 100644 --- a/Master/texmf-dist/doc/latex/protocol/protest.tex +++ b/Master/texmf-dist/doc/latex/protocol/protest.tex @@ -10,6 +10,7 @@ \date{9. Juni 1997} \begintime{9:30} \endtime{10:30} + \nextdate{16. Juni 1997} \nexttime{10.30} \nextplace{wie immer} diff --git a/Master/texmf-dist/doc/latex/protocol/protocol.pdf b/Master/texmf-dist/doc/latex/protocol/protocol.pdf Binary files differnew file mode 100644 index 00000000000..3eedcb543fe --- /dev/null +++ b/Master/texmf-dist/doc/latex/protocol/protocol.pdf diff --git a/Master/texmf-dist/doc/latex/protocol/readme b/Master/texmf-dist/doc/latex/protocol/readme index c1012217b31..cca6d4dde37 100644 --- a/Master/texmf-dist/doc/latex/protocol/readme +++ b/Master/texmf-dist/doc/latex/protocol/readme @@ -10,13 +10,27 @@ License ======= The files in this directory (protocol distribution) are -Copyright 1998 1999 2002 Thomas Leineweber, Univerity of Dortmund, Germany + Copyright (C) 1997 Projektgruppe ACIT, Lehrstuhl VII, + Fachbereich Informatik, Universit"at Dortmund + 1997-1999,2006 Thomas Leineweber (protocol@tleine.de) + + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either version 1.3 + of this license or (at your option) any later version. + The latest version of this license is in + http://www.latex-project.org/lppl.txt + and version 1.3 or later is part of all distributions of LaTeX + version 2005/12/01 or later. + + This work has the LPPL maintenance status `maintained'. + + The Current Maintainer of this work is Thomas Leineweber. + + This work consists of the files protocol.dtx, protocol.ins, + protest.tex, readme + and the derived file protocol.cls. -The files associated with the protocol-package (see below for a list) may be -distributed under the terms of the LaTeX Project Public License, as -described in lppl.txt in the base LaTeX distribution. Either version 1.0 -or, at your option, any later version. ERROR REPORTS ============= @@ -47,7 +61,7 @@ to allow me to find and fix the error soon. If you have an unchanged version of my package method, you can send me error reports to - leineweb@ls6.cs.uni-dortmund.de + protocol@tleine.de Files distributed with this package @@ -68,3 +82,5 @@ Acknowledgements This readme is mostly copied from the readme from the dinbrief package by K.D. Braune and R. Gussmann Boris Majowski made a better implementation for the next meeting +Ludger Humbert and Christoffer Timm showed me an error in the next meeting +logic. diff --git a/Master/texmf-dist/source/latex/protocol/protocol.dtx b/Master/texmf-dist/source/latex/protocol/protocol.dtx index 6dbea8a8c3a..8f1b8a997a8 100644 --- a/Master/texmf-dist/source/latex/protocol/protocol.dtx +++ b/Master/texmf-dist/source/latex/protocol/protocol.dtx @@ -2,14 +2,30 @@ % % Copyright (C) 1997 Projektgruppe ACIT, Lehrstuhl VII, % Fachbereich Informatik, Universit"at Dortmund -% 1997-1999 Thomas Leineweber (leineweb@ls6.cs.uni-dortmund.de) +% 1997-1999,2006 Thomas Leineweber (protocol@tleine.de) % +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. % -% Dies ist der dokumentierte Makrokode zur Erzeugung und Dokumentation +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Thomas Leineweber. +% +% This work consists of the files protocol.dtx and protocol.ins, +% protest.tex, readme +% and the derived file protocol.cls. +% +% +% Dies ist der dokumentierte Makrocode zur Erzeugung und Dokumentation % der LaTeX-Klasse `protocol'. % \fi % -% \CheckSum{278} +% \CheckSum{282} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -43,7 +59,7 @@ % Nenne den Klassennamen und die Version. % \begin{macrocode} %<+protocol>\ProvidesClass{protocol} -%<+protocol> [1998/07/30 v1.7a +%<+protocol> [2006/11/02 v1.9 %<+protocol> LaTeX-Class fuer Sitzungs-Protokolle TL] % \end{macrocode} % @@ -112,20 +128,21 @@ \DeclareOption{titlepage} {\ClassError{protocol}{Option `titlepage' not supported}{}} % \end{macrocode} -% Alle anderen Optionen werden an die Klasse article weitergegeben. -% +% Alle anderen Optionen werden an die Klasse scrartcl weitergegeben. +% \changes{v1.8}{2004/02/05}{Basisklasse article durch scrartcl ersetzt.} % \begin{macrocode} -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessOptions\relax % \end{macrocode} % -% Nun kann die Klasse article geladen werden. +% Nun kann die Klasse scrartcl geladen werden. % \changes{v1.1}{1997/06/09}{\cs{LoadClassWithOptions} durch \cs{LoadClass} % ersetzt. Leider ist im PG-Pool noch eine verdammt alte \LaTeXe-Version. % Die Optionen m"ussen noch angepa"st werden.} % \changes{v1.3}{1997/06/10}{Der Befehl \cs{LoadClass} kann bleiben.} % \begin{macrocode} -\LoadClass{article} +\PassOptionsToClass{halfparskip}{scrartcl} +\LoadClass{scrartcl} % \end{macrocode} % % \section{Layout} @@ -228,7 +245,7 @@ \def\@groupname{\ClassWarning{protocol}{No \noexpand\groupname given}} \def\@chair{\ClassWarning{protocol}{No \noexpand\chair given}} \def\@writer{\ClassWarning{protocol}{No \noexpand\writer given}} -\gdef\@nextdate{\ClassWarning{protocol}{No \noexpand\nextdate given}} +\global\let\@nextdate\@empty \gdef\@nextplace{\ClassWarning{protocol}{No \noexpand\nextplace given}} \gdef\@nexttime{\ClassWarning{protocol}{No \noexpand\nexttime given}} \gdef\@begintime{\ClassWarning{protocol}{No \noexpand\beginn given}} @@ -293,26 +310,27 @@ } % \end{macrocode} % Das Kommando |\@makehead| erzeugt nun den Titel selber. +% \changes{v1.8}{2004/02/04}{Groupname nun in boldface} % \begin{macrocode} \def\@makehead{% - \newpage - \null - \vskip 2em% - \begin{center}% - \let \footnote \thanks - {\LARGE \@groupname \par}% + \clearpage + \let\footnote\thanks + \null + \vskip 2em% + \begin{center}% + {\titlefont\huge \@groupname \par}% \vskip 1.5em% - {\large Protokoll der Sitzung vom \@date}% - \vskip 1em% - {\large + {\Large \lineskip .5em% - Sitzungsleitung: \@chair\\ + Protokoll der Sitzung vom \@date \par}% + \vskip 1em% + {\Large Sitzungsleitung: \@chair\\ Protokollf\"uhrer: \@writer \par}% + \vskip \z@ \@plus 1em \end{center}% \par - \vskip 1.5em - \vskip 0.5cm{\noindent - \begin{tabular}{ll} + \vskip 2em{% + \noindent\begin{tabular}{@{}ll} Beginn: & \@begintime\ Uhr \\ Ende: & \@endtime\ Uhr \\ \end{tabular}\par}\vskip 0.5cm} @@ -321,32 +339,40 @@ % \end{macro} % % \begin{macro}{\@makefoot} -% Das Kommande |\@makefoot| stellt den Abschlu"s f"ur das Protokoll dar. Es +% Das Kommando |\@makefoot| stellt den Abschlu"s f"ur das Protokoll dar. Es % formatiert eine \"Uberschrift und gibt die Daten f"ur die n"achste Sitzung % an. Es wird implizit mit % |\AtEndOfDocument| aufgerufen. % \changes{v1.7a}{2002/04/23}{Wenn keine n\"achste Sitzung vereinbart wurde, schreibe dieses auch (Idee und Implementierung: Boris Majowski)} +% \changes{v1.8}{2004/02/05}{Punkt am Satzende eingef\"ugt.} +% \changes{v1.9}{2006/11/02}{Korrektur von |\@makefoot| nach Hinweisen von L. Humbert und C. Timm} % \begin{macrocode} -\newcommand{\@makefoot}{\ifx\nextdate\empty - \section*{N\"achste Sitzung} Die n\"achste Sitzung - findet am \@nextdate\ um \@nexttime\ Uhr statt. Ort:~\@nextplace. - \else +\newcommand{\@makefoot}{ + \ifx\@nextdate\@empty \section*{N\"achste Sitzung} - Es wurde keine n\"achste Sitzung vereinbart - \fi} + Es wurde keine n\"achste Sitzung vereinbart. + \else + \section*{N\"achste Sitzung} Die n\"achste Sitzung + findet am \@nextdate\ um \@nexttime\ Uhr statt. Ort:~\@nextplace. + \fi + } % \end{macrocode} % \end{macro} % -% \subsection{Die Umgebung Anwesende} +% \subsection{Die Umgebung Persons} % % \begin{environment}{Persons} -% Die Umgebung Anwesende stellt eine "Uberschrift f"ur die Anwesenheitsliste +% \begin{environment}{Absent} +% Die Umgebung Persons stellt eine "Uberschrift f"ur die Anwesenheitsliste % zur Verf"ugung. Daf"ur kann ein beliebiger Text in die Umgebung -% geschrieben werden. +% geschrieben werden. Das gleiche gilt für die Umgebung Absent f"ur eine +% Aufstellung von Abwesenden. % \begin{macrocode} \newenvironment{Persons}{\section*{Anwesenheit:}}{} +\newenvironment{Absent}{\section*{Abwesenheit:}}{} % \end{macrocode} % \end{environment} +% \end{environment} % % \section{Abschlu"sdeklarationen} % @@ -356,14 +382,6 @@ \AtEndDocument{\@makefoot} % \end{macrocode} % -% F"ur eine bessere Lesbarkeit werden die Abs"atze ohne Einzug, aber -% mit einem etwas gr"o"seren Abstand formatiert. -% \begin{macrocode} -\parindent 0ex -\parskip 1.5ex -% \end{macrocode} -% -% % % \Finale % diff --git a/Master/texmf-dist/source/latex/protocol/protocol.ins b/Master/texmf-dist/source/latex/protocol/protocol.ins index c5c93716bd2..cda371d3473 100644 --- a/Master/texmf-dist/source/latex/protocol/protocol.ins +++ b/Master/texmf-dist/source/latex/protocol/protocol.ins @@ -3,18 +3,25 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright (C) 1997-1999 Thomas Leineweber -%% Lehrstuhl VI -%% Fachbereich Informatik -%% Universitaet Dortmund +%% Copyright (C) 1997 Projektgruppe ACIT, Lehrstuhl VII, +%% Fachbereich Informatik, Universit"at Dortmund +%% 1997-1999,2006 Thomas Leineweber (protocol@tleine.de) %% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. %% -%% This file is based upon the standard .ins-Files shipped with the -%% LaTeX-Distribution -%% -%% It may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% The Current Maintainer of this work is Thomas Leineweber. +%% +%% This work consists of the files protocol.dtx and protocol.ins, +%% protest.tex, readme +%% and the derived file protocol.cls. %% %% --------------- start of docstrip commands ------------------ %% @@ -23,17 +30,25 @@ \preamble This is a generated file. -Copyright (C) 1997-1999 Thomas Leineweber, University of Dortmund. - -This file may be distributed under the terms of the LaTeX Project Public -License, as described in lppl.txt in the base LaTeX distribution. -Either version 1.0 or, at your option, any later version. - -For error reports in case of UNCHANGED versions see the readme file. +Copyright (C) 1997 Projektgruppe ACIT, Lehrstuhl VII, + Fachbereich Informatik, Universit"at Dortmund + 1997-1999,2006 Thomas Leineweber (protocol@tleine.de) + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either version 1.3 +of this license or (at your option) any later version. +The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of LaTeX +version 2005/12/01 or later. -Please do not request updates from me directly. Distribution is -done through the Comprehensive TeX Archive Network (CTAN). +This work has the LPPL maintenance status `maintained'. + +The Current Maintainer of this work is Thomas Leineweber. +This work consists of the files protocol.dtx and protocol.ins, +protest.tex, readme +and the derived file protocol.cls. \endpreamble \keepsilent diff --git a/Master/texmf-dist/tex/latex/protocol/protocol.cls b/Master/texmf-dist/tex/latex/protocol/protocol.cls index cc57552d9e5..6faaea5dbf3 100644 --- a/Master/texmf-dist/tex/latex/protocol/protocol.cls +++ b/Master/texmf-dist/tex/latex/protocol/protocol.cls @@ -7,17 +7,25 @@ %% protocol.dtx (with options: `protocol') %% %% This is a generated file. -%% Copyright (C) 1997-1999 Thomas Leineweber, University of Dortmund. +%% Copyright (C) 1997 Projektgruppe ACIT, Lehrstuhl VII, +%% Fachbereich Informatik, Universit"at Dortmund +%% 1997-1999,2006 Thomas Leineweber (protocol@tleine.de) %% -%% This file may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. %% -%% For error reports in case of UNCHANGED versions see the readme file. +%% This work has the LPPL maintenance status `maintained'. %% -%% Please do not request updates from me directly. Distribution is -%% done through the Comprehensive TeX Archive Network (CTAN). +%% The Current Maintainer of this work is Thomas Leineweber. %% +%% This work consists of the files protocol.dtx and protocol.ins, +%% protest.tex, readme +%% and the derived file protocol.cls. %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -35,7 +43,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{protocol} - [1998/07/30 v1.7a + [2006/11/02 v1.9 LaTeX-Class fuer Sitzungs-Protokolle TL] \DeclareOption{a5paper} {\ClassError{protocol}{Option `a5paper' not supported}{}} @@ -45,9 +53,10 @@ {\ClassError{protocol}{Option `twocolumn' not supported}{}} \DeclareOption{titlepage} {\ClassError{protocol}{Option `titlepage' not supported}{}} -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}} \ProcessOptions\relax -\LoadClass{article} +\PassOptionsToClass{halfparskip}{scrartcl} +\LoadClass{scrartcl} \def\groupname#1{\gdef\@groupname{#1}} \def\chair#1{\gdef\@chair{#1}} \def\writer#1{\gdef\@writer{#1}} @@ -59,7 +68,7 @@ \def\@groupname{\ClassWarning{protocol}{No \noexpand\groupname given}} \def\@chair{\ClassWarning{protocol}{No \noexpand\chair given}} \def\@writer{\ClassWarning{protocol}{No \noexpand\writer given}} -\gdef\@nextdate{\ClassWarning{protocol}{No \noexpand\nextdate given}} +\global\let\@nextdate\@empty \gdef\@nextplace{\ClassWarning{protocol}{No \noexpand\nextplace given}} \gdef\@nexttime{\ClassWarning{protocol}{No \noexpand\nexttime given}} \gdef\@begintime{\ClassWarning{protocol}{No \noexpand\beginn given}} @@ -102,39 +111,40 @@ \global\let\@groupname\@empty } \def\@makehead{% - \newpage - \null - \vskip 2em% - \begin{center}% - \let \footnote \thanks - {\LARGE \@groupname \par}% + \clearpage + \let\footnote\thanks + \null + \vskip 2em% + \begin{center}% + {\titlefont\huge \@groupname \par}% \vskip 1.5em% - {\large Protokoll der Sitzung vom \@date}% - \vskip 1em% - {\large + {\Large \lineskip .5em% - Sitzungsleitung: \@chair\\ +Protokoll der Sitzung vom \@date \par}% + \vskip 1em% + {\Large Sitzungsleitung: \@chair\\ Protokollf\"uhrer: \@writer \par}% + \vskip \z@ \@plus 1em \end{center}% \par - \vskip 1.5em - \vskip 0.5cm{\noindent - \begin{tabular}{ll} + \vskip 2em{% + \noindent\begin{tabular}{@{}ll} Beginn: & \@begintime\ Uhr \\ Ende: & \@endtime\ Uhr \\ \end{tabular}\par}\vskip 0.5cm} -\newcommand{\@makefoot}{\ifx\nextdate\empty - \section*{N\"achste Sitzung} Die n\"achste Sitzung - findet am \@nextdate\ um \@nexttime\ Uhr statt. Ort:~\@nextplace. - \else +\newcommand{\@makefoot}{ + \ifx\@nextdate\@empty \section*{N\"achste Sitzung} - Es wurde keine n\"achste Sitzung vereinbart - \fi} + Es wurde keine n\"achste Sitzung vereinbart. + \else + \section*{N\"achste Sitzung} Die n\"achste Sitzung + findet am \@nextdate\ um \@nexttime\ Uhr statt. Ort:~\@nextplace. + \fi + } \newenvironment{Persons}{\section*{Anwesenheit:}}{} +\newenvironment{Absent}{\section*{Abwesenheit:}}{} \AtBeginDocument{\makehead} \AtEndDocument{\@makefoot} -\parindent 0ex -\parskip 1.5ex \endinput %% %% End of file `protocol.cls'. diff --git a/Master/texmf-dist/tpm/protocol.tpm b/Master/texmf-dist/tpm/protocol.tpm index e265d018d4b..766c241759b 100644 --- a/Master/texmf-dist/tpm/protocol.tpm +++ b/Master/texmf-dist/tpm/protocol.tpm @@ -3,7 +3,7 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/protocol.zip"> <TPM:Name>protocol</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/01/21 00:25:32</TPM:Date> + <TPM:Date>2006/11/02 10:36:38</TPM:Date> <TPM:Version></TPM:Version> <TPM:Creator>rahtz</TPM:Creator> <TPM:Title>Typeset meeting protocols.</TPM:Title> @@ -11,16 +11,16 @@ <TPM:Author>Thomas Leineweber</TPM:Author> <TPM:Size>24419</TPM:Size> <TPM:Build/> - <TPM:RunFiles size="6245"> + <TPM:RunFiles size="6658"> texmf-dist/tex/latex/protocol/protocol.cls texmf-dist/tpm/protocol.tpm </TPM:RunFiles> - <TPM:DocFiles size="3392"> -texmf-dist/doc/latex/protocol/protest.dvi + <TPM:DocFiles size="283146"> texmf-dist/doc/latex/protocol/protest.tex +texmf-dist/doc/latex/protocol/protocol.pdf texmf-dist/doc/latex/protocol/readme </TPM:DocFiles> - <TPM:SourceFiles size="14782"> + <TPM:SourceFiles size="16371"> texmf-dist/source/latex/protocol/protocol.dtx texmf-dist/source/latex/protocol/protocol.ins </TPM:SourceFiles> diff --git a/Master/texmf/lists/protocol b/Master/texmf/lists/protocol index 6d233871fe2..cbffad3be6c 100644 --- a/Master/texmf/lists/protocol +++ b/Master/texmf/lists/protocol @@ -1,5 +1,5 @@ -texmf-dist/doc/latex/protocol/protest.dvi texmf-dist/doc/latex/protocol/protest.tex +texmf-dist/doc/latex/protocol/protocol.pdf texmf-dist/doc/latex/protocol/readme texmf-dist/source/latex/protocol/protocol.dtx texmf-dist/source/latex/protocol/protocol.ins |