diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,16 @@ +Version 0.10.2 released 09 Feb 2013 + +* Updated to work with pandoc 1.10. + +* Fixed path for MathMLInHTML.js script. Closes #345. + Thanks to tstgruby. + +* Updated interwiki plugin (gwern). + +* Made it possible to export pages with images stored in the + repository itself (as opposed to the static directory). Thanks + to Claudio Bley for the patch. + Version 0.10.1.2 released 11 Jan 2013 * Fixed regression in option parsing. An earlier patch diff --git a/Network/Gitit/Config.hs b/Network/Gitit/Config.hs --- a/Network/Gitit/Config.hs +++ b/Network/Gitit/Config.hs @@ -110,7 +110,7 @@ let (pt, lhs) = parsePageType cfDefaultPageType let markupHelpFile = show pt ++ if lhs then "+LHS" else "" markupHelpPath <- liftIO $ getDataFileName $ "data" "markupHelp" markupHelpFile - markupHelpText <- liftM (writeHtmlString defaultWriterOptions . readMarkdown defaultParserState) $ + markupHelpText <- liftM (writeHtmlString def . readMarkdown def) $ liftIO $ readFileUTF8 markupHelpPath mimeMap' <- liftIO $ readMimeTypesFile cfMimeTypesFile diff --git a/Network/Gitit/ContentTransformer.hs b/Network/Gitit/ContentTransformer.hs --- a/Network/Gitit/ContentTransformer.hs +++ b/Network/Gitit/ContentTransformer.hs @@ -88,7 +88,6 @@ import Text.HTML.SanitizeXSS (sanitizeBalance) import Text.Highlighting.Kate import Text.Pandoc hiding (MathML, WebTeX, MathJax) -import Text.Pandoc.Shared (ObfuscationMethod(..)) import Text.XHtml hiding ( (), dir, method, password, rev ) #if MIN_VERSION_blaze_html(0,5,0) import Text.Blaze.Html.Renderer.String as Blaze ( renderHtml ) @@ -96,10 +95,12 @@ import Text.Blaze.Renderer.String as Blaze ( renderHtml ) #endif import qualified Data.Text as T +import qualified Data.Set as Set import qualified Data.ByteString as S (concat) import qualified Data.ByteString.Lazy as L (toChunks, fromChunks) import qualified Data.FileStore as FS import qualified Text.Pandoc as Pandoc + -- -- ContentTransformer runners -- @@ -346,7 +347,7 @@ cfg <- lift getConfig return $ primHtml $ T.unpack . (if xssSanitize cfg then sanitizeBalance else id) . T.pack $ - writeHtmlString defaultWriterOptions{ + writeHtmlString def{ writerStandalone = True , writerTemplate = "$if(toc)$
\n$toc$\n
\n$endif$\n$body$" , writerHTMLMathMethod = @@ -357,7 +358,11 @@ _ -> JsMath (Just $ base' ++ "/js/jsMath/easy/load.js") , writerTableOfContents = toc - , writerLiterateHaskell = bird + , writerExtensions = if bird + then Set.insert + Ext_literate_haskell + $ writerExtensions def + else writerExtensions def -- note: javascript obfuscation gives problems on preview , writerEmailObfuscation = ReferenceObfuscation } pandocContents @@ -500,8 +505,11 @@ readerFor :: PageType -> Bool -> String -> Pandoc readerFor pt lhs = - let defPS = defaultParserState{ stateSmart = True - , stateLiterateHaskell = lhs } + let defPS = def{ readerSmart = True + , readerExtensions = if lhs + then Set.insert Ext_literate_haskell + $ readerExtensions def + else readerExtensions def } in case pt of RST -> readRST defPS Markdown -> readMarkdown defPS diff --git a/Network/Gitit/Export.hs b/Network/Gitit/Export.hs --- a/Network/Gitit/Export.hs +++ b/Network/Gitit/Export.hs @@ -23,7 +23,7 @@ import Text.Pandoc hiding (HTMLMathMethod(..)) import qualified Text.Pandoc as Pandoc import Text.Pandoc.SelfContained as SelfContained -import Text.Pandoc.Shared (escapeStringUsing, readDataFile) +import Text.Pandoc.Shared (escapeStringUsing, readDataFileUTF8) import Network.Gitit.Server import Network.Gitit.Framework (pathForPage, getWikiBase) import Network.Gitit.Util (withTempDir, readFileUTF8) @@ -41,15 +41,18 @@ import System.Environment (getEnvironment) import System.Exit (ExitCode(..)) import System.IO (openTempFile) -import System.Directory (getCurrentDirectory, setCurrentDirectory, removeFile) +import System.Directory (getCurrentDirectory, setCurrentDirectory, removeFile, + doesFileExist) import System.Process (runProcess, waitForProcess) import Codec.Binary.UTF8.String (encodeString) import Text.HTML.SanitizeXSS +import Text.Pandoc.Writers.RTF (writeRTFWithEmbeddedImages) import qualified Data.Text as T import Data.List (isPrefixOf) +import Paths_gitit (getDataFileName) defaultRespOptions :: WriterOptions -defaultRespOptions = defaultWriterOptions { writerStandalone = True } +defaultRespOptions = def { writerStandalone = True } respond :: String -> String @@ -74,13 +77,10 @@ doc' <- if ext `elem` ["odt","pdf","epub","docx","rtf"] then fixURLs page doc else return doc - doc'' <- if ext == "rtf" - then liftIO $ bottomUpM rtfEmbedImage doc' - else return doc' respond mimetype ext (fn opts{writerTemplate = template ,writerSourceDirectory = repositoryPath cfg ,writerUserDataDir = pandocUserData cfg}) - page doc'' + page doc' respondS :: String -> String -> String -> (WriterOptions -> Pandoc -> String) -> WriterOptions -> String -> Pandoc -> Handler @@ -114,8 +114,8 @@ $ T.pack body' variables' <- if mathMethod cfg == MathML then do - s <- liftIO $ readDataFile (pandocUserData cfg) $ - "data""MathMLinHTML.js" + s <- liftIO $ readDataFileUTF8 (pandocUserData cfg) + "MathMLinHTML.js" return [("mathml-script", s)] else return [] template' <- liftIO $ getDefaultTemplate (pandocUserData cfg) templ @@ -124,7 +124,7 @@ Left e -> liftIO $ throwIO e dzcore <- if templ == "dzslides" then do - dztempl <- liftIO $ readDataFile (pandocUserData cfg) + dztempl <- liftIO $ readDataFileUTF8 (pandocUserData cfg) $ "dzslides" "template.html" return $ unlines $ dropWhile (not . isPrefixOf "