01a1917 · typeable/pandoc

git.iko.soy/typeable/pandoc

Moved Text.Pandoc.Writers.S5 -> Text.Pandoc.S5.

Now it doesn't export a writer, just some CSS and JS.

commit01a191709e33f2a5b10a24cdf537511f83fc0268 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 22 Jul 2010, 23:37 (16 years ago) parent348db7f

4 files changed+6−16

compare with master

unifiedsplit

pandoc.cabal+1−1 src/Text/Pandoc.hs−1 src/Text/Pandoc/Writers/S5.hs → src/Text/Pandoc/S5.hs+4−13 src/pandoc.hs+1−1

pandoc.cabal+1−1

@@ -202,9 +202,9 @@ Library

202202 Text.Pandoc.Writers.RST,

203203 Text.Pandoc.Writers.MediaWiki,

204204 Text.Pandoc.Writers.RTF,

205− Text.Pandoc.Writers.S5,

206205 Text.Pandoc.Writers.ODT,

207206 Text.Pandoc.Writers.EPUB,

207+ Text.Pandoc.S5,

208208 Text.Pandoc.Templates

209209 Other-Modules: Text.Pandoc.XML,

210210 Text.Pandoc.UTF8,

src/Text/Pandoc.hs−1

@@ -110,7 +110,6 @@ import Text.Pandoc.Writers.LaTeX

110110import Text.Pandoc.Writers.ConTeXt

111111import Text.Pandoc.Writers.Texinfo

112112import Text.Pandoc.Writers.HTML

113−import Text.Pandoc.Writers.S5

114113import Text.Pandoc.Writers.ODT

115114import Text.Pandoc.Writers.EPUB

116115import Text.Pandoc.Writers.Docbook

src/Text/Pandoc/Writers/S5.hs → src/Text/Pandoc/S5.hsrenamed+4−13

@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

1717-}

1818

1919{- |

20− Module : Text.Pandoc.Writers.S5

20+ Module : Text.Pandoc.S5

2222 License : GNU GPL, version 2 or above

2323

@@ -28,24 +28,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

2828Definitions for creation of S5 powerpoint-like HTML.

2929(See <http://meyerweb.com/eric/tools/s5/>.)

3030-}

31−module Text.Pandoc.Writers.S5 (

32− -- * Header includes

33− s5HeaderIncludes

34− ) where

35−import Text.Pandoc.Shared ( WriterOptions, readDataFile )

36−import Text.Pandoc.Writers.HTML ( writeHtml, writeHtmlString )

37−import Text.Pandoc.Definition

38−import Text.XHtml.Strict

31+module Text.Pandoc.S5 ( s5HeaderIncludes) where

32+import Text.Pandoc.Shared ( readDataFile )

3933import System.FilePath ( (</>) )

4034

4135s5HeaderIncludes :: Maybe FilePath -> IO String

4236s5HeaderIncludes datadir = do

4337 c <- s5CSS datadir

4438 j <- s5Javascript datadir

45− return $ s5Meta ++ c ++ j

46−

47−s5Meta :: String

48−s5Meta = "\n<meta name=\"defaultView\" content=\"slideshow\" />\n<meta name=\"controlVis\" content=\"hidden\" />\n"

39+ return $ c ++ j

4940

5041s5Javascript :: Maybe FilePath -> IO String

5142s5Javascript datadir = do

src/pandoc.hs+1−1

@@ -30,7 +30,7 @@ writers.

3030-}

3131module Main where

3232import Text.Pandoc

33−import Text.Pandoc.Writers.S5 (s5HeaderIncludes)

33+import Text.Pandoc.S5 (s5HeaderIncludes)

3434import Text.Pandoc.Shared ( tabFilter, ObfuscationMethod (..), readDataFile,

3535 headerShift )

3636#ifdef _HIGHLIGHTING