aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2013-12-13 21:41:43 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2013-12-13 21:41:43 -0800
commit50ca8c85d9abfb7918cb78015bcc6d6fec02ce75 (patch)
tree210d6e87ed9cdee594086881756f78178ee5af04
parentdd1d6374208359e2e2b4e2da2aafced917a172c9 (diff)
parentc1f20a285a3ef1a0ba9b342b31856e0045f305c8 (diff)
downloadpandoc-50ca8c85d9abfb7918cb78015bcc6d6fec02ce75.tar.gz
Merge pull request #49 from lionandoil/master
Fixing default.beamer includegraphics redefinition to allow custom options
-rw-r--r--default.beamer5
1 files changed, 4 insertions, 1 deletions
diff --git a/default.beamer b/default.beamer
index 4aaf50959..d57e19711 100644
--- a/default.beamer
+++ b/default.beamer
@@ -70,7 +70,10 @@ $if(graphics)$
}
\makeatother
\let\Oldincludegraphics\includegraphics
-\renewcommand{\includegraphics}[2][]{\Oldincludegraphics[width=\ScaleIfNeeded]{#2}}
+{%
+ \catcode`\@=11\relax%
+ \gdef\includegraphics{\@ifnextchar[{\Oldincludegraphics}{\Oldincludegraphics[width=\ScaleIfNeeded]}}%
+}%
$endif$
% Comment these out if you don't want a slide with just the