From da52412455707656e7738d110c32be2decee2dcd Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 22 Jul 2010 22:23:30 -0700 Subject: Extended --offline to s5. S5 default is now to include links, rather than a full copy of scripts and stylesheets. --- src/Text/Pandoc/Writers/S5.hs | 1 + src/pandoc.hs | 5 +- tests/s5.basic.html | 265 ++---------------------------------------- tests/s5.fancy.html | 265 ++---------------------------------------- 4 files changed, 19 insertions(+), 517 deletions(-) diff --git a/src/Text/Pandoc/Writers/S5.hs b/src/Text/Pandoc/Writers/S5.hs index 3723626c2..d2dab07a3 100644 --- a/src/Text/Pandoc/Writers/S5.hs +++ b/src/Text/Pandoc/Writers/S5.hs @@ -31,6 +31,7 @@ Definitions for creation of S5 powerpoint-like HTML. module Text.Pandoc.Writers.S5 ( -- * Header includes s5HeaderIncludes, + s5Meta, s5Links, -- * Functions writeS5, diff --git a/src/pandoc.hs b/src/pandoc.hs index cb1756ffb..b7ff42803 100644 --- a/src/pandoc.hs +++ b/src/pandoc.hs @@ -30,7 +30,7 @@ writers. -} module Main where import Text.Pandoc -import Text.Pandoc.Writers.S5 (s5HeaderIncludes) +import Text.Pandoc.Writers.S5 (s5HeaderIncludes, s5Links, s5Meta) import Text.Pandoc.Shared ( tabFilter, ObfuscationMethod (..), readDataFile, headerShift ) #ifdef _HIGHLIGHTING @@ -747,6 +747,9 @@ main = do ("s5", True, True) -> do inc <- s5HeaderIncludes datadir return $ ("header-includes", inc) : variables + ("s5", True, False) -> + return $ ("header-includes", s5Meta ++ s5Links) : + variables ("slidy", True, True) -> do slidyJs <- readDataFile datadir $ "slidy" "slidy.min.js" diff --git a/tests/s5.basic.html b/tests/s5.basic.html index 39f1ffab4..f46a853ab 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -10,264 +10,13 @@ - - - - - + + + + + + +

My S5 Document

diff --git a/tests/s5.fancy.html b/tests/s5.fancy.html index 8e29408f2..fd05c4161 100644 --- a/tests/s5.fancy.html +++ b/tests/s5.fancy.html @@ -211,264 +211,13 @@ - - - - - + + + + + + +

My S5 Document

-- cgit v1.2.3