From 225f7dd4114bc13c17b70595eb8c79aeb3acb1da Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Thu, 31 Dec 2009 01:13:41 +0000 Subject: Got s5 writer working with html template. s5 css and js is included using header-includes variable. We don't need a separate s5 template, so it has been removed. Use linebreak to separate authors in S5 title page. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1705 788f1e2b-df1e-0410-8736-df70ead52e1b --- pandoc.cabal | 2 +- src/Text/Pandoc/Templates.hs | 1 + src/Text/Pandoc/Writers/S5.hs | 4 +- templates/s5.template | 350 ------------------------------------------ 4 files changed, 3 insertions(+), 354 deletions(-) delete mode 100644 templates/s5.template diff --git a/pandoc.cabal b/pandoc.cabal index 5f7cc791e..fc6b26c8e 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -40,7 +40,7 @@ Data-Files: templates/opendocument.template, templates/latex.template, templates/context.template, templates/texinfo.template, templates/man.template, templates/markdown.template, - templates/rst.template, templates/s5.template, + templates/rst.template, templates/mediawiki.template, templates/rtf.template, -- data for ODT writer data/odt/meta.xml, diff --git a/src/Text/Pandoc/Templates.hs b/src/Text/Pandoc/Templates.hs index de2991566..b8c70c569 100644 --- a/src/Text/Pandoc/Templates.hs +++ b/src/Text/Pandoc/Templates.hs @@ -55,6 +55,7 @@ import Text.Pandoc.Shared (readDataFile) -- directory (~/.pandoc on unix) or from the cabal data directory. getDefaultTemplate :: String -> IO (Either E.IOException String) getDefaultTemplate "native" = return $ Right "" +getDefaultTemplate "s5" = getDefaultTemplate "html" getDefaultTemplate "odt" = getDefaultTemplate "opendocument" getDefaultTemplate format = do let format' = takeWhile (/='+') format -- strip off "+lhs" if present diff --git a/src/Text/Pandoc/Writers/S5.hs b/src/Text/Pandoc/Writers/S5.hs index c3acbfe71..e3e9e0024 100644 --- a/src/Text/Pandoc/Writers/S5.hs +++ b/src/Text/Pandoc/Writers/S5.hs @@ -43,8 +43,6 @@ import Text.Pandoc.Definition import Text.XHtml.Strict import System.FilePath ( () ) import Data.List ( intercalate ) -import Prelude hiding (readFile) -import System.IO.UTF8 (readFile) s5HeaderIncludes :: IO String s5HeaderIncludes = do @@ -130,7 +128,7 @@ insertS5Structure (Pandoc (Meta title' authors date) blocks) = let slides = insertSlides True blocks firstSlide = if not (null title') then [slideStart, (Header 1 title'), - (Header 3 (intercalate [Str ",", Space] authors)), + (Header 3 (intercalate [LineBreak] authors)), (Header 4 date), slideEnd] else [] newBlocks = (layoutDiv title' date) ++ presentationStart:firstSlide ++ diff --git a/templates/s5.template b/templates/s5.template deleted file mode 100644 index 19aaa2be9..000000000 --- a/templates/s5.template +++ /dev/null @@ -1,350 +0,0 @@ - -title - - - - - - - -$header-includes$ - -

- - -

- -

title

$authors$

$date$

section oen

one
1. two
  1. three

hi
-

footnote¹

with code
```
code
-
```
↩

- - -- cgit v1.2.3