You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.2 KiB
35 lines
1.2 KiB
From 693f9abb184c3d37864114f93d90a82c60f9ad0b Mon Sep 17 00:00:00 2001
|
|
From: Mark Wright <gienah@gentoo.org>
|
|
Date: Mon, 5 Jan 2015 14:35:31 +1100
|
|
Subject: [PATCH] Allow haddock-library 1.2, by calling the
|
|
Documentation.Haddock.Types.MetaDoc record accessor function _doc :: MetaDoc
|
|
mod id -> DocH mod id
|
|
|
|
---
|
|
src/Text/Pandoc/Readers/Haddock.hs | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs
|
|
index 4b46c86..c03382c 100644
|
|
--- a/src/Text/Pandoc/Readers/Haddock.hs
|
|
+++ b/src/Text/Pandoc/Readers/Haddock.hs
|
|
@@ -1,3 +1,4 @@
|
|
+{-# LANGUAGE CPP #-}
|
|
{- |
|
|
Module : Text.Pandoc.Readers.Haddock
|
|
Copyright : Copyright (C) 2013 David Lazar
|
|
@@ -29,7 +30,12 @@ import Debug.Trace (trace)
|
|
readHaddock :: ReaderOptions -- ^ Reader options
|
|
-> String -- ^ String to parse
|
|
-> Pandoc
|
|
-readHaddock opts = B.doc . docHToBlocks . trace' . parseParas
|
|
+readHaddock opts =
|
|
+#if MIN_VERSION_haddock_library(1,2,0)
|
|
+ B.doc . docHToBlocks . trace' . _doc . parseParas
|
|
+#else
|
|
+ B.doc . docHToBlocks . trace' . parseParas
|
|
+#endif
|
|
where trace' x = if readerTrace opts
|
|
then trace (show x) x
|
|
else x
|