Bookshelf 0.3 → 0.3.1

raw patch · 3 files changed

+18/−13 lines, 3 files

Files

• Bookshelf.cabal +1/−1
• Documentation/Manual.shelf +10/−5
• Generate.hs +7/−7

@@ -1,5 +1,5 @@ name:           Bookshelf-version:        0.3+version:        0.3.1 synopsis:       A simple document organizer with some wiki functionality description:    A simple document organizer with some wiki functionality category:       Text

@@ -43,7 +43,7 @@      bookshelf --css bookshelf.css --bib Documentation/papers.bib Documentation -in the root of the [project directory](http://projects.haskell.org/Bookshelf). In addition to this manual, it contains a sub-directory [Test](Test/) with some example files in it.+in the root of the [project directory](http://hub.darcs.net/emax/Bookshelf). In addition to this manual, it contains a sub-directory [Test](Test/) with some example files in it.  Operation =========@@ -64,7 +64,7 @@ Meta information ================ -Pandoc's markdown syntax allows the specification of ["title blocks"](http://johnmacfarlane.net/pandoc/README.html#title-blocks) containing information about document title, authors and date. If such information is provided for shelf documents, it will be included in the document listing for each directory.+Pandoc's markdown syntax allows the specification of ["title blocks"](http://johnmacfarlane.net/pandoc/README.html) containing information about document title, authors and date. If such information is provided for shelf documents, it will be included in the document listing for each directory.  Whenever a shelf document and an ordinary document have the same name, apart from extensions, the shelf document is assumed to contain information about the ordinary document. In this situation, we call the ordinary document the *main document* and the corresponding shelf document the *info document*. An info document will only appear as an "info" link next to its main document in directory listings. Furthermore, the info document may optionally specify meta information about the main document by including a section of the following form at the top of the markdown source: @@ -88,19 +88,24 @@ Installation ============ -First, make sure to have the [Haskell Platform](http://hackage.haskell.org/platform/) installed. To install Bookshelf directly from [Hackage](http://hackage.haskell.org/cgi-bin/hackage-scripts/package/Bookshelf), run:+First, make sure to have the [Haskell Platform](http://hackage.haskell.org/platform/) installed. To install Bookshelf directly from [Hackage](http://hackage.haskell.org/package/Bookshelf), run:      cabal install Bookshelf -Alternatively, fetch the [repository](http://projects.haskell.org/Bookshelf)+Alternatively, fetch the [repository](http://hub.darcs.net/emax/Bookshelf) -    darcs get http://projects.haskell.org/Bookshelf+    darcs get http://hub.darcs.net/emax/Bookshelf  and run      cabal install  inside the `Bookshelf` directory.++Issues+======++Any issues can be reported [here](http://hub.darcs.net/emax/Bookshelf/issues).  Credits =======

@@ -189,20 +189,20 @@       return is      field f bs = Fold.concat $ do-      Str f' : Str ":" : rest <- plain bs+      Str f' : rest <- plain bs       guard (f==f')       return rest      parseList f bs = Fold.concat $ do-      [Plain [Str f', Str ":"], BulletList bulls] <- return bs+      [Plain [Str f'], BulletList bulls] <- return bs       guard (f==f')       mapM plain bulls -    title    = field "Title"   bsTit-    date     = field "Date"    bsDate-    comment  = field "Comment" bsComm-    authors  = parseList "Authors"  bsAuth-    keywords = parseList "Keywords" bsKeyw+    title    = field "Title:"   bsTit+    date     = field "Date:"    bsDate+    comment  = field "Comment:" bsComm+    authors  = parseList "Authors:"  bsAuth+    keywords = parseList "Keywords:" bsKeyw