From 566536d6a1db7959197bed086c07cd23457ca378 Mon Sep 17 00:00:00 2001 From: Alec Theriault Date: Sat, 7 Jul 2018 20:25:35 -0400 Subject: Support hyperlink labels with inline markup The parser for pictures hasn't been properly adjusted yet. --- haddock-api/src/Haddock/InterfaceFile.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'haddock-api/src/Haddock/InterfaceFile.hs') diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs index 30bd2b9a..8e01a38d 100644 --- a/haddock-api/src/Haddock/InterfaceFile.hs +++ b/haddock-api/src/Haddock/InterfaceFile.hs @@ -434,7 +434,7 @@ instance Binary Example where result <- get bh return (Example expression result) -instance Binary Hyperlink where +instance Binary a => Binary (Hyperlink a) where put_ bh (Hyperlink url label) = do put_ bh url put_ bh label -- cgit v1.2.3 From aeebb79290fb3983271ab9e3fe95dbdae7caccde Mon Sep 17 00:00:00 2001 From: Alec Theriault Date: Fri, 20 Jul 2018 15:02:46 -0700 Subject: Bump version bounds --- CHANGES.md | 2 ++ haddock-api/src/Haddock/InterfaceFile.hs | 2 +- haddock-library/CHANGES.md | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'haddock-api/src/Haddock/InterfaceFile.hs') diff --git a/CHANGES.md b/CHANGES.md index 66703068..8240479f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,8 @@ * Make `--package-version` optional for `--hoogle` (#899) + * Support inline markup in markdown-style links (#875) + ## Changes in version 2.21.0 * Overhaul handling of data declarations in XHTML and LaTeX. Adds support for diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs index 8e01a38d..e1d8dbe1 100644 --- a/haddock-api/src/Haddock/InterfaceFile.hs +++ b/haddock-api/src/Haddock/InterfaceFile.hs @@ -83,7 +83,7 @@ binaryInterfaceMagic = 0xD0Cface -- binaryInterfaceVersion :: Word16 #if (__GLASGOW_HASKELL__ >= 807) && (__GLASGOW_HASKELL__ < 809) -binaryInterfaceVersion = 33 +binaryInterfaceVersion = 34 binaryInterfaceVersionCompatibility :: [Word16] binaryInterfaceVersionCompatibility = [binaryInterfaceVersion] diff --git a/haddock-library/CHANGES.md b/haddock-library/CHANGES.md index 0175b6af..971d8dc7 100644 --- a/haddock-library/CHANGES.md +++ b/haddock-library/CHANGES.md @@ -1,3 +1,7 @@ +## TBA + + * Support inline markup in markdown-style links (#875) + ## Changes in version 1.7.0 * Make `Documentation.Haddock.Parser.Monad` an internal module -- cgit v1.2.3