diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-07-15 12:04:00 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-07-15 12:04:00 -0700 |
| commit | d7396e73b4ca72d607836cd285be845a85ca6a9b (patch) | |
| tree | 87525c96f1758893fe7d6c1f91a5b356d18efff1 | |
| parent | 17defd5004cec576a1b481b76c59545067e68663 (diff) | |
| download | pandoc-d7396e73b4ca72d607836cd285be845a85ca6a9b.tar.gz | |
Don't require haddock-library 1.4.
Instead use CPP to work around version differences.
| -rw-r--r-- | pandoc.cabal | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Haddock.hs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 82d8d3d95..140390c98 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -283,7 +283,7 @@ Library hslua >= 0.3 && < 0.5, binary >= 0.5 && < 0.9, SHA >= 1.6 && < 1.7, - haddock-library >= 1.4 && < 1.5, + haddock-library >= 1.1 && < 1.5, old-time, deepseq >= 1.3 && < 1.5, JuicyPixels >= 3.1.6.1 && < 3.3, diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs index f0521e6f7..99deac3c2 100644 --- a/src/Text/Pandoc/Readers/Haddock.hs +++ b/src/Text/Pandoc/Readers/Haddock.hs @@ -60,8 +60,10 @@ docHToBlocks d' = DocEmphasis _ -> inlineFallback DocMonospaced _ -> inlineFallback DocBold _ -> inlineFallback +#if MIN_VERSION_haddock_library(1,4,0) DocMathInline _ -> inlineFallback DocMathDisplay _ -> inlineFallback +#endif DocHeader h -> B.header (headerLevel h) (docHToInlines False $ headerTitle h) DocUnorderedList items -> B.bulletList (map docHToBlocks items) @@ -109,8 +111,10 @@ docHToInlines isCode d' = DocMonospaced (DocString s) -> B.code s DocMonospaced d -> docHToInlines True d DocBold d -> B.strong (docHToInlines isCode d) +#if MIN_VERSION_haddock_library(1,4,0) DocMathInline s -> B.math s DocMathDisplay s -> B.displayMath s +#endif DocHeader _ -> mempty DocUnorderedList _ -> mempty DocOrderedList _ -> mempty |