Commits

Joseph Wright  committed 590a94c

Use enumerate package in article mode
Remove overlay specs from itemize and enumerate in article mode
See bugs #68 and #69 for dicussion of this

  • Participants
  • Parent commits 8bf396c

Comments (0)

Files changed (1)

File base/beamerbaselocalstructure.sty

 \ProvidesPackageRCS $Header$
 
 \mode
-<presentation>
+<all>
 
 \RequirePackage{enumerate}
 
+\mode
+<presentation>
 
 %
 %
 \mode
 <article>
 {
-  \AtBeginDocument{
-    \let\beamer@origenumerate=\enumerate
-    \renewcommand*\enumerate{\beamer@origenumerate}
+  \AtBeginDocument{ % Remove any overlay specification
+    \let\beamer@@@enum@\@@enum@
+    \def\@@enum@[{%
+      \@ifnextchar<%
+        {\beamer@@@num@@}
+        {\beamer@@@enum@[}%
+    }
+    \def\beamer@@@num@@<#1>]{%
+      \@ifnextchar[%
+        {\beamer@@@enum@}
+        {\@enum@}%
+    }
+    %\let\beamer@origenumerate=\enumerate
+    %\renewcommand*\enumerate{\beamer@origenumerate}
   }
 }
 
 {
   \AtBeginDocument{
     \let\beamer@origitemize=\itemize
-    \renewcommand*\itemize{\beamer@origitemize}
+    \def\itemize{%
+      \@ifnextchar[{\beamer@itemize@}{\beamer@origitemize}%
+    }
+    \def\beamer@itemize@[{%
+      \@ifnextchar<{\beamer@itemize@@}{\beamer@origitemize[}%
+    }
+    \def\beamer@itemize@@<#1>]{\beamer@origitemize}
   }
 }
 
         \usebeamertemplate{bibliography entry note}}}}%
   \leavevmode\setbox\beamer@tempbox=\hbox{}\ht\beamer@tempbox=1.5em\box\beamer@tempbox}
 
-\AtBeginDocument{
-  \@ifpackageloaded{biblatex}
-    {
-      \apptocmd\blx@env@bibliography{\let\makelabel\beamer@biblabeltemplate}{}{}
-      \pretocmd{\abx@macro@author}{\usebeamercolor[fg]{bibliography entry author}}{}{}
-      \pretocmd{\abx@macro@editor}{\usebeamercolor[fg]{bibliography entry author}}{}{}
-      \pretocmd{\abx@macro@title}{\blx@unitpunct\blx@postpunct\newblock\usebeamercolor[fg]{bibliography entry title}}{}{}
-      \apptocmd{\abx@macro@title}{\blx@unitpunct\blx@postpunct\newblock\usebeamercolor[fg]{bibliography entry note}}{}{}
-    }
-    {}
-}
+
 
 \mode
 <article>