diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-07-24 07:52:44 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2011-07-24 07:52:44 -0700 |
| commit | 835dc412d21e82a18c20f9494ea3ec36598b9e17 (patch) | |
| tree | 83433cce032154c87dd6ca269705950bdbf8a66a /src | |
| parent | 35cef016599fe0d247ae4752e0d16cefa198e7f2 (diff) | |
| download | pandoc-835dc412d21e82a18c20f9494ea3ec36598b9e17.tar.gz | |
Enclose s5 scripts and css in CDATA tags.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/S5.hs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Text/Pandoc/S5.hs b/src/Text/Pandoc/S5.hs index 1567a3ede..9aa643e7a 100644 --- a/src/Text/Pandoc/S5.hs +++ b/src/Text/Pandoc/S5.hs @@ -38,12 +38,15 @@ s5HeaderIncludes datadir = do j <- s5Javascript datadir return $ c ++ j +inCDATA :: String -> String +inCDATA s = "/*<![CDATA[*/\n" ++ s ++ "\n/*]]>*/\n" + s5Javascript :: Maybe FilePath -> IO String s5Javascript datadir = do jsCom <- readDataFile datadir $ "s5" </> "default" </> "slides.js.comment" jsPacked <- readDataFile datadir $ "s5" </> "default" </> "slides.js.packed" - return $ "<script type=\"text/javascript\">\n" ++ jsCom ++ jsPacked ++ - "</script>\n" + return $ "<script type=\"text/javascript\">\n" ++ + inCDATA (jsCom ++ jsPacked) ++ "</script>\n" s5CSS :: Maybe FilePath -> IO String s5CSS datadir = do @@ -53,5 +56,5 @@ s5CSS datadir = do s5OperaCSS <- readDataFile datadir $ "s5" </> "default" </> "opera.css" s5OutlineCSS <- readDataFile datadir $ "s5" </> "default" </> "outline.css" s5PrintCSS <- readDataFile datadir $ "s5" </> "default" </> "print.css" - return $ "<style type=\"text/css\" media=\"projection\" id=\"slideProj\">\n" ++ s5CoreCSS ++ "\n" ++ s5FramingCSS ++ "\n" ++ s5PrettyCSS ++ "\n</style>\n<style type=\"text/css\" media=\"projection\" id=\"operaFix\">\n" ++ s5OperaCSS ++ "\n</style>\n<style type=\"text/css\" media=\"screen\" id=\"outlineStyle\">\n" ++ s5OutlineCSS ++ "\n</style>\n<style type=\"text/css\" media=\"print\" id=\"slidePrint\">\n" ++ s5PrintCSS ++ "\n</style>\n" + return $ "<style type=\"text/css\" media=\"projection\" id=\"slideProj\">\n" ++ inCDATA (s5CoreCSS ++ "\n" ++ s5FramingCSS ++ "\n" ++ s5PrettyCSS) ++ "</style>\n<style type=\"text/css\" media=\"projection\" id=\"operaFix\">\n" ++ inCDATA s5OperaCSS ++ "</style>\n<style type=\"text/css\" media=\"screen\" id=\"outlineStyle\">\n" ++ inCDATA s5OutlineCSS ++ "</style>\n<style type=\"text/css\" media=\"print\" id=\"slidePrint\">\n" ++ inCDATA s5PrintCSS ++ "</style>\n" |