diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2015, Mikolaj Konarski +Copyright (c) 2015-2017, Mikolaj Konarski All rights reserved. diff --git a/NLP/Miniutter/English.hs b/NLP/Miniutter/English.hs --- a/NLP/Miniutter/English.hs +++ b/NLP/Miniutter/English.hs @@ -1,9 +1,8 @@ -{-# LANGUAGE CPP, DeriveGeneric, OverloadedStrings #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# LANGUAGE DeriveGeneric, OverloadedStrings #-} -- | Simple English clause creation parameterized by individual words. module NLP.Miniutter.English ( Part(..), Person(..), Polarity(..), Irregular - , makeSentence, makePhrase, defIrregular, (<>), (<+>) + , makeSentence, makePhrase, defIrregular, (<+>) ) where import Data.Binary @@ -14,10 +13,9 @@ import Data.String (IsString (..)) import Data.Text (Text) import qualified Data.Text as T -import Data.Text.Encoding (decodeUtf8, encodeUtf8) import GHC.Generics (Generic) import NLP.Minimorph.English -import NLP.Minimorph.Util hiding (showT, (<>)) +import NLP.Minimorph.Util hiding ((<>)) -- | Various basic and compound parts of English simple present tense clauses. -- Many of the possible nestings do not make sense. We don't care. @@ -75,12 +73,6 @@ instance Binary Polarity -#if !MIN_VERSION_text(1,2,1) -instance Binary Text where - put = put . encodeUtf8 - get = decodeUtf8 `fmap` get -#endif - -- | Nouns with irregular plural form and nouns with irregular indefinite -- article. type Irregular = (Map Text Text, Map Text Text) @@ -115,7 +107,7 @@ Ordinal n -> ordinal n Ord n -> ordinalNotSpelled n AW p -> onFirstWord (addIndefinite irr) (mkPart p) - WWandW lp -> let i = "and" + WWandW lp -> let i = "and" :: Text lt = makeParts irr lp in commas i lt WWxW x lp -> let i = mkPart x @@ -342,7 +334,8 @@ -- | Default set of nouns with irregular plural form. defIrrPlural :: Map Text Text defIrrPlural = Map.fromList - [ ("canto", "cantos") + [ ("bro", "bros") + , ("canto", "cantos") , ("homo", "homos") , ("photo", "photos") , ("zero", "zeros") diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -miniutter [![Build Status](https://secure.travis-ci.org/Mikolaj/miniutter.png)](http://travis-ci.org/Mikolaj/miniutter)[![Build Status](https://drone.io/github.com/Mikolaj/miniutter/status.png)](https://drone.io/github.com/Mikolaj/miniutter/latest) +miniutter ========= +[![Build Status](https://secure.travis-ci.org/Mikolaj/miniutter.png)](http://travis-ci.org/Mikolaj/miniutter) +[![Hackage](https://img.shields.io/hackage/v/miniutter.svg)](https://hackage.haskell.org/package/miniutter) This library helps in generating simple present tense English sentences from short, parametrized descriptions. @@ -12,17 +14,17 @@ but just make the creation of the simple correct ones easy and predictable. -The library is available from [Hackage] [1] and it's homepage -and issue tracker is on [github] [2]. +The library is available from Hackage[1] and it's homepage +and issue tracker is on github[2]. Further information ------------------- -The library emerged when the needs of the [LambdaHack] [3] game engine +The library emerged when the needs of the LambdaHack[3] game engine outgrew its rudimentary grammar code written by Andres Loeh. -The library uses [minimorph] [4] by Eric Kow to tackle English spelling. +The library uses minimorph[4] by Eric Kow to tackle English spelling. More information about natural language processing libraries in Haskell -is gathered at the [Haskell wiki] [5]. +is gathered at the Haskell wiki[5]. [1]: http://hackage.haskell.org/package/miniutter [2]: https://github.com/Mikolaj/miniutter diff --git a/miniutter.cabal b/miniutter.cabal --- a/miniutter.cabal +++ b/miniutter.cabal @@ -5,7 +5,7 @@ -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -version: 0.4.4.2 +version: 0.4.5.0 synopsis: Simple English clause creation from arbitrary words description: This library helps in generating simple present tense English sentences from short, parametrized descriptions. @@ -20,7 +20,7 @@ bug-reports: https://github.com/Mikolaj/miniutter/issues license: BSD3 license-file: LICENSE -tested-with: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8 +tested-with: GHC >= 7.4.2 && <= 8.2 extra-source-files: LICENSE, README.md author: Mikolaj Konarski maintainer: Mikolaj Konarski @@ -40,7 +40,7 @@ ghc-prim >= 0.2, text >= 0.11.2.3 && < 2, containers >= 0.4.1 && < 1, - minimorph >= 0.1.4 && < 1 + minimorph >= 0.1.6 && < 1 default-language: Haskell2010 default-extensions: MonoLocalBinds, ScopedTypeVariables, @@ -48,7 +48,7 @@ other-extensions: OverloadedStrings --, DeriveGeneric ghc-options: -Wall -fwarn-orphans -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -fwarn-monomorphism-restriction -fwarn-unrecognised-pragmas - ghc-options: -fno-warn-auto-orphans -fno-warn-implicit-prelude + ghc-options: -fno-warn-implicit-prelude ghc-options: -fno-ignore-asserts -funbox-strict-fields test-suite test-miniutter @@ -68,5 +68,5 @@ BangPatterns, RecordWildCards, NamedFieldPuns other-extensions: OverloadedStrings ghc-options: -Wall -fwarn-orphans -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -fwarn-monomorphism-restriction -fwarn-unrecognised-pragmas - ghc-options: -fno-warn-auto-orphans -fno-warn-implicit-prelude + ghc-options: -fno-warn-implicit-prelude ghc-options: -fno-ignore-asserts -funbox-strict-fields