diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2018-05-20 17:05:23 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2018-05-20 17:05:23 -0700 |
| commit | 81ed7948da805f5143bf829c3d62afbfb63718c8 (patch) | |
| tree | af86213ecf1fc9c414f7dee925b72dbb9fcd9df9 | |
| parent | 41b205f4b089f4f5f94ff01a56aed3e02faa5537 (diff) | |
| download | pandoc-81ed7948da805f5143bf829c3d62afbfb63718c8.tar.gz | |
Use haddock-library 1.6.0.
| -rw-r--r-- | pandoc.cabal | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Haddock.hs | 14 | ||||
| -rw-r--r-- | stack.lts9.yaml | 2 | ||||
| -rw-r--r-- | stack.yaml | 1 |
4 files changed, 4 insertions, 15 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 98f87d1e4..0fe8bdf0f 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -380,7 +380,7 @@ library hslua-module-text >= 0.1.2 && < 0.2, binary >= 0.5 && < 0.10, SHA >= 1.6 && < 1.7, - haddock-library >= 1.1 && < 1.6, + haddock-library >= 1.6 && < 1.7, deepseq >= 1.3 && < 1.5, JuicyPixels >= 3.1.6.1 && < 3.3, Glob >= 0.7 && < 0.10, diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs index 967037e4e..072bab350 100644 --- a/src/Text/Pandoc/Readers/Haddock.hs +++ b/src/Text/Pandoc/Readers/Haddock.hs @@ -44,11 +44,7 @@ readHaddockEither :: ReaderOptions -- ^ Reader options -> String -- ^ String to parse -> Either PandocError Pandoc readHaddockEither _opts = -#if MIN_VERSION_haddock_library(1,2,0) - Right . B.doc . docHToBlocks . _doc . parseParas -#else - Right . B.doc . docHToBlocks . parseParas -#endif + Right . B.doc . docHToBlocks . _doc . parseParas Nothing docHToBlocks :: DocH String Identifier -> Blocks docHToBlocks d' = @@ -68,10 +64,8 @@ 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) @@ -87,7 +81,6 @@ docHToBlocks d' = DocProperty s -> B.codeBlockWith ("",["property","haskell"],[]) (trim s) DocExamples es -> mconcat $ map (\e -> makeExample ">>>" (exampleExpression e) (exampleResult e)) es -#if MIN_VERSION_haddock_library(1,5,0) DocTable H.Table{ tableHeaderRows = headerRows , tableBodyRows = bodyRows } @@ -100,7 +93,6 @@ docHToBlocks d' = colspecs = replicate (maximum (map length body)) (AlignDefault, 0.0) in B.table mempty colspecs header body -#endif where inlineFallback = B.plain $ docHToInlines False d' consolidatePlains = B.fromList . consolidatePlains' . B.toList @@ -133,10 +125,8 @@ 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 @@ -149,9 +139,7 @@ docHToInlines isCode d' = DocAName s -> B.spanWith (s,["anchor"],[]) mempty DocProperty _ -> mempty DocExamples _ -> mempty -#if MIN_VERSION_haddock_library(1,5,0) DocTable _ -> mempty -#endif -- | Create an 'Example', stripping superfluous characters as appropriate makeExample :: String -> String -> [String] -> Blocks diff --git a/stack.lts9.yaml b/stack.lts9.yaml index c4cc3caf7..750f6403f 100644 --- a/stack.lts9.yaml +++ b/stack.lts9.yaml @@ -26,6 +26,6 @@ extra-deps: - pandoc-citeproc-0.14.3.1 - tagsoup-0.14.6 - pandoc-types-1.17.4.2 -- haddock-library-1.5.0.1 +- haddock-library-1.6.0 - texmath-0.11 resolver: lts-9.14 diff --git a/stack.yaml b/stack.yaml index 5f96a78d9..e2af054ee 100644 --- a/stack.yaml +++ b/stack.yaml @@ -22,6 +22,7 @@ extra-deps: - cmark-gfm-0.1.3 - hslua-module-text-0.1.2.1 - texmath-0.11 +- haddock-library-1.6.0 ghc-options: "$locals": -fhide-source-paths -XNoImplicitPrelude resolver: lts-10.10 |