talk update

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

8 files changed, 71 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/talk/README b/Master/texmf-dist/doc/latex/talk/README
index 28891b898c0..6c2b4923625 100644
--- a/Master/texmf-dist/doc/latex/talk/README
+++ b/Master/texmf-dist/doc/latex/talk/README
@@ -59,3 +59,10 @@ v. 1.0.1:
 
 - Added commands for changing colours in greybars.sty. Thus renamed greybars
   to sidebars.
+
+v. 1.0.2:
+
+- \title and \author commands now support short versions as optional arguments.
+
+- Problem with the papersize in screen mode under pdflatex fixed.
+
diff --git a/Master/texmf-dist/doc/latex/talk/talkdoc.pdf b/Master/texmf-dist/doc/latex/talk/talkdoc.pdf
index 571564280c0..fda4be1bf2a 100644
--- a/Master/texmf-dist/doc/latex/talk/talkdoc.pdf
+++ b/Master/texmf-dist/doc/latex/talk/talkdoc.pdf
diff --git a/Master/texmf-dist/doc/latex/talk/talkdoc.tex b/Master/texmf-dist/doc/latex/talk/talkdoc.tex
index c65febc0800..4fd0b1aa7b6 100644
--- a/Master/texmf-dist/doc/latex/talk/talkdoc.tex
+++ b/Master/texmf-dist/doc/latex/talk/talkdoc.tex
@@ -255,26 +255,28 @@ where \var{color-command} is one of the commands listed in
 Like the |article| class, \pkg{talk} allows you to specify the title, author
 and date of your talk with the commands
 \begin{quote}
-  |\title{|\var{title}|}|\\
-  |\author{|\var{author}|}|\\
+  |\title[|\var{short-title}|]{|\var{title}|}|\\
+  |\author[|\var{short-author}|]{|\var{author}|}|\\
   |\date{|\var{date}|}|
 \end{quote}
-However, individual style packages may define addtitional commands, that allow
-you to specify additional information like institute, logo, place where the talk
-was given etc.
+In what context the short versions \var{short-title} and \var{short-author} are
+used depends on the style package. The \pkg{sidebars} package displays
+\var{short-title} and \var{short-author} in the side bar.  Other style packages
+may also define addtitional commands, that allow you to specify additional
+information like institute, logo, place where the talk was given etc.
 %
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Environments}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-The \pkg{talk} class defines three environments: |slide|, |multislide| and |notes|.
-All typeset material in your talk should be enclosed in one of these
+The \pkg{talk} class defines three environments: |slide|, |multislide| and
+|notes|.  All typeset material in your talk should be enclosed in one of these
 environments.
 
 \DescribeMacro{slide}
-The |slide| environment is the most important environment in the \pkg{talk} class.
-It allows you to typeset the contents of your slides. Its syntax is:
+The |slide| environment is the most important environment in the \pkg{talk}
+class.  It allows you to typeset the contents of your slides. Its syntax is:
 \begin{quote}
   |\begin{slide}[|\var{style-name}|]{|\var{slide-title}|}|\\
   |  |\txt{(slide body)}\\  |\end{slide}|
@@ -589,7 +591,9 @@ contents:
     the slide number in a |slide| environment and the slide and subslide number
     in a |multislide| environment.
   \item[\ccmd{title}] Title of the presentation.
+  \item[\ccmd{shorttitle}] Short version of the title.
   \item[\ccmd{author}] Author of the presentation.
+  \item[\ccmd{shortauthor}] Short version of the author.
   \item[\ccmd{date}] Date specified with the |\date| command (|\today| by
     default).
   \item[\ccmd{tableofcontents}] Prints the table of contents. See the next
diff --git a/Master/texmf-dist/source/latex/talk/Makefile b/Master/texmf-dist/source/latex/talk/Makefile
new file mode 100644
index 00000000000..170cc77d11a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/talk/Makefile
@@ -0,0 +1,29 @@
+MF=Makefile
+
+INSTALLDIR=${HOME}/tex
+
+SRC=\
+talk.cls \
+sidebars.sty \
+talkdoc.tex
+
+OTHER=\
+README
+
+DOC=\
+talkdoc.pdf
+
+TAR=talk.tar.gz
+
+all: $(DOC)
+
+$(DOC): talkdoc.tex
+	latex talkdoc.tex && latex talkdoc.tex && dvipdf talkdoc.dvi
+
+backup: $(MF) $(SRC) $(DOC) $(OTHER)
+	rm -f $(TAR)
+	tar zcvf $(TAR) $(MF) $(SRC) $(DOC) $(OTHER)
+
+install: talk.cls sidebars.sty
+	cp talk.cls $(INSTALLDIR)/talk.cls
+	cp sidebars.sty $(INSTALLDIR)/sidebars.sty
diff --git a/Master/texmf-dist/tex/latex/talk/sidebars.sty b/Master/texmf-dist/tex/latex/talk/sidebars.sty
index c8b7b07d0e8..6bdd35ecb97 100644
--- a/Master/texmf-dist/tex/latex/talk/sidebars.sty
+++ b/Master/texmf-dist/tex/latex/talk/sidebars.sty
@@ -49,10 +49,10 @@
         \pgfbox[left,top]{%
           \begin{minipage}[t][4.2in]{0.8in}%
             \sffamily\tiny%
-            {\centering\tiny\sffamily\textcolor{sb@sbt}{\@title}\par%
-             \vspace{1em}\@author\par\vspace{2em}}%
+            {\centering\tiny\sffamily\textcolor{sb@sbt}{\@shorttitle}\par%
+             \vspace{1em}\@shortauthor\par\vspace{2em}}%
             {\parskip=0.8em\@tableofcontents}%
-            {\vfill\hspace*{\fill}p.\theslidelabel\hspace*{\fill}}%
+            {\vfill\hspace*{\fill}p. \theslidelabel\hspace*{\fill}}%
           \end{minipage}%
         }%
       }%
@@ -128,9 +128,9 @@
 \renewcommand{\maketitle}{%
   \sffamily%
   {\centering%
-    {\color{sb@sbt}\LARGE\@title}\par\vspace{3em}%
-    {\large\@author}\par\vspace{1.5em}%
-    {\large\@date}\par
+    {\color{sb@sbt}\LARGE\@title\par}\vspace{3em}%
+    {\large\@author\par}\vspace{1.5em}%
+    {\large\@date\par}
   }%
 }
 \renewcommand{\tableofcontents}[1][0.0-99.99]{%
diff --git a/Master/texmf-dist/tex/latex/talk/talk.cls b/Master/texmf-dist/tex/latex/talk/talk.cls
index 794a8d0bae1..1e9831b33e0 100644
--- a/Master/texmf-dist/tex/latex/talk/talk.cls
+++ b/Master/texmf-dist/tex/latex/talk/talk.cls
@@ -12,7 +12,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{talk}[2005/08/09 v1.0.1]
+\ProvidesClass{talk}[2006/07/11 v1.0.2]
 
 \def\pres@dt@notes{notes}
 \def\pres@dt@slides{slides}
@@ -40,7 +40,16 @@
 \RequirePackage{amsmath}
 \RequirePackage{graphicx}
 \RequirePackage{pgf}
-%\RequirePackage{hyperref}
+\RequirePackage{hyperref}
+
+% title and author
+%
+\def\title{\@ifnextchar[{\pres@titleii}{\pres@titlei}}
+\def\pres@titleii[#1]#2{\gdef\@title{#2}\gdef\@shorttitle{#1}}
+\def\pres@titlei#1{\pres@titleii[#1]{#1}}
+\def\author{\@ifnextchar[{\pres@authorii}{\pres@authori}}
+\def\pres@authorii[#1]#2{\gdef\@author{#2}\gdef\@shortauthor{#1}}
+\def\pres@authori#1{\pres@authorii[#1]{#1}}
 
 % collect@body (from amsmath.sty)
 %
diff --git a/Master/texmf-dist/tpm/talk.tpm b/Master/texmf-dist/tpm/talk.tpm
index c0a12d36cf3..03f21c4170a 100644
--- a/Master/texmf-dist/tpm/talk.tpm
+++ b/Master/texmf-dist/tpm/talk.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/talk.zip">
     <TPM:Name>talk</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/09 00:49:07</TPM:Date>
+    <TPM:Date>2006/07/11 14:20:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>karl</TPM:Creator>
     <TPM:Title>The talk package.</TPM:Title>
@@ -11,16 +11,17 @@
     <TPM:Author></TPM:Author>
     <TPM:Size>193886</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="15901">
+    <TPM:RunFiles size="16261">
 texmf-dist/tex/latex/talk/sidebars.sty
 texmf-dist/tex/latex/talk/talk.cls
 texmf-dist/tpm/talk.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="177985">
+    <TPM:DocFiles size="150294">
 texmf-dist/doc/latex/talk/README
 texmf-dist/doc/latex/talk/talkdoc.pdf
 texmf-dist/doc/latex/talk/talkdoc.tex
     </TPM:DocFiles>
+    <TPM:SourceFiles size="439">texmf-dist/source/latex/talk/Makefile</TPM:SourceFiles>
     <TPM:Provides>Package/talk</TPM:Provides>
   </rdf:Description>
 </rdf:RDF>
diff --git a/Master/texmf/lists/talk b/Master/texmf/lists/talk
index 8d13f39bbb1..f698b2c52ff 100644
--- a/Master/texmf/lists/talk
+++ b/Master/texmf/lists/talk
@@ -1,7 +1,7 @@
 texmf-dist/doc/latex/talk/README
 texmf-dist/doc/latex/talk/talkdoc.pdf
 texmf-dist/doc/latex/talk/talkdoc.tex
-
+texmf-dist/source/latex/talk/Makefile
 texmf-dist/tex/latex/talk/sidebars.sty
 texmf-dist/tex/latex/talk/talk.cls
 texmf-dist/tpm/talk.tpm