talk v1.1

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

2 files changed, 96 insertions, 74 deletions

diff --git a/Master/texmf-dist/tex/latex/talk/sidebars.sty b/Master/texmf-dist/tex/latex/talk/sidebars.sty
index 6bdd35ecb97..ecff124bda7 100644
--- a/Master/texmf-dist/tex/latex/talk/sidebars.sty
+++ b/Master/texmf-dist/tex/latex/talk/sidebars.sty
@@ -33,41 +33,40 @@
 \sidebartitlecolor{0,0,0.7}
 
 \@newslidestyle{normal}{%
-  \renewcommand{\@makeslidebackground}{%
-    \color{sb@bg}
-    \pgfrect[fill]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
-    \color{sb@sb}%
-    \pgfrect[fill]{\pgfpoint{5in}\z@}{\pgfpoint{1in}\slideheight}%
-    \@ifscreen{}{%
-      \color{black}%
-      \pgfrect[stroke]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
-    }%
-  }%
-  \renewcommand{\@makeslidecontent}{%
-    \begin{pgfpicture}\z@\z@\z@\z@
-      \pgfputat{\pgfpoint{5.1in}{-0.2in}}{%
-        \pgfbox[left,top]{%
-          \begin{minipage}[t][4.2in]{0.8in}%
-            \sffamily\tiny%
-            {\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}}%
-          \end{minipage}%
-        }%
+  \renewcommand{\@makeslide}{%
+    \begin{pgfscope}
+      \color{sb@bg}
+      \pgfrect[fill]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
+      \color{sb@sb}%
+      \pgfrect[fill]{\pgfpoint{5in}\z@}{\pgfpoint{1in}\slideheight}%
+      \@ifscreen{}{%
+        \color{black}%
+        \pgfrect[stroke]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
       }%
-      \pgfputat{\pgfpoint{0.2in}{-0.2in}}{%
-        \pgfbox[left,top]{%
-          \begin{minipage}[t][4.1in]{4.6in}%
-            \sffamily{\color{sb@title}\LARGE\@slidetitle\par}%
-            \vspace*{1.5em plus 1fill}%
-            \parskip=1.5ex plus0.5ex minus0.5ex\@slidebody\par%
-            \vspace*{0pt plus 1fill}%
-          \end{minipage}%
-        }%
+    \end{pgfscope}
+    %
+    \pgfputat{\pgfpoint{5.1in}{4.3in}}{%
+      \pgfbox[left,top]{%
+        \begin{minipage}[t][4.2in]{0.8in}%
+          \sffamily\tiny%
+          {\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}}%
+        \end{minipage}%
       }%
-    \end{pgfpicture}
-  }
+    }%
+    \pgfputat{\pgfpoint{0.2in}{4.3in}}{%
+      \pgfbox[left,top]{%
+        \begin{minipage}[t][4.1in]{4.6in}%
+          \sffamily{\color{sb@title}\LARGE\@slidetitle\par}%
+          \vspace*{1.5em plus 1fill}%
+          \parskip=1.5ex plus0.5ex minus0.5ex\@slidebody\par%
+          \vspace*{0pt plus 1fill}%
+        \end{minipage}%
+      }%
+    }%
+  }%
   \renewcommand{\@maketocsection}[3]{%
     \raggedright\noindent%
     \@ifcurrentsection{##1}{%
@@ -91,27 +90,31 @@
 
 \@newslidestyle{plain}{%
   \renewcommand{\@makeslidebackground}{%
-    \color{sb@bg}
-    \pgfrect[fill]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
-    \@ifscreen{}{%
-      \color{black}%
-      \pgfrect[stroke]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
-    }%
+    \begin{pgfscope}
+      \color{sb@bg}
+      \pgfrect[fill]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
+      \@ifscreen{}{%
+        \color{black}%
+        \pgfrect[stroke]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
+      }%
+    \end{pgfscope}
   }%
   \renewcommand{\@makeslidecontent}{\vspace*{\fill}\@slidebody\vspace*{\fill}}%
 }
 
 \@newslidestyle{outline}{%
   \renewcommand{\@makeslidebackground}{%
-    \color{sb@bg}
-    \pgfrect[fill]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
-    \color{sb@sb}
-    \pgfrect[fill]{\pgfpoint\z@\z@}{\pgfpoint{0.5in}\slideheight}%
-    \pgfrect[fill]{\pgfpoint{5.5in}\z@}{\pgfpoint{0.5in}\slideheight}%
-    \@ifscreen{}{%
-      \color{black}%
-      \pgfrect[stroke]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
-    }%
+    \begin{pgfscope}
+      \color{sb@bg}
+      \pgfrect[fill]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
+      \color{sb@sb}
+      \pgfrect[fill]{\pgfpoint\z@\z@}{\pgfpoint{0.5in}\slideheight}%
+      \pgfrect[fill]{\pgfpoint{5.5in}\z@}{\pgfpoint{0.5in}\slideheight}%
+      \@ifscreen{}{%
+        \color{black}%
+        \pgfrect[stroke]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}%
+      }%
+    \end{pgfscope}%
   }%
   \renewcommand{\@makeslidecontent}{%
     \vspace{0.2in}%
diff --git a/Master/texmf-dist/tex/latex/talk/talk.cls b/Master/texmf-dist/tex/latex/talk/talk.cls
index 1e9831b33e0..aed90baf644 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}[2006/07/11 v1.0.2]
+\ProvidesClass{talk}[2006/07/11 v1.1]
 
 \def\pres@dt@notes{notes}
 \def\pres@dt@slides{slides}
@@ -83,6 +83,8 @@
 %
 \newlength{\slidewidth}
 \newlength{\slideheight}
+\newlength{\pres@hadjust}
+\newlength{\pres@vadjust}
 \def\pres@currentslidestyle{}
 \def\pres@oldslidestyle{}
 \def\@slidetitle{}
@@ -162,20 +164,20 @@
 \def\pres@defaultslidebackground{%
   \pgfsetlinewidth{0.8pt}
   \color{black}
-  \pgfrect[stroke]{\pgfpoint\z@\z@}{\pgfpoint\slidewidth\slideheight}
+  \pgfrect[stroke]{\pgfpointorigin}{\pgfpoint\slidewidth\slideheight}
 }
 \def\pres@restoredefaults{%
   \gdef\@makeslidecontent{\pres@defaultslide}
   \gdef\@makeslidebackground{\pres@defaultslidebackground}
   \gdef\@makeslide{%
-    \begin{pgfpicture}\z@\z@\z@\z@%
-      \@makeslidebackground%
-    \end{pgfpicture}%
-    \begin{minipage}[b][\slideheight][t]{\slidewidth}%
-      \@makeslidecontent%
-    \end{minipage}%
+    \@makeslidebackground%
+    \pgfputat{\pgfpointorigin}{\pgfbox[left,bottom]{%
+        \begin{minipage}[b][\slideheight][t]{\slidewidth}%
+          \@makeslidecontent%
+        \end{minipage}%
+    }}%
   }
-  \gdef\@makenotesslide{\par\hspace*{\fill}\@makeslide\hspace*{\fill}\par}
+  \gdef\@makenotesslide{\par\hspace*{\fill}\@slidebox\hspace*{\fill}\par}
   \gdef\@maketocsection##1##2##3{}
   \gdef\@maketocsubsection##1##2##3##4{}
 }
@@ -184,25 +186,39 @@
 
 % the slide environment
 %
+\def\@slidebox{%
+  \begin{pgfpicture}
+    \@ifslides{%
+      \pgftransformscale{\pres@slidesmag}%
+      \if@pres@rotate
+        \pgftransformrotate{90}%
+      \fi
+    }{}%
+    \pgfpathrectangle{\pgfpointorigin}{\pgfpoint\slidewidth\slideheight}%
+    \pgfusepath{use as bounding box}%
+    \pgflowlevelsynccm%
+    \@makeslide
+  \end{pgfpicture}%
+}
+
 \@ifnotes{\def\pres@makeslide{\noindent\@makenotesslide}}{}
 \@ifslides{%
   \def\pres@makeslide{%
     \vspace*{\fill}%
+    \vspace{2\pres@vadjust}
     \noindent%
     \hspace*{\fill}%
-    \scalebox{\pres@slidesmag}{%
-      \if@pres@rotate%
-        \rotatebox[origin=c]{90}{\@makeslide}%
-      \else%
-        \@makeslide%
-      \fi%
-    }%
+    \hspace{2\pres@hadjust}
+    \@slidebox%
     \hspace*{\fill}%
     \vspace*{\fill}%
     \newpage%
   }%
 }{}
-\@ifscreen{\def\pres@makeslide{\noindent\@makeslide\newpage}}{}
+\@ifscreen{\def\pres@makeslide{%
+    \noindent\@slidebox%
+    \newpage%
+}}{}
 
 \def\slide{\@ifnextchar[{\@@slide}{\@slide}}
 \long\def\@@slide[#1]#2{%
@@ -308,13 +324,7 @@
       \vspace*{\fill}%
       \noindent%
       \hspace*{\fill}%
-      \scalebox{\pres@slidesmag}{%
-        \if@pres@rotate%
-          \rotatebox[origin=c]{90}{\@makeslide}%
-        \else%
-          \@makeslide%
-        \fi%
-      }%
+      \@slidebox%
       \hspace*{\fill}%
       \vspace*{\fill}%
       \newpage%
@@ -327,8 +337,7 @@
     \def\theslidelabel{\thesubslide}
     \multido{}{\pres@msmax}{%
       \refstepcounter{subslide}
-      \noindent%
-      \@makeslide%
+      \noindent\@slidebox%
       \newpage%
     }%
   }%
@@ -387,6 +396,16 @@
   \@ifslides{\pres@removemargins}{}%
 }
 \def\slidesmag#1{\gdef\pres@slidesmag{#1}}
+\def\slidesadjust#1#2{%
+  \if@pres@rotate
+    \setlength{\pres@hadjust}{#2}%
+    \setlength{\pres@vadjust}{#1}%
+    \setlength{\pres@vadjust}{-\pres@vadjust}%
+  \else
+    \setlength{\pres@hadjust}{#1}%
+    \setlength{\pres@vadjust}{#2}%
+  \fi
+}
 
 \@slidesize{4in}{3in}
 \@ifnotes{}{\pagestyle{empty}}