diff options
| -rw-r--r-- | pandoc.cabal | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc.hs | 1 | ||||
| -rw-r--r-- | src/Text/Pandoc/S5.hs (renamed from src/Text/Pandoc/Writers/S5.hs) | 17 | ||||
| -rw-r--r-- | src/pandoc.hs | 2 |
4 files changed, 6 insertions, 16 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 88c31f41e..60e719d12 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -202,9 +202,9 @@ Library Text.Pandoc.Writers.RST, Text.Pandoc.Writers.MediaWiki, Text.Pandoc.Writers.RTF, - Text.Pandoc.Writers.S5, Text.Pandoc.Writers.ODT, Text.Pandoc.Writers.EPUB, + Text.Pandoc.S5, Text.Pandoc.Templates Other-Modules: Text.Pandoc.XML, Text.Pandoc.UTF8, diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs index f0d679dae..ad429bc93 100644 --- a/src/Text/Pandoc.hs +++ b/src/Text/Pandoc.hs @@ -110,7 +110,6 @@ import Text.Pandoc.Writers.LaTeX import Text.Pandoc.Writers.ConTeXt import Text.Pandoc.Writers.Texinfo import Text.Pandoc.Writers.HTML -import Text.Pandoc.Writers.S5 import Text.Pandoc.Writers.ODT import Text.Pandoc.Writers.EPUB import Text.Pandoc.Writers.Docbook diff --git a/src/Text/Pandoc/Writers/S5.hs b/src/Text/Pandoc/S5.hs index a439363f1..1567a3ede 100644 --- a/src/Text/Pandoc/Writers/S5.hs +++ b/src/Text/Pandoc/S5.hs @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -} {- | - Module : Text.Pandoc.Writers.S5 + Module : Text.Pandoc.S5 Copyright : Copyright (C) 2006-2010 John MacFarlane License : GNU GPL, version 2 or above @@ -28,24 +28,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Definitions for creation of S5 powerpoint-like HTML. (See <http://meyerweb.com/eric/tools/s5/>.) -} -module Text.Pandoc.Writers.S5 ( - -- * Header includes - s5HeaderIncludes - ) where -import Text.Pandoc.Shared ( WriterOptions, readDataFile ) -import Text.Pandoc.Writers.HTML ( writeHtml, writeHtmlString ) -import Text.Pandoc.Definition -import Text.XHtml.Strict +module Text.Pandoc.S5 ( s5HeaderIncludes) where +import Text.Pandoc.Shared ( readDataFile ) import System.FilePath ( (</>) ) s5HeaderIncludes :: Maybe FilePath -> IO String s5HeaderIncludes datadir = do c <- s5CSS datadir j <- s5Javascript datadir - return $ s5Meta ++ c ++ j - -s5Meta :: String -s5Meta = "<!-- configuration parameters -->\n<meta name=\"defaultView\" content=\"slideshow\" />\n<meta name=\"controlVis\" content=\"hidden\" />\n" + return $ c ++ j s5Javascript :: Maybe FilePath -> IO String s5Javascript datadir = do diff --git a/src/pandoc.hs b/src/pandoc.hs index 67e81d6fa..7af43d3a4 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.S5 (s5HeaderIncludes) import Text.Pandoc.Shared ( tabFilter, ObfuscationMethod (..), readDataFile, headerShift ) #ifdef _HIGHLIGHTING |