aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-07-01 15:13:19 -0700
committerGitHub <noreply@github.com>2016-07-01 15:13:19 -0700
commit019d6a2bd84ad75dcf9d629561c87794a2f39656 (patch)
tree438e6df5325a5401e3ec2d3b40c7dd9fa41e5ead
parentba3a8f742371f9e9f04100d0e61638cf65fd6ceb (diff)
parent922f5c0bc6a8bc279464757c2a65898b178e976d (diff)
downloadpandoc-019d6a2bd84ad75dcf9d629561c87794a2f39656.tar.gz
Merge pull request #203 from twsh/master
Pass $biblatexoptions$ directly to biblatex
-rw-r--r--default.beamer3
-rw-r--r--default.latex3
2 files changed, 2 insertions, 4 deletions
diff --git a/default.beamer b/default.beamer
index ccd0862d1..191903c95 100644
--- a/default.beamer
+++ b/default.beamer
@@ -89,8 +89,7 @@ $if(natbib)$
\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
$endif$
$if(biblatex)$
-\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex}
-$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$
+\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex}
$for(bibliography)$
\addbibresource{$bibliography$}
$endfor$
diff --git a/default.latex b/default.latex
index 3d31a5731..4b371e12d 100644
--- a/default.latex
+++ b/default.latex
@@ -100,8 +100,7 @@ $if(natbib)$
\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$}
$endif$
$if(biblatex)$
-\usepackage$if(biblio-style)$[style=$biblio-style$]$endif${biblatex}
-$if(biblatexoptions)$\ExecuteBibliographyOptions{$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$}$endif$
+\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex}
$for(bibliography)$
\addbibresource{$bibliography$}
$endfor$