3 files changed, 21 insertions, 13 deletions

diff --git a/default.latex b/default.latex
index b03c4d8..aad9ee3 100644
--- a/default.latex
+++ b/default.latex
@@ -373,7 +373,7 @@ $if(csl-refs)$
 \setlength{\cslhangindent}{1.5em}
 \newlength{\csllabelwidth}
 \setlength{\csllabelwidth}{3em}
-\newenvironment{CSLReferences}[3] % #1 hanging-ident, #2 entry spacing
+\newenvironment{CSLReferences}[2] % #1 hanging-ident, #2 entry spacing
  {% don't indent paragraphs
   \setlength{\parindent}{0pt}
   % turn on hanging indent if param 1 is 1
@@ -387,7 +387,7 @@ $if(csl-refs)$
 \usepackage{calc}
 \newcommand{\CSLBlock}[1]{#1\hfill\break}
 \newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{#1}}
-\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}}
+\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{#1}\break}
 \newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1}
 $endif$
 
diff --git a/default.org b/default.org
index 860342e..a7daef7 100644
--- a/default.org
+++ b/default.org
@@ -1,12 +1,12 @@
 $if(title)$
-#+TITLE: $title$
+#+title: $title$
 
 $endif$
 $if(author)$
-#+AUTHOR: $for(author)$$author$$sep$; $endfor$
+#+author: $for(author)$$author$$sep$; $endfor$
 $endif$
 $if(date)$
-#+DATE: $date$
+#+date: $date$
 
 $endif$
 $for(header-includes)$
diff --git a/default.revealjs b/default.revealjs
index 4f5b110..ff88a44 100644
--- a/default.revealjs
+++ b/default.revealjs
@@ -93,12 +93,12 @@ $if(controlsTutorial)$
 $endif$
 $if(controlsLayout)$
         // Determines where controls appear, "edges" or "bottom-right"
-        controlsLayout: $controlsLayout$,
+        controlsLayout: '$controlsLayout$',
 $endif$
 $if(controlsBackArrows)$
         // Visibility rule for backwards navigation arrows; "faded", "hidden"
         // or "visible"
-        controlsBackArrows: $controlsBackArrows$,
+        controlsBackArrows: '$controlsBackArrows$',
 $endif$
 $if(progress)$
         // Display a presentation progress bar
@@ -108,17 +108,21 @@ $if(slideNumber)$
         // Display the page number of the current slide
         slideNumber: $slideNumber$,
 $endif$
+$if(showSlideNumber)$
+        // 'all', 'print', or 'speaker'
+        showSlideNumber: '$showSlideNumber$',
+$endif$
 $if(hash)$
         // Add the current slide number to the URL hash so that reloading the
         // page/copying the URL will return you to the same slide
         hash: $hash$,
 $endif$
-        // Push each slide change to the browser history
-$if(history)$
-        history: $history$,
-$else$
-        history: true,
+$if(hashOneBasedIndex)$
+        // Start with 1 for the hash rather than 0
+        hashOneBasedIndex: $hashOneBasedIndex$,
 $endif$
+        // Push each slide change to the browser history
+        history: $if(history)$$history$$else$true$endif$,
 $if(keyboard)$
         // Enable keyboard shortcuts for navigation
         keyboard: $keyboard$,
@@ -170,6 +174,10 @@ $if(help)$
         // key is pressed
         help: $help$,
 $endif$
+$if(pause)$
+       // Flags if it should be possible to pause the presentation (blackout)
+       pause: $pause$,
+$endif$
 $if(showNotes)$
         // Flags if speaker notes should be visible to all viewers
         showNotes: $showNotes$,
@@ -317,7 +325,7 @@ $if(zoomKey)$
 $endif$
 $if(display)$
         // The display mode that will be used to show slides
-        display: $display$,
+        display: '$display$',
 $endif$
 $if(mathjax)$
         math: {