diff options
author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-12-19 22:00:41 +0000 |
---|---|---|
committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-12-19 22:00:41 +0000 |
commit | 31a956b65559ea669d5705e005ac3d6641d7518e (patch) | |
tree | 2341f56520e94e7b0b46a8b5c96d05a0243fa28d /src/templates/S5.hs | |
parent | 206c59a3867ceecce4d1a9374411a889f263911f (diff) | |
download | pandoc-31a956b65559ea669d5705e005ac3d6641d7518e.tar.gz |
Changes to build process relating to r234.
+ Corrected dependencies in Makefiles to ensure that templates
get filled when the relevant files are modified.
+ Changed template placeholders to @xxx@ instead of <xxx>,
for consistency with our practice with the Cabal template.
+ Changed default font for RTF writer (this had been changed earlier,
but in the target rather than the template!)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@235 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'src/templates/S5.hs')
-rw-r--r-- | src/templates/S5.hs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/templates/S5.hs b/src/templates/S5.hs index 1417e7d7d..537286040 100644 --- a/src/templates/S5.hs +++ b/src/templates/S5.hs @@ -14,25 +14,25 @@ import Text.Pandoc.Writers.HTML ( writeHtml ) import Text.Pandoc.Definition s5Javascript :: String -s5Javascript = "<script type=\"text/javascript\">\n<slides.js></script>\n" +s5Javascript = "<script type=\"text/javascript\">\n@slides.js@</script>\n" s5CoreCSS :: String -s5CoreCSS = "<s5-core.css>" +s5CoreCSS = "@s5-core.css@" s5FramingCSS :: String -s5FramingCSS = "<framing.css>" +s5FramingCSS = "@framing.css@" s5PrettyCSS :: String -s5PrettyCSS = "<pretty.css>" +s5PrettyCSS = "@pretty.css@" s5OperaCSS :: String -s5OperaCSS = "<opera.css>" +s5OperaCSS = "@opera.css@" s5OutlineCSS :: String -s5OutlineCSS = "<outline.css>" +s5OutlineCSS = "@outline.css@" s5PrintCSS :: String -s5PrintCSS = "<print.css>" +s5PrintCSS = "@print.css@" s5CSS :: String s5CSS = "<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" |