beamer (27dec12)

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

7 files changed, 37 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
index abdb03a0da6..97b4b764e25 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseframe.sty
@@ -9,7 +9,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseframe.sty,v dcd846607320 2012/09/13 20:41:01 joseph $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseframe.sty,v 1443917db2cf 2012/12/26 20:56:22 joseph $
 
 \mode
 <presentation>
@@ -111,7 +111,8 @@
       \beamer@initfirstlineunskip%
       \ifbeamer@plainframe\nointerlineskip\fi%
     \beamer@checkframetitle}%
-    {\end{beamer@framepauses}%
+    {\par
+    \end{beamer@framepauses}%
   \egroup%
   \ifx\beamer@frametitle\@empty%
     \setbox\beamer@frametitlebox=\box\voidb@x%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty
index 61a94aaaaf0..3815495ac26 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasenotes.sty
@@ -8,7 +8,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasenotes.sty,v efa082c6111d 2010/05/01 11:27:03 rivanvx $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasenotes.sty,v 1686da3db3c9 2012/12/19 12:35:18 nicolas $
 
 \mode
 <presentation>
@@ -138,7 +138,8 @@
 
 \def\beamer@framenotesend
 {% at end of slide
-  \global\setbox\beamer@frameboxcopy=\copy\beamer@framebox%
+  \global\setbox\beamer@frameboxcopy
+    =\hbox{\leaders\copy\beamer@framebox\hskip\wd\beamer@framebox}
   \ifx\beamer@noteitems\@empty%
     \ifx\beamer@notes\@empty%
       % possibly suppress this slide
@@ -196,10 +197,10 @@
 \newcommand{\insertslideintonotes}[1]{{%
   \begin{pgfpicture}{0cm}{0cm}{#1\paperwidth}{#1\paperheight}
     \begin{pgflowlevelscope}{\pgftransformscale{#1}}%
-      \color[gray]{0.8}
+      \color{normal text.bg}
       \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\paperwidth}{\paperheight}}
       \pgfusepath{fill}
-      \color{black}
+      \color{normal text.fg}
       {\pgftransformshift{\pgfpoint{\beamer@origlmargin}{\footheight}}\pgftext[left,bottom]{\copy\beamer@frameboxcopy}}
     \end{pgflowlevelscope}
   \end{pgfpicture}%
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty
index 62ac5863c29..72207d061b6 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty
@@ -10,7 +10,7 @@
 % See the file doc/licenses/LICENSE for more details.
 
 % Define beamer version
-\def\beamer@version{3.24}
+\def\beamer@version{3.25}
 
 
 % Get date and version from RCS Ids
@@ -37,4 +37,4 @@
   \ProvidesClass{\beamer@rcsfile}[\beamer@rcsdate\space#2\space (rcs-revision \beamer@rcsrevision)]
 }
 
-\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v cb16a617839f 2012/11/13 20:38:40 joseph $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v 8b90150cac88 2012/12/26 22:12:18 joseph $
diff --git a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty
index 0396eef0a70..2ff1a44433d 100644
--- a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty
@@ -7,7 +7,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/color/beamercolorthemedefault.sty,v d02a7cf4d8ae 2010/06/17 09:11:41 rivanvx $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/color/beamercolorthemedefault.sty,v 1686da3db3c9 2012/12/19 12:35:18 nicolas $
 
 
 \mode<presentation>
@@ -174,5 +174,9 @@
 
 \setbeamercolor{qed symbol}{parent=structure}
 
+\setbeamercolor{note page}{bg=white!90!black, fg=black}
+\setbeamercolor{note title}{bg=white!80!black, fg=black}
+\setbeamercolor{note date}{parent=note title}
+
 \mode
 <all>
diff --git a/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty
index 8e788f90a64..0f98cf85846 100644
--- a/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty
@@ -7,7 +7,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/font/beamerfontthemedefault.sty,v d02a7cf4d8ae 2010/06/17 09:11:41 rivanvx $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/font/beamerfontthemedefault.sty,v 1686da3db3c9 2012/12/19 12:35:18 nicolas $
 
 
 \mode<presentation>
@@ -118,6 +118,8 @@
 \setbeamerfont{quote}{parent=quotation}
 
 \setbeamerfont{note page}{size=\small}
+\setbeamerfont{note title}{parent=note page}
+\setbeamerfont{note date}{size=\footnotesize}
 
 \mode
 <all>
diff --git a/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemedefault.sty
index 3b0227974d2..fa19b36f719 100644
--- a/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemedefault.sty
+++ b/Master/texmf-dist/tex/latex/beamer/themes/outer/beamerouterthemedefault.sty
@@ -7,7 +7,7 @@
 %
 % See the file doc/licenses/LICENSE for more details.
 
-\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/outer/beamerouterthemedefault.sty,v 5ed0f4010e8a 2012/10/02 06:08:21 joseph $
+\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/outer/beamerouterthemedefault.sty,v 1686da3db3c9 2012/12/19 12:35:18 nicolas $
 
 
 \mode<presentation>
@@ -185,9 +185,12 @@
 {%
   {%
     \scriptsize
-    \insertvrule{.25\paperheight}{white!90!black}
-    \vskip-.25\paperheight
-    \nointerlineskip
+    \usebeamerfont{note title}\usebeamercolor[fg]{note title}%
+    \ifbeamercolorempty[bg]{note title}{}{%
+      \insertvrule{.25\paperheight}{note title.bg}%
+      \vskip-.25\paperheight%
+      \nointerlineskip%
+    }%
     \vbox{
       \hfill\insertslideintonotes{0.25}\hskip-\Gm@rmargin\hskip0pt%
       \vskip-0.25\paperheight%
@@ -195,7 +198,7 @@
       \begin{pgfpicture}{0cm}{0cm}{0cm}{0cm}
         \begin{pgflowlevelscope}{\pgftransformrotate{90}}
           {\pgftransformshift{\pgfpoint{-2cm}{0.2cm}}%
-          \pgftext[base,left]{\footnotesize\the\year-\ifnum\month<10\relax0\fi\the\month-\ifnum\day<10\relax0\fi\the\day}}
+          \pgftext[base,left]{\usebeamerfont{note date}\usebeamercolor[fg]{note date}\the\year-\ifnum\month<10\relax0\fi\the\month-\ifnum\day<10\relax0\fi\the\day}}
         \end{pgflowlevelscope}
       \end{pgfpicture}}
     \nointerlineskip
@@ -218,6 +221,11 @@
       }%
       \vfil}%
   }%
+  \ifbeamercolorempty[bg]{note page}{}{%
+    \nointerlineskip%
+    \insertvrule{.75\paperheight}{note page.bg}%
+    \vskip-.75\paperheight%
+  }%
   \vskip.25em
   \nointerlineskip
   \insertnote
diff --git a/Master/texmf-dist/tex/latex/beamer/translator/translator.sty b/Master/texmf-dist/tex/latex/beamer/translator/translator.sty
index 7a74a1a8d2b..0c97c80240e 100644
--- a/Master/texmf-dist/tex/latex/beamer/translator/translator.sty
+++ b/Master/texmf-dist/tex/latex/beamer/translator/translator.sty
@@ -34,10 +34,11 @@
 \newcommand\iftranslationdefined[4][]{%
   \def\trans@to{\trans@defaultto}%
   \setkeys{translator}{#1}%
-  \expandafter\ifx\csname tr@@@\trans@to @#2\endcsname\@undefined%
-    \let\trans@next=\@firstoftwo%
-  \else%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname tr@@@\trans@to @#2\endcsname\relax%
     \let\trans@next=\@secondoftwo%
+  \else%
+    \let\trans@next=\@firstoftwo%
   \fi%
   \trans@next{#3}{#4}%
 }
@@ -50,7 +51,7 @@
 
 \newcommand\newtranslation[3][]{%
   \iftranslationdefined[#1]{#2}{%
-    \PackageError{translator}{Translation of ``#2'' already defined.}{}%
+    \PackageError{translator}{Translation of '#2' already defined}{}%
   }%
   {%
     \deftranslation[#1]{#2}{#3}%
@@ -62,7 +63,7 @@
     \deftranslation[#1]{#2}{#3}%
   }%
   {%
-    \PackageError{translator}{Translation of ``#2'' not defined.}{}%
+    \PackageError{translator}{Translation of '#2' not defined}{}%
   }%
 }