protocol update (21apr10), + texinfo.tex

git-svn-id: svn://tug.org/texlive/trunk@17962 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 24 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/latex/protocol/protocol.cls b/Master/texmf-dist/tex/latex/protocol/protocol.cls
index 896f9566379..9f8c8d03858 100644
--- a/Master/texmf-dist/tex/latex/protocol/protocol.cls
+++ b/Master/texmf-dist/tex/latex/protocol/protocol.cls
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% Copyright (C) 1997 Projektgruppe ACIT, Lehrstuhl VII,
 %%                    Fachbereich Informatik, Universit"at Dortmund
-%%               1997-1999,2006,2009 Thomas Leineweber (protocol@tleine.de)
+%%               1997-1999,2006,2009-2010 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
@@ -43,7 +43,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{protocol}
-              [2009/04/24 v1.10
+              [2010/04/21 v1.11
                LaTeX-Class fuer Sitzungs-Protokolle TL]
 \DeclareOption{a5paper}
      {\ClassError{protocol}{Option `a5paper' not supported}{}}
@@ -55,6 +55,9 @@
      {\ClassError{protocol}{Option `titlepage' not supported}{}}
 \DeclareOption{nonext}
      {\AtBeginDocument{\let\@makefoot\relax}}
+\DeclareOption{signatures}
+     {\AtBeginDocument{\AtEndDocument{\protocol@signatures}}}
+
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
 \ProcessOptions\relax
 \PassOptionsToClass{halfparskip}{scrartcl}
@@ -62,6 +65,7 @@
 \def\groupname#1{\gdef\@groupname{#1}\gdef\ProtocolGroupName{#1}}
 \def\chair#1{\gdef\@chair{#1}}
 \def\writer#1{\gdef\@writer{#1}}
+\def\place#1{\gdef\protocol@place{#1}}
 \def\begintime#1{\gdef\@begintime{#1}}
 \def\endtime#1{\gdef\@endtime{#1}}
 \def\nextdate#1{\gdef\@nextdate{#1}}
@@ -70,6 +74,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}}
+\global\let\protocol@place\@empty
 \global\let\@nextdate\@empty
 \gdef\@nextplace{\ClassWarning{protocol}{No \noexpand\nextplace given}}
 \gdef\@nexttime{\ClassWarning{protocol}{No \noexpand\nexttime given}}
@@ -102,9 +107,11 @@
   \global\let\makehead\relax
   \global\let\@makehead\relax
   \global\let\chairman\relax
-  \global\let\@chair\@empty
+  %\global\let\@chair\@empty
   \global\let\writer\relax
-  \global\let\@writer\@empty
+  %\global\let\@writer\@empty
+  \global\let\place\relax
+  \global\let\protocol@place\@empty
   \global\let\begintime\relax
   \global\let\@begintime\@empty
   \global\let\endtime\relax
@@ -130,10 +137,18 @@ Protokoll der Sitzung vom \@date \par}%
   \end{center}%
   \par
   \vskip 2em{%
+    \ifx\protocol@place\@empty
     \noindent\begin{tabular}{@{}ll}
       Beginn: & \@begintime\ Uhr \\
       Ende: &   \@endtime\ Uhr \\
-    \end{tabular}\par}\vskip 0.5cm}
+    \end{tabular}
+    \else
+    \noindent\begin{tabular}{@{}ll}
+      Beginn: & \@begintime\ Uhr \\
+      Ende: &   \@endtime\ Uhr \\
+      Ort: & \protocol@place \\
+    \end{tabular}
+    \fi\par}\vskip 0.5cm}
 \newcommand{\@makefoot}{
     \ifx\@nextdate\@empty
       \section*{N\"achste Sitzung}
@@ -143,6 +158,10 @@ Protokoll der Sitzung vom \@date \par}%
        findet am \@nextdate\ um \@nexttime\ Uhr statt. Ort:~\@nextplace.
     \fi
     }
+\newcommand{\protocol@signatures}{\vspace{20mm}\par\noindent\hrulefill\hrulefill\hfill\hrulefill\hrulefill\\
+   \@chair\hfill\@writer\\
+   (Sitzungsleitung)\hfill{}(Protokoll)\\[-1cm]\mbox{}}
+
 \newenvironment{Persons}{\section*{Anwesenheit:}}{}
 \newenvironment{Absent}{\section*{Abwesenheit:}}{}
 \AtBeginDocument{\makehead}