From 1be13d57dc8357576a8285c6dadc03db9e3ed7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= <sdelafond@gmail.com>
Date: Tue, 25 Aug 2015 12:27:35 +0200
Subject: Imported Upstream version 8.3.1

---
 contrib/lisp/ox-s5.el | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'contrib/lisp/ox-s5.el')

diff --git a/contrib/lisp/ox-s5.el b/contrib/lisp/ox-s5.el
index 26e83a3..503bfd0 100644
--- a/contrib/lisp/ox-s5.el
+++ b/contrib/lisp/ox-s5.el
@@ -48,7 +48,14 @@
 ;; in an Org mode buffer.  See ox.el and ox-html.el for more details
 ;; on how this exporter works.
 
+;; TODOs
+;; ------
+;; The title page is formatted using format-spec.  This is error prone
+;; when details are missing and may insert empty tags, like <h2></h2>,
+;; for missing values.
+
 (require 'ox-html)
+(eval-when-compile (require 'cl))
 
 (org-export-define-derived-backend 's5 'html
   :menu-entry
@@ -173,6 +180,7 @@ or an empty string."
 
 (defcustom org-s5-title-slide-template
   "<h1>%t</h1>
+<h2>%s</h2>
 <h2>%a</h2>
 <h3>%e</h3>
 <h4>%d</h4>"
@@ -201,7 +209,7 @@ INFO is a plist used as a communication channel."
     (concat section-number
             (org-export-data
              (org-export-get-alt-title headline info) info)
-            (and tags "&nbsp;&nbsp;&nbsp;") (org-html--tags tags))))
+            (and tags "&nbsp;&nbsp;&nbsp;") (org-html--tags tags info))))
 
 (defun org-s5-toc (depth info)
   (let* ((headlines (org-export-collect-headlines info depth))
-- 
cgit v1.2.3