diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Readers/Haddock.hs | 15 | 
1 files changed, 1 insertions, 14 deletions
| diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs index 8e06d1e00..072bab350 100644 --- a/src/Text/Pandoc/Readers/Haddock.hs +++ b/src/Text/Pandoc/Readers/Haddock.hs @@ -44,13 +44,7 @@ readHaddockEither :: ReaderOptions -- ^ Reader options                    -> String        -- ^ String to parse                    -> Either PandocError Pandoc  readHaddockEither _opts = -#if MIN_VERSION_haddock_library(1,6,0)    Right . B.doc . docHToBlocks . _doc . parseParas Nothing -#elif MIN_VERSION_haddock_library(1,2,0) -  Right . B.doc . docHToBlocks . _doc . parseParas -#else -  Right .  B.doc . docHToBlocks . parseParas -#endif  docHToBlocks :: DocH String Identifier -> Blocks  docHToBlocks d' = @@ -70,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) @@ -89,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                      } @@ -102,7 +93,7 @@ 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          consolidatePlains' zs@(Plain _ : _) = @@ -134,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 @@ -150,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 | 
