gitit 0.7.3.11 → 0.7.3.12

raw patch · 8 files changed

+35/−11 lines, 8 filesdep +pandoc-typesdep ~pandocPVP: minor bump suggested

API additions: PVP suggests at least a minor version bump

Dependencies added: pandoc-types

Dependency ranges changed: pandoc

API changes (from Hackage documentation)

Files

• CHANGES +8/−0
• Network/Gitit/ContentTransformer.hs +5/−4
• Network/Gitit/Export.hs +11/−1
• Network/Gitit/Initialize.hs +1/−0
• Network/Gitit/Interface.hs +4/−2
• Network/Gitit/Types.hs +1/−1
• Network/Gitit/Util.hs +1/−0
• gitit.cabal +4/−3

@@ -1,3 +1,11 @@+Version 0.7.3.12 released 01 Feb 2011++* Use pandoc 1.8.++* New export formats: textile, org.++* New page form: textile.+ Version 0.7.3.11 released 28 Jan 2011  * Allow time 1.2.

@@ -497,9 +497,10 @@        Markdown -> readMarkdown defPS        LaTeX    -> readLaTeX defPS        HTML     -> readHtml defPS+       Textile  -> readTextile defPS  wikiLinksTransform :: Pandoc -> PluginM Pandoc-wikiLinksTransform = return . processWith convertWikiLinks+wikiLinksTransform = return . bottomUp convertWikiLinks  -- | Convert links with no URL to wikilinks. convertWikiLinks :: Inline -> Inline@@ -525,7 +526,7 @@                Quoted DoubleQuote xs   -> '"' : (concatMap go xs ++ "\"")                Quoted SingleQuote xs   -> '\'' : (concatMap go xs ++ "'")                Cite _ xs               -> concatMap go xs-               Code s                  -> s+               Code _ s                -> s                Space                   -> " "                EmDash                  -> "---"                EnDash                  -> "--"@@ -534,8 +535,8 @@                LineBreak               -> " "                Math DisplayMath s      -> "$$" ++ s ++ "$$"                Math InlineMath s       -> "$" ++ s ++ "$"-               TeX s                   -> s-               HtmlInline _            -> ""+               RawInline "tex" s       -> s+               RawInline _ _           -> ""                Link xs _               -> concatMap go xs                Image xs _              -> concatMap go xs                Note _                  -> ""

@@ -167,6 +167,14 @@ respondDocbook = respondS "docbook" "application/docbook+xml" "xml"   writeDocbook defaultRespOptions +respondOrg :: String -> Pandoc -> Handler+respondOrg = respondS "org" "text/plain; charset=utf-8" ""+  writeOrg defaultRespOptions++respondTextile :: String -> Pandoc -> Handler+respondTextile = respondS "textile" "text/plain; charset=utf-8" ""+  writeTextile defaultRespOptions+ respondMediaWiki :: String -> Pandoc -> Handler respondMediaWiki = respondS "mediawiki" "text/plain; charset=utf-8" ""   writeMediaWiki defaultRespOptions@@ -256,7 +264,7 @@         fixURL ('/':url) = curdir </> staticDir cfg </> url         fixURL url       = url     -    return $ processWith go pndc+    return $ bottomUp go pndc  exportFormats :: Config -> [(String, String -> Pandoc -> Handler)] exportFormats cfg = if pdfExport cfg@@ -275,4 +283,6 @@                 , ("S5",        respondS5)                 , ("ODT",       respondODT)                 , ("EPUB",      respondEPUB)+                , ("Org",       respondOrg)+                , ("Textile",   respondTextile)                 , ("RTF",       respondRTF) ]

@@ -131,6 +131,7 @@                        LaTeX    -> writeLaTeX defOpts . toPandoc                        HTML     -> writeHtmlString defOpts . toPandoc                        RST      -> writeRST defOpts . toPandoc+                       Textile  -> writeTextile defOpts . toPandoc      welcomepath <- getDataFileName $ "data" </> "FrontPage" <.> "page"     welcomecontents <- liftM converter $ readFileUTF8 welcomepath

@@ -124,9 +124,11 @@                                , liftIO                                , withTempDir                                , module Text.Pandoc.Definition+                               , module Text.Pandoc.Generic                                ) where import Text.Pandoc.Definition+import Text.Pandoc.Generic import Data.Data import Network.Gitit.Types import Network.Gitit.ContentTransformer@@ -165,10 +167,10 @@ -- @Block -> Block@, @[Inline] -> [Inline]@, or @String -> String@) -- to a 'PageTransform' plugin. mkPageTransform :: Data a => (a -> a) -> Plugin-mkPageTransform fn = PageTransform $ return . processWith fn+mkPageTransform fn = PageTransform $ return . bottomUp fn  -- | Monadic version of 'mkPageTransform'. -- Lifts a function from @a -> m a@ to a 'PageTransform' plugin. mkPageTransformM :: Data a => (a -> PluginM a) -> Plugin-mkPageTransformM =  PageTransform . processWithM+mkPageTransformM =  PageTransform . bottomUpM 

@@ -40,7 +40,7 @@ import Network.Gitit.Server import Text.Pandoc.CharacterReferences (decodeCharacterReferences) -data PageType = Markdown | RST | LaTeX | HTML+data PageType = Markdown | RST | LaTeX | HTML | Textile                 deriving (Read, Show, Eq)  data FileStoreType = Git | Darcs | Mercurial deriving Show

@@ -93,6 +93,7 @@        "rst"          -> (RST,False)        "rst+lhs"      -> (RST,True)        "html"         -> (HTML,False)+       "textile"      -> (Textile,False)        "latex"        -> (LaTeX,False)        "latex+lhs"    -> (LaTeX,True)        x              -> error $ "Unknown page type: " ++ x

@@ -1,5 +1,5 @@ name:                gitit-version:             0.7.3.11+version:             0.7.3.12 Cabal-version:       >= 1.2 build-type:          Simple synopsis:            Wiki using happstack, git or darcs, and pandoc.@@ -100,7 +100,7 @@     exposed-modules: Network.Gitit.Interface     build-depends:   ghc, ghc-paths     cpp-options:     -D_PLUGINS-  build-depends:     base >= 3, pandoc >= 1.6 && < 1.7, filepath, safe+  build-depends:     base >= 3, pandoc >= 1.8, pandoc-types >= 1.8, filepath, safe   extensions:        CPP   if impl(ghc >= 6.12)     ghc-options:     -Wall -fno-warn-unused-do-bind@@ -116,7 +116,8 @@                      pretty,                      xhtml,                      containers,-                     pandoc >= 1.6 && < 1.7,+                     pandoc >= 1.8,+                     pandoc-types >= 1.8,                      process,                      filepath,                      directory,