[Removed the Template module, using the installed template instead emax@chalmers.se**20110706103939 Ignore-this: f67747e721233bb093c6bb52d82da049 ] hunk ./Bookshelf.hs 35 +import Text.Pandoc + hunk ./Bookshelf.hs 206 - pwd <- getCurrentDirectory - args <- parseArgsIO ArgsComplete argSpec + pwd <- getCurrentDirectory + args <- parseArgsIO ArgsComplete argSpec + tmpl <- getDefaultTemplate Nothing "html" + tmpl' <- case tmpl of + Left msg -> error $ show msg + Right tmpl -> return tmpl hunk ./Bookshelf.hs 220 - mkContext ds = Context css' edit script (joinPath $ init ds) (last ds) + mkContext ds = Context tmpl' css' edit script (joinPath $ init ds) (last ds) hunk ./Generate.hs 38 -import Template hunk ./Generate.hs 289 - context = shelfContext shelfInfo hunk ./Generate.hs 310 - cssInclude = makeCss context + cssInclude = makeCss $ shelfContext shelfInfo hunk ./Generate.hs 314 - , writerTemplate = template + , writerTemplate = htmlTemplate $ shelfContext shelfInfo hunk ./Generate.hs 376 - cssInclude = makeCss context + cssInclude = makeCss context hunk ./Generate.hs 380 - , writerTemplate = template + , writerTemplate = htmlTemplate context hunk ./Generate.hs 385 - pandoc = Pandoc meta + pandoc = Pandoc meta hunk ./Template.hs 1 --- Copyright (C) 2011 Maxime Rio --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 2 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - --- | --- Copyright : Copyright (C) 2011 Maxime Rio --- License : GNU GPL, version 2 or above --- --- Maintainer : Maxime Rio - -module Template where - - -template = "\ -\$if(html5)$\n\ -\\n\ -\\n\ -\$else$\n\ -\\n\ -\\n\ -\$endif$\n\ -\\n\ -\$if(html5)$\n\ -\ \n\ -\$else$\n\ -\ \n\ -\$endif$\n\ -\ \n\ -\$for(author)$\n\ -\ \n\ -\$endfor$\n\ -\$if(date)$\n\ -\ \n\ -\$endif$\n\ -\ $if(title-prefix)$$title-prefix$ - $endif$$if(pagetitle)$$pagetitle$$endif$\n\ -\$if(html5)$\n\ -\ \n\ -\$endif$\n\ -\$if(highlighting-css)$\n\ -\ \n\ -\$endif$\n\ -\$for(css)$\n\ -\ \n\ -\$endfor$\n\ -\$if(math)$\n\ -\$if(html5)$\n\ -\$else$\n\ -\ $math$\n\ -\$endif$\n\ -\$endif$\n\ -\$for(header-includes)$\n\ -\ $header-includes$\n\ -\$endfor$\n\ -\\n\ -\\n\ -\$for(include-before)$\n\ -\$include-before$\n\ -\$endfor$\n\ -\$if(title)$\n\ -\$if(html5)$\n\ -\

\n\ -\$endif$\n\ -\

$title$

\n\ -\$if(html5)$\n\ -\

\n\ -\$endif$\n\ -\$endif$\n\ -\$if(toc)$\n\ -\$toc$\n\ -\$endif$\n\ -\$body$\n\ -\$for(include-after)$\n\ -\$include-after$\n\ -\$endfor$\n\ -\\n\ -\" - rmfile ./Template.hs hunk ./Types.hs 41 - { -- | Optional link to CSS file - cssLink_ :: Maybe FilePath + { -- | Pandoc HTML template + htmlTemplate :: String + -- | Optional link to CSS file + , cssLink_ :: Maybe FilePath hunk ./Types.hs 46 - , editor_ :: Maybe String + , editor_ :: Maybe String hunk ./Types.hs 48 - , showScript_ :: Bool + , showScript_ :: Bool hunk ./Types.hs 50 - , rootPath_ :: FilePath + , rootPath_ :: FilePath hunk ./Types.hs 52 - , relPath_ :: FilePath + , relPath_ :: FilePath