From 6eb6a9901333b5a9018c576ba425c6740a1309d2 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Tue, 29 Nov 2011 13:31:12 -0800
Subject: Use separate variables for meta-date, meta-author.

This makes footnotes work in author and date fields.
Closes #301.
---
 src/Text/Pandoc/Writers/HTML.hs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/Text/Pandoc')

diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index ab164619d..e1e413641 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -160,16 +160,16 @@ inTemplate :: TemplateTarget a
            -> [(String,String)]
            -> a
 inTemplate opts tit auths date toc body' newvars =
-  let renderedTit = showHtmlFragment tit
-      topTitle'   = stripTags renderedTit
-      authors     = map (stripTags . showHtmlFragment) auths
-      date'       = stripTags $ showHtmlFragment date
+  let title'      = dropWhile (=='\n') $ showHtmlFragment tit
+      authors     = map showHtmlFragment auths
+      date'       = showHtmlFragment date
       variables   = writerVariables opts ++ newvars
       context     = variables ++
                     [ ("body", dropWhile (=='\n') $ showHtmlFragment body')
-                    , ("pagetitle", topTitle')
-                    , ("title", dropWhile (=='\n') $ showHtmlFragment tit)
+                    , ("pagetitle", stripTags title')
+                    , ("title", title')
                     , ("date", date')
+                    , ("date-meta", stripTags date')
                     , ("idprefix", writerIdentifierPrefix opts)
                     , ("slidy-url", "http://www.w3.org/Talks/Tools/Slidy2")
                     , ("s5-url", "s5/default") ] ++
@@ -177,7 +177,8 @@ inTemplate opts tit auths date toc body' newvars =
                     (case toc of
                          Just t  -> [ ("toc", showHtmlFragment t)]
                          Nothing -> [])  ++
-                    [ ("author", a) | a <- authors ]
+                    [ ("author", a) | a <- authors ] ++
+                    [ ("author-meta", stripTags a) | a <- authors ]
   in  renderTemplate context $ writerTemplate opts
 
 -- | Like Text.XHtml's identifier, but adds the writerIdentifierPrefix
-- 
cgit v1.2.3