From c33014ef8bbd27a3ddbd7e85567d38f6523ec6e2 Mon Sep 17 00:00:00 2001 From: Adrian Cochrane Date: Tue, 16 Aug 2022 19:17:57 +1200 Subject: [PATCH] New releases of all hackages! + code tidies. --- README.md | 2 +- src/Data/CSS/Preprocessor/PsuedoClasses.hs | 2 +- src/Data/CSS/Style/Selector/Interpret.hs | 2 +- stylist-traits/stylist-traits.cabal | 4 ++-- stylist.cabal | 9 ++++++++- xml-conduit-stylist/xml-conduit-stylist.cabal | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b6175f4..e0a9fdf 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Haskell Stylist Generic CSS style engine for Haskell, intended to aid the development of new browser engines. -Stylish Haskell implements CSS selection and cascade (but not inheritance) independant of the CSS at-rules and properties understood by the caller. It is intended to ease the development of new browser engines, independant of their output targets. +Haskell Stylist implements CSS selection and cascade (but not inheritance) independant of the CSS at-rules and properties understood by the caller. It is intended to ease the development of new browser engines, independant of their output targets. For more interesting projects see: https://github.io/alcinnz/browser-engine-ganarchy/ diff --git a/src/Data/CSS/Preprocessor/PsuedoClasses.hs b/src/Data/CSS/Preprocessor/PsuedoClasses.hs index 01ab5d7..0e7746d 100644 --- a/src/Data/CSS/Preprocessor/PsuedoClasses.hs +++ b/src/Data/CSS/Preprocessor/PsuedoClasses.hs @@ -9,7 +9,7 @@ import Data.CSS.Syntax.StyleSheet import Data.CSS.Syntax.Selector import Data.CSS.Syntax.Tokens -import Data.Text as Txt hiding (elem) +import Data.Text as Txt import Data.Maybe (fromMaybe, listToMaybe) import Data.HashMap.Lazy as HM import Data.Function ((&)) diff --git a/src/Data/CSS/Style/Selector/Interpret.hs b/src/Data/CSS/Style/Selector/Interpret.hs index b3eddd3..bd36ba3 100644 --- a/src/Data/CSS/Style/Selector/Interpret.hs +++ b/src/Data/CSS/Style/Selector/Interpret.hs @@ -15,7 +15,7 @@ import Data.Maybe import Data.Bits (xor) -- For pseudoclasses -import Data.CSS.Syntax.Selector (parseSelectors, PropertyFunc(..)) +import Data.CSS.Syntax.Selector (parseSelectors) import Data.CSS.Syntax.Tokens (Token(..), NumericValue(..)) -- | A compiled(?) CSS selector. diff --git a/stylist-traits/stylist-traits.cabal b/stylist-traits/stylist-traits.cabal index 31bc34a..f8198a8 100644 --- a/stylist-traits/stylist-traits.cabal +++ b/stylist-traits/stylist-traits.cabal @@ -13,10 +13,10 @@ name: stylist-traits version: 0.1.0.0 -- A short (one-line) description of the package. -synopsis: Traits, datatypes, & parsers for Haskell Stylist (so other hackages can avoid depending directly on stylist) +synopsis: Traits, datatypes, & parsers for Haskell Stylist -- A longer description of the package. --- description: +description: Decoupling layer for Haskell Stylist, so other modules don't have to pull in the full CSS engine in order to integrate it. -- URL for the project homepage or repository. homepage: https://rhapsode.adrian.geek.nz/ diff --git a/stylist.cabal b/stylist.cabal index 0f5f423..52618bd 100644 --- a/stylist.cabal +++ b/stylist.cabal @@ -10,7 +10,7 @@ name: stylist -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -version: 2.4.0.1 +version: 2.5.0.0 -- A short (one-line) description of the package. synopsis: Apply CSS styles to a document tree. @@ -82,6 +82,13 @@ library ghc-options: -Wall test-suite test-stylist + other-modules: + Data.CSS.Preprocessor.Conditions, Data.CSS.Preprocessor.Conditions.Expr, Data.CSS.Preprocessor.Text, + Data.CSS.Style.Cascade, Data.CSS.Style.Common, Data.CSS.Style.Importance, + Data.CSS.Style.Selector.Index, Data.CSS.Style.Selector.Interpret, + Data.CSS.Style.Selector.LowerWhere, Data.CSS.Style.Selector.Specificity, + Data.CSS.StyleTree, Data.CSS.Syntax.AtLayer + hs-source-dirs: src test default-language: Haskell2010 type: exitcode-stdio-1.0 diff --git a/xml-conduit-stylist/xml-conduit-stylist.cabal b/xml-conduit-stylist/xml-conduit-stylist.cabal index 004b213..cb932f0 100644 --- a/xml-conduit-stylist/xml-conduit-stylist.cabal +++ b/xml-conduit-stylist/xml-conduit-stylist.cabal @@ -10,7 +10,7 @@ name: xml-conduit-stylist -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -version: 2.3.0.0 +version: 3.0.0.0 -- A short (one-line) description of the package. synopsis: Bridge between xml-conduit/html-conduit and stylist -- 2.30.2