bibtex 0.0.6 → 0.0.6.1

raw patch · 5 files changed

+11/−15 lines, 5 filesdep ~parsecPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: parsec

API changes (from Hackage documentation)

Files

• Makefile +8/−1
• bibtex.cabal +2/−7
• src/Publications.hs +0/−1
• src/Text/BibTeX/Format.hs +0/−2
• src/Text/BibTeX/Parse.hs +1/−4

@@ -1,4 +1,4 @@-.PHONY:	ghci pubs hackbib+.PHONY:	ghci pubs hackbib remotehackbib  # problem: bibtex refuses to generate empty bbl files # thus you must have at least one entry per publication type@@ -29,3 +29,10 @@ hackage.bib:	$(HOME)/.cabal/packages/hackage.haskell.org/00-index.tar.gz src/Hackage.hs 	gunzip --stdout $< | ./dist/build/hackage-bibtex/hackage-bibtex >$@ #	gunzip --stdout $< | ghc -e main src/Hackage.hs >$@++remotehackbib:+	wget -O - http://hackage.haskell.org/packages/archive/00-index.tar.gz \+	   | gunzip \+	   | ./dist/build/hackage-bibtex/hackage-bibtex \+	   | ssh code.haskell.org tee /home/thielema/public_html/bibtex/hackage.bib \+	   > /dev/null

@@ -1,5 +1,5 @@ Name:             bibtex-Version:          0.0.6+Version:          0.0.6.1 License:          BSD3 License-File:     LICENSE Author:           Henning Thielemann <haskell@henning-thielemann.de>@@ -71,11 +71,6 @@   type:     darcs   location: http://code.haskell.org/~thielema/bibtex/ -Source-Repository this-  type:     darcs-  location: http://code.haskell.org/~thielema/bibtex/-  tag:      0.0.6- Flag base2   description: Choose the new smaller, split-up base package. @@ -85,7 +80,7 @@  Library   Build-Depends:-    parsec >=2.1 && <3.1,+    parsec >=2.1 && <3.2,     containers >= 0.1 && <0.4,     utility-ht >=0.0.5 && <0.1   If flag(base2)

@@ -5,7 +5,6 @@ import qualified Text.ParserCombinators.Parsec as Parsec  import qualified Data.Char as Char-import Data.Maybe (fromMaybe, ) import System.IO (hPutStrLn, stderr, )  

@@ -5,8 +5,6 @@ import Data.List (intersperse, ) import Data.List.HT (switchR, ) -import qualified Data.Char as Char-  entry :: Entry.T -> String entry (Entry.Cons entryType bibId items) =

@@ -4,7 +4,6 @@  import Text.ParserCombinators.Parsec (Parser, (<|>), ) import qualified Text.ParserCombinators.Parsec as Parsec-import qualified Data.Char as Char  import Control.Monad (liftM, liftM2, liftM3, ) -- import Control.Applicative ((<*), )@@ -146,9 +145,7 @@ -} bibIdentifier :: Parser String bibIdentifier =-   liftM2 (:)-      (Parsec.letter <|> Parsec.char '_')-      (Parsec.many (Parsec.alphaNum <|> Parsec.oneOf "&;:-_.?+/"))+   Parsec.many1 (Parsec.alphaNum <|> Parsec.oneOf "&;:-_.?+/")  {- | Extends a parser, such that all trailing spaces are skipped.