Commits

Anonymous committed 712849f

*** empty log message ***

Comments (0)

Files changed (6)

 	  environments.
 	- Fixed superfluous \show in beamerthemeshadow.sty
 	- Fixed color problem in beamer boxes with rounded corners.
+	- Fixed problem with frametitle syntax in fragile frames.
+	- Fixed missing frame subtitles in article mode.
 	
 2005-06-16 Till Tantau <tantau@users.sourceforge.net>
 

base/beamerbasearticle.sty

 % Default article templates:
 \defbeamertemplate<article>*{frame begin}{default}{}
 \defbeamertemplate<article>*{frame end}{default}{}
+\defbeamertemplate<article>*{frametitle}{default}{\paragraph*{\insertframetitle\  \insertframesubtitle}\ \par}
 \defbeamertemplate<article>*{alerted text begin}{default}{\ifmmode\else\begin{itshape}\fi}
 \defbeamertemplate<article>*{alerted text end}{default}{\ifmmode\else\end{itshape}\fi}
 \defbeamertemplate<article>*{structure begin}{default}{\ifmmode\else\begin{bfseries}\fi}

base/beamerbasecompatibility.sty

 
 \def\usetitlepagetemplate{\setbeamertemplate{title page}}
 \def\usepartpagetemplate{\setbeamertemplate{part page}}
-\def\useframetitletemplate{\setbeamertemplate{frametitle}}
+\mode
+<all>
+{\def\useframetitletemplate{\setbeamertemplate{frametitle}}}
 \def\useitemizeitemtemplate{\setbeamertemplate{itemize item}}
 \def\usesubitemizeitemtemplate{\setbeamertemplate{itemize subitem}}
 \def\usesubsubitemizeitemtemplate{\setbeamertemplate{itemize subsubitem}}

base/beamerbaseframe.sty

 {
   \def\beamer@checkframetitle{\@ifnextchar\bgroup\beamer@inlineframetitle{}}
   \def\beamer@inlineframetitle#1{%
-    \frametitle{#1}%
-    \@ifnextchar\bgroup{\beamer@inlineframesubtitle}{}%
-  }
-  \def\beamer@inlineframesubtitle#1{%
-    \framesubtitle{#1}%
+    \@ifnextchar\bgroup{\frametitle{#1}\framesubtitle}{\frametitle{#1}\relax}%
   }
 }
 
   \edef\beamer@verbfilename{\jobname\ifx\beamer@againname\@empty\else.\insertframenumber\fi.vrb}% .vrb for `verbatim'
   \beamer@setupstoppers{\beamer@frameenvironmentsubst}%
   \immediate\openout\beamer@verbatimfileout=\beamer@verbfilename%
-  \expandafter\beamer@verbatimreadframe\@gobble}
+  \expandafter\beamer@checktitleverbatim\@gobble}
+\def\beamer@checktitleverbatim{\@ifnextchar\bgroup{\beamer@verbatim@frametitle}{\beamer@verbatimreadframe}}
+\def\beamer@verbatim@frametitle#1{\@ifnextchar\bgroup{\beamer@verbatim@framesubtitle{#1}}{\beamer@verbatimreadframe\frametitle{#1}}}
+\def\beamer@verbatim@framesubtitle#1#2{\beamer@verbatimreadframe\frametitle{#1}\framesubtitle{#2}}
 % will return to following command with frame contents written to \beamer@verbfilename
 \def\beamer@afterexternalframe{%
   \ifx\beamer@frameenvironmentsubst\beamer@frametext%
   \def\frame{\@ifnextchar<\beamer@frame{\beamer@frame<*>}}
   \def\beamer@frame<#1>{\@ifnextchar[{\beamer@@frame<#1>}{\beamer@@frame<#1>[]}}
   \long\def\beamer@@frame<#1>[#2]{%
+    \global\let\insertframetitle=\@empty%
+    \global\let\insertframesubtitle=\@empty%
     \beamer@slideinframe=1\relax%
     \refstepcounter{framenumber}%
     \beamer@slideinframe=0\relax%

base/beamerbaselocalstructure.sty

 \mode
 <all>
 {
-  \newcommand<>\framesubtitle[1]{\only#2{\beamer@ifempty{#1}{}{\gdef\insertframesubtitle{{#1}}}}}
+  \let\beamer@aftersubtitle=\relax
+  \newcommand<>\framesubtitle[1]{\only#2{\beamer@ifempty{#1}{}{\gdef\insertframesubtitle{{#1}}\beamer@aftersubtitle}}}
 }
 
 
 \mode
 <article>
 {
-  \newcommand<>\frametitle[2][]{\only#3{\gdef\insertframetitle{#2}\beamer@headrenderer}}
-  \long\def\useframetitletemplate#1{\def\beamer@headrenderer{#1}}
-  \useframetitletemplate{\paragraph*{\insertframetitle}\ \par}
+  \newcommand<>\frametitle[2][]{\only#3{\gdef\insertframetitle{#2}%
+      \@ifnextchar\framesubtitle{\beamer@donextsubtitle}{\usebeamertemplate{frametitle}}}}
+  \def\beamer@donextsubtitle{%
+    % Ugly hack...
+    \def\beamer@aftersubtitle{\usebeamertemplate{frametitle}\let\beamer@aftersubtitle=\relax}
+    }
 }
 
 

base/beamerbaseverbatim.sty

     \catcode\count@=11%
   }%
   \beamer@makeinnocent\^^L% and whatever other special cases
-  \endlinechar`\^^M \catcode`\^^M=12 \beamer@processframefirstline}
+  \endlinechar`\^^M \catcode`\^^M=12%
+  \@ifnextchar\bgroup{\afterassignment\beamer@specialprocessframefirstline\let\beamer@temp=}{\beamer@processframefirstline}}%
+
+{
+  \catcode`\{=12%
+  \catcode`\<=1%
+  \gdef\beamer@specialprocessframefirstline<%
+    \beamer@processframefirstline{%
+  }
+}
 
 {\catcode`\^^M=12\endlinechar=-1%
   \long\gdef\beamer@processframefirstline#1^^M{%