Bookshelf 0.5 → 0.6

raw patch · 2 files changed

+14/−14 lines, 2 filesdep ~pandocdep ~pandoc-citeprocdep ~pandoc-types

Dependency ranges changed: pandoc, pandoc-citeproc, pandoc-types

Files

• Bookshelf.cabal +2/−2
• Generate.hs +12/−12

@@ -1,5 +1,5 @@ name:           Bookshelf-version:        0.5+version:        0.6 synopsis:       A simple document organizer with some wiki functionality description:    A simple document organizer with some wiki functionality category:       Text@@ -29,7 +29,7 @@   location:  http://hub.darcs.net/emax/Bookshelf  executable bookshelf-  build-depends:  base < 5, containers, directory, filepath, pandoc >= 1.12, pandoc-types >= 1.12, pandoc-citeproc >= 0.2, parseargs+  build-depends:  base < 5, containers, directory, filepath, pandoc, pandoc-types >= 1.16, pandoc-citeproc, parseargs   main-is:        Bookshelf.hs   extensions:     PatternGuards 

@@ -75,15 +75,15 @@  -- | Lifts `redirect` to Pandoc inline elements (links). redirectLink :: Inline -> Inline-redirectLink (Link is (path,tit)) = Link is (redirect path, tit)-redirectLink i                    = i+redirectLink (Link atts is (path,tit)) = Link atts is (redirect path, tit)+redirectLink i = i  -- | Collects local links (at most one) from a Pandoc inline element. localLink :: Inline -> [FilePath] localLink inl = case inl of-    Link  _ (path,_) -> linked path-    Image _ (path,_) -> linked path-    _                -> []+    Link _ _ (path,_)  -> linked path+    Image _ _ (path,_) -> linked path+    _                  -> []   where     linked path = do       guard (not $ isHttp path)@@ -113,7 +113,7 @@     name  = shelfDocument shelfInfo      link n dir =-        [ Link+        [ Link nullAttr             (pandocStr dir)             (index, "Go to directory '" ++ dir ++ "'")         , Space@@ -125,7 +125,7 @@      fileLink = do       guard (not $ null name)-      return $ Link (pandocStr name) (name, "View document source")+      return $ Link nullAttr (pandocStr name) (name, "View document source")   @@ -136,7 +136,7 @@     return $ Plain $ return $ Emph       [ Str "➤"       , Space-      , Link (pandocStr "Main document") (name, "View main document")+      , Link nullAttr (pandocStr "Main document") (name, "View main document")       ]  bookshelfCreds :: String@@ -299,7 +299,7 @@ -- the link title. The @info@ argument will be inlined directly after the link. listDocument :: String -> MetaInfo -> String -> [Inline] -> [Block] listDocument file meta view info =-    [ Plain $ [Link (title meta) (file, "View '" ++ view ++ "'")] ++ info'+    [ Plain $ [Link nullAttr (title meta) (file, "View '" ++ view ++ "'")] ++ info'     , BulletList $ filter (not . null) $         [ bullet $ concat $ intersperse [Str ",", Space] $ authors meta         , bullet $ date meta@@ -334,7 +334,7 @@     docShelfHtml = replaceExtension doc ".shelf" `addExtension` ".html"     info =       [ Str "("-      , Link+      , Link nullAttr          (pandocStr "info")          (docShelfHtml, "View document information")       , Str ")"@@ -343,12 +343,12 @@ -- | Makes an item for an ordinary document without meta info to be displayed in the directory index listOrdDoc :: Monad m => String -> m Block listOrdDoc doc = return $ Plain-  [Link (pandocStr doc) (doc, "View '" ++ doc ++ "'")]+  [Link nullAttr (pandocStr doc) (doc, "View '" ++ doc ++ "'")]  -- | Makes an item for an sub-directory to be displayed in the directory index listDir :: Monad m => String -> m Block listDir dir = return $ Plain-  [ Link+  [ Link nullAttr       (pandocStr dir)       (dir </> "index.html", "Go to directory '" ++ dir ++ "'")   , LineBreak