7b4c1b1 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Use data: protocol to embed s5 css in <link> tags.

7b4c1b1John MacFarlane15 years ago

pandoc.cabal+4−2

compare with master

unifiedsplit

@@ -210,7 +210,8 @@ Library

210 pandoc-types == 1.8.*,

211 json >= 0.4 && < 0.5,

212 dlist >= 0.4 && < 0.6,

213− tagsoup >= 0.12 && < 0.13

213+ tagsoup >= 0.12 && < 0.13,

214+ base64-bytestring >= 0.1 && < 0.2

214 if impl(ghc >= 6.10)

215 if impl(ghc >= 6.10)

215 Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

216 Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

216 else

217 else

@@ -295,7 +296,8 @@ Executable pandoc

295 pandoc-types == 1.8.*,

296 pandoc-types == 1.8.*,

296 json >= 0.4 && < 0.5,

297 json >= 0.4 && < 0.5,

297 dlist >= 0.4 && < 0.6,

298 dlist >= 0.4 && < 0.6,

298− tagsoup >= 0.12 && < 0.13

299+ tagsoup >= 0.12 && < 0.13,

300+ base64-bytestring >= 0.1 && < 0.2

299 if impl(ghc >= 6.10)

301 if impl(ghc >= 6.10)

300 Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

302 Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

301 else

303 else

src/Text/Pandoc/S5.hs+16−11

@@ -31,6 +31,8 @@ Definitions for creation of S5 powerpoint-like HTML.

31module Text.Pandoc.S5 ( s5HeaderIncludes) where

32import Text.Pandoc.Shared ( readDataFile )

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

34+import Data.ByteString.UTF8 ( toString, fromString )

35+import Data.ByteString.Base64 ( encode )

35s5HeaderIncludes :: Maybe FilePath -> IO String

37s5HeaderIncludes :: Maybe FilePath -> IO String

36s5HeaderIncludes datadir = do

38s5HeaderIncludes datadir = do

@@ -38,14 +40,17 @@ s5HeaderIncludes datadir = do

38 j <- s5Javascript datadir

40 j <- s5Javascript datadir

39 return $ c ++ j

41 return $ c ++ j

41−inCDATA :: String -> String

42−inCDATA s = "/*<![CDATA[*/\n" ++ s ++ "\n/*]]>*/\n"

43−

44s5Javascript :: Maybe FilePath -> IO String

43s5Javascript :: Maybe FilePath -> IO String

45s5Javascript datadir = do

44s5Javascript datadir = do

46 js <- readDataFile datadir $ "s5" </> "default" </> "slides.min.js"

45 js <- readDataFile datadir $ "s5" </> "default" </> "slides.min.js"

47 return $ "<script type=\"text/javascript\">\n" ++ inCDATA js ++ "</script>\n"

46 return $ "<script type=\"text/javascript\">\n" ++ inCDATA js ++ "</script>\n"

48+inCDATA :: String -> String

49+inCDATA s = "/*<![CDATA[*/\n" ++ s ++ "\n/*]]>*/\n"

50+

51+base64 :: String -> String

52+base64 = toString . encode . fromString

53+

49s5CSS :: Maybe FilePath -> IO String

54s5CSS :: Maybe FilePath -> IO String

50s5CSS datadir = do

55s5CSS datadir = do

51 s5CoreCSS <- readDataFile datadir $ "s5" </> "default" </> "s5-core.css"

56 s5CoreCSS <- readDataFile datadir $ "s5" </> "default" </> "s5-core.css"

@@ -54,11 +59,11 @@ s5CSS datadir = do

54 s5OperaCSS <- readDataFile datadir $ "s5" </> "default" </> "opera.css"

59 s5OperaCSS <- readDataFile datadir $ "s5" </> "default" </> "opera.css"

55 s5OutlineCSS <- readDataFile datadir $ "s5" </> "default" </> "outline.css"

60 s5OutlineCSS <- readDataFile datadir $ "s5" </> "default" </> "outline.css"

56 s5PrintCSS <- readDataFile datadir $ "s5" </> "default" </> "print.css"

61 s5PrintCSS <- readDataFile datadir $ "s5" </> "default" </> "print.css"

57− return $ "<style type=\"text/css\" media=\"projection\" id=\"slideProj\">\n" ++

62+ return $ "<link rel=\"stylesheet\" type=\"text/css\" media=\"projection\" id=\"slideProj\" href=\"data:text/css;charset=utf-8;base64," ++

58− inCDATA (s5CoreCSS ++ "\n" ++ s5FramingCSS ++ "\n" ++ s5PrettyCSS) ++

63+ base64 (s5CoreCSS ++ "\n" ++ s5FramingCSS ++ "\n" ++ s5PrettyCSS) ++ "\" />\n" ++

59− "</style>\n<style type=\"text/css\" media=\"screen\" id=\"outlineStyle\">\n" ++

64+ "<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\" id=\"outlineStyle\" href=\"data:text/css;charset=utf-8;base64," ++

60− inCDATA s5OutlineCSS ++

65+ base64 s5OutlineCSS ++ "\" />\n" ++

61− "</style>\n<style type=\"text/css\" media=\"print\" id=\"slidePrint\">\n" ++

66+ "<link rel=\"stylesheet\" type=\"text/css\" media=\"print\" id=\"slidePrint\" href=\"data:text/css;charset=utf-8;base64," ++

62− inCDATA s5PrintCSS ++

67+ base64 s5PrintCSS ++ "\" />\n" ++

63− "</style>\n<style type=\"text/css\" media=\"projection\" id=\"operaFix\">\n" ++

68+ "<link rel=\"stylesheet\" type=\"text/css\" media=\"projection\" id=\"operaFix\" href=\"data:text/css;charset=utf-8;base64," ++

64− inCDATA s5OperaCSS ++ "</style>\n"

69+ base64 s5OperaCSS ++ "\" />\n"