diff --git a/LICENCE b/LICENCE --- a/LICENCE +++ b/LICENCE @@ -1,5 +1,5 @@ Copyright (c) 2018-2019, Commonwealth Scientific and Industrial Research Organisation (CSIRO) ABN 41 687 119 230. -Copyright (c) 2020-2021, Tony Morris +Copyright (c) 2020-2025, Tony Morris All rights reserved. diff --git a/casa-abbreviations-and-acronyms.cabal b/casa-abbreviations-and-acronyms.cabal --- a/casa-abbreviations-and-acronyms.cabal +++ b/casa-abbreviations-and-acronyms.cabal @@ -1,31 +1,33 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: casa-abbreviations-and-acronyms -version: 0.0.10 +version: 0.0.12 synopsis: CASA Abbreviations and Acronyms description: - <> - . CASA Abbreviations and Acronyms . - https://www.casa.gov.au/about-us/standard-page/aviation-abbreviations-and-acronyms + <> + . + <> + . + https://www.casa.gov.au/resources-and-education/glossary license: BSD3 license-file: LICENCE author: Queensland Functional Programming Lab -maintainer: Queensland Functional Programming Lab +maintainer: Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ> copyright: Copyright (C) 2018-2019 Commonwealth Scientific and Industrial Research Organisation (CSIRO) - Copyright (C) 2020-2021 Tony Morris + Copyright (C) 2020-2025 Tony Morris category: Aviation build-type: Simple extra-source-files: changelog.md cabal-version: >=1.10 -homepage: https://github.com/qfpl/casa-abbreviations-and-acronyms -bug-reports: https://github.com/qfpl/casa-abbreviations-and-acronyms/issues -tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1 +homepage: https://gitlab.com/system-f/code/casa-abbreviations-and-acronyms +bug-reports: https://gitlab.com/system-f/code/casa-abbreviations-and-acronyms/issues +tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1, GHC == 9.4.8, GHC == 9.6.7 source-repository head type: git - location: git@github.com:qfpl/casa-abbreviations-and-acronyms.git + location: git@gitlab.com:system-f/code/casa-abbreviations-and-acronyms.git library exposed-modules: Data.Aviation.Casa.AbbreviationsAndAcronyms.Acronym @@ -36,14 +38,14 @@ , Data.Aviation.Casa.AbbreviationsAndAcronyms.Render.Spacing , Data.Aviation.Casa.AbbreviationsAndAcronyms.Search - build-depends: base >= 4.8 && < 5 - , lens >= 4.15 && < 4.20 || >= 5.0 && < 5.1 - , containers >= 0.5 && < 0.7 - , fuzzy >= 0.1.0.0 && < 0.2 - , monoid-subclasses >= 1.1 && < 1.2 - , bytestring >= 0.10 && < 0.12 - , semialign >= 1 && < 1.3 - , these >= 1.1 && < 1.2 + build-depends: base >= 4.8 && < 6 + , lens >= 4.15 && < 6 + , containers >= 0.5 && < 1 + , fuzzy >= 0.1.0.0 && < 1 + , monoid-subclasses >= 1.1 && < 2 + , bytestring >= 0.10 && < 1 + , semialign >= 1 && < 2 + , these >= 1.1 && < 2 , profunctors >= 5.0 && < 6.0 hs-source-dirs: src/library @@ -58,13 +60,13 @@ else buildable: True - build-depends: base - , lens - , containers - , fuzzy - , monoid-subclasses + build-depends: base >= 4.8 && < 6 + , lens >= 4.15 && < 6 + , containers >= 0.5 && < 1 + , fuzzy >= 0.1.0.0 && < 1 + , monoid-subclasses >= 1.1 && < 2 , wreq >= 0.5 && < 0.6 - , bytestring + , bytestring >= 0.10 && < 1 main-is: Main.hs @@ -80,10 +82,10 @@ else buildable: True - build-depends: base - , lens - , fuzzy - , optparse-applicative >= 0.13.2 && < 0.17 + build-depends: base >= 4.8 && < 6 + , lens >= 4.15 && < 6 + , fuzzy >= 0.1.0.0 && < 1 + , optparse-applicative >= 0.13.2 && < 1 , casa-abbreviations-and-acronyms main-is: Main.hs diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +0.0.12 + +* Updates and demonstration + 0.0.9 * Update dependencies diff --git a/src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Acronym.hs b/src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Acronym.hs --- a/src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Acronym.hs +++ b/src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Acronym.hs @@ -5324,7 +5324,7 @@ "AIS" , Acronym "TGL" - "Touch & Go Landing" + "Touch & Go Landing" "AIS" , Acronym "TGS" diff --git a/src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Render/Config.hs b/src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Render/Config.hs --- a/src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Render/Config.hs +++ b/src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Render/Config.hs @@ -2,6 +2,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE TypeOperators #-} module Data.Aviation.Casa.AbbreviationsAndAcronyms.Render.Config( Config(..) @@ -66,7 +67,7 @@ instance HasColours Config where colours f (Config c s) = fmap (\c' -> Config c' s) (f c) - + instance HasSpacing Config where spacing f (Config c s) = fmap (\s' -> Config c s') (f s) @@ -165,7 +166,7 @@ ConfigReader Spacing readSpacing = ConfigReader - (^. spacing) + (^. spacing) readSeparatorSpacing :: ConfigReader Int @@ -195,7 +196,7 @@ exactWidthSpacingStandardColours :: (HasShowScore a, HasAcronym a) => [a] - -> Config + -> Config exactWidthSpacingStandardColours x = Config standardColours