pro-abstract 0.1.4.0 → 0.2.0.0

raw patch · 8 files changed

+18/−15 lines, 8 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• changelog.txt +4/−0
• library/pro-abstract/ProAbstract.hs +3/−5
• library/pro-abstract/ProAbstract/Optics.hs +1/−1
• library/pro-abstract/ProAbstract/Structure.hs +1/−1
• library/pro-abstract/ProAbstract/Structure/Block.hs +1/−1
• library/pro-abstract/ProAbstract/Tagless/CanBeTagless.hs +2/−2
• library/pro-abstract/ProAbstract/Tagless/CanHaveTaglessContent.hs +5/−4
• pro-abstract.cabal +1/−1

@@ -14,3 +14,7 @@  v0.1.4.0 - Export BlockTagContent from the ProAbstract module            (mistakenly omitted in v0.1.1.0)++v0.2.0.0 - Remove:+    - prism 'blockTag' -- use 'tagged' instead+    - prism 'paragraph' -- use 'bare' instead

@@ -195,7 +195,7 @@ | 'Inline'              | 'Tagged' 'Lines'      | 'Fragment'            | +-----------------------+-----------------------+-----------------------+ -('Block' also has a third prism, 'paragraph', which is neither fork nor plain.)+('Block' also has a third prism, 'bare', which is neither fork nor plain.)   === Annotation@@ -236,7 +236,7 @@      {- * Blocks -} Block (..), Blocks (..),     {- ** Paragraphs -} Paragraph (..), HasManyParagraphs (..),-    {- ** Tag blocks -} BlockTag (..), blockTag, BlockTagContent (..),+    {- ** Tag blocks -} BlockTag (..), BlockTagContent (..),      {- * Lines -} Inline (..), Line (..), Lines (..),     {- ** Plain text -} Fragment (..), PlainBlock (..),@@ -248,10 +248,8 @@             HasWitherableInlineTags (..), HasWitherableBlockTags (..),      {- * Prisms -}-    {- ** Plain -} Plain, CanBePlain (..),-    {- ** Fork -} Fork, CanFork (..),+    {- ** Plain/fork -} Plain, CanBePlain (..), Fork, CanFork (..),     {- ** Tagged/bare -} tagged, bare, IsTaggedOrBare (..), TaggedOrBare (..),-    {- ** Paragraph -} paragraph,      {- * Metadata -} Metadata (..), HasMetadata (..), HasManyMetadata (..),     {- ** Properties -} properties, hasProperty,

@@ -10,7 +10,7 @@     , metadata, atSetting, hasProperty, properties, settings      -- * Prisms-    , fork, plain, paragraph, blockTag, tagged, bare+    , fork, plain, tagged, bare      -- * Isomorphisms     , taggedOrBare

@@ -4,7 +4,7 @@       Document (..)      -- * Blocks-    , Block (..), paragraph, Blocks (..), BlockTag (..), blockTag, BlockTagContent (..)+    , Block (..), Blocks (..), BlockTag (..), BlockTagContent (..)      -- * Paragraph     , Paragraph (..)

@@ -21,7 +21,7 @@  data Block ann =     BlockPlain     (Tagged (PlainBlock ann)) -- ^ 'ProAbstract.plain'-  | BlockParagraph (Paragraph ann)           -- ^ 'ProAbstract.paragraph'+  | BlockParagraph (Paragraph ann)           -- ^ 'ProAbstract.bare'   | BlockFork      (Tagged (Blocks ann))     -- ^ 'ProAbstract.fork'   deriving stock (Eq, Show, Generic)   deriving anyclass (Hashable, NFData)

@@ -28,9 +28,9 @@ instance CanBeTagless (Inline ann) where     tagless s = plain % tagless s --- | Only a 'paragraph' inline is considered to be plain text, because 'fork' and 'plain' blocks have tags.+-- | Only a 'bare' block is considered to be plain text, because 'fork' and 'plain' blocks have tags. instance CanBeTagless (Block ann) where-    tagless s = paragraph % tagless s+    tagless s = bare % tagless s  instance CanBeTagless (Blocks ann) where     tagless = \case

@@ -12,9 +12,8 @@  instance CanHaveTaglessContent (Block ann) where     taglessContent s =-        (plain % taglessContent @(Tagged (PlainBlock ann)) s) `afailing`-        (fork % taglessContent @(Tagged (Blocks ann)) s) `afailing`-        (paragraph % tagless @(Paragraph ann) s)+        (tagged % taglessContent @(BlockTag ann) s) `afailing`+        (bare % tagless @(Paragraph ann) s)  instance CanHaveTaglessContent (BlockTag ann) where     taglessContent s =@@ -25,7 +24,9 @@     taglessContent = tagless  instance CanHaveTaglessContent (Inline ann) where-    taglessContent s = (plain % tagless s) `afailing` (fork % taglessContent s)+    taglessContent s =+        (plain % tagless s) `afailing`+        (fork % taglessContent s)  instance CanHaveTaglessContent (Lines ann) where     taglessContent = tagless

@@ -1,7 +1,7 @@ cabal-version: 3.0  name: pro-abstract-version: 0.1.4.0+version: 0.2.0.0  category: Language synopsis: Abstract syntax for writing documents