787664d · typeable/pandoc

git.iko.soy/typeable/pandoc

Merge pull request #2013 from ShabbyX/master

Derive from Data and Typeable for libpandoc

commit787664d5fc64e934fbd0bda340c0ad31a9704d1b authorJohn MacFarlane <jgm@berkeley.edu> dateThu 19 Mar 2015, 09:16 (12 years ago) parent0a82e7e e952d66

2 files changed+16−11

compare with master

unifiedsplit

src/Text/Pandoc/MediaBag.hs+4−2 src/Text/Pandoc/Options.hs+12−9

src/Text/Pandoc/MediaBag.hs+4−2

@@ -1,4 +1,4 @@

1−{-# LANGUAGE GeneralizedNewtypeDeriving #-}

1+{-# LANGUAGE GeneralizedNewtypeDeriving, DeriveDataTypeable #-}

22{-

@@ -46,13 +46,15 @@ import Text.Pandoc.MIME (MimeType, getMimeTypeDef)

4646import qualified Text.Pandoc.UTF8 as UTF8

4747import Data.Maybe (fromMaybe)

4848import System.IO (stderr)

49+import Data.Data (Data)

50+import Data.Typeable (Typeable)

4951

5052-- | A container for a collection of binary resources, with names and

5153-- mime types. Note that a 'MediaBag' is a Monoid, so 'mempty'

5254-- can be used for an empty 'MediaBag', and '<>' can be used to append

5355-- two 'MediaBag's.

5456newtype MediaBag = MediaBag (M.Map [String] (MimeType, BL.ByteString))

55− deriving (Monoid)

57+ deriving (Monoid, Data, Typeable)

5658

5759instance Show MediaBag where

5860 show bag = "MediaBag " ++ show (mediaDirectory bag)

src/Text/Pandoc/Options.hs+12−9

@@ -1,3 +1,4 @@

1+{-# LANGUAGE DeriveDataTypeable #-}

12{-

@@ -51,6 +52,8 @@ import Data.Default

5152import Text.Pandoc.Highlighting (Style, pygments)

5253import Text.Pandoc.MediaBag (MediaBag)

5354import Data.Monoid

55+import Data.Data (Data)

56+import Data.Typeable (Typeable)

5457

5558-- | Individually selectable syntax extensions.

5659data Extension =

@@ -110,7 +113,7 @@ data Extension =

110113 | Ext_line_blocks -- ^ RST style line blocks

111114 | Ext_epub_html_exts -- ^ Recognise the EPUB extended version of HTML

112115 | Ext_shortcut_reference_links -- ^ Shortcut reference links

113− deriving (Show, Read, Enum, Eq, Ord, Bounded)

116+ deriving (Show, Read, Enum, Eq, Ord, Bounded, Data, Typeable)

114117

115118pandocExtensions :: Set Extension

116119pandocExtensions = Set.fromList

@@ -226,7 +229,7 @@ data ReaderOptions = ReaderOptions{

226229 , readerDefaultImageExtension :: String -- ^ Default extension for images

227230 , readerTrace :: Bool -- ^ Print debugging info

228231 , readerTrackChanges :: TrackChanges

229−} deriving (Show, Read)

232+} deriving (Show, Read, Data, Typeable)

230233

231234instance Default ReaderOptions

232235 where def = ReaderOptions{

@@ -248,7 +251,7 @@ instance Default ReaderOptions

248251-- Writer options

249252--

250253

251−data EPUBVersion = EPUB2 | EPUB3 deriving (Eq, Show, Read)

254+data EPUBVersion = EPUB2 | EPUB3 deriving (Eq, Show, Read, Data, Typeable)

252255

253256data HTMLMathMethod = PlainMath

254257 | LaTeXMathML (Maybe String) -- url of LaTeXMathML.js

@@ -258,18 +261,18 @@ data HTMLMathMethod = PlainMath

258261 | MathML (Maybe String) -- url of MathMLinHTML.js

259262 | MathJax String -- url of MathJax.js

260263 | KaTeX String String -- url of stylesheet and katex.js

261− deriving (Show, Read, Eq)

264+ deriving (Show, Read, Eq, Data, Typeable)

262265

263266data CiteMethod = Citeproc -- use citeproc to render them

264267 | Natbib -- output natbib cite commands

265268 | Biblatex -- output biblatex cite commands

266− deriving (Show, Read, Eq)

269+ deriving (Show, Read, Eq, Data, Typeable)

267270

268271-- | Methods for obfuscating email addresses in HTML.

269272data ObfuscationMethod = NoObfuscation

270273 | ReferenceObfuscation

271274 | JavascriptObfuscation

272− deriving (Show, Read, Eq)

275+ deriving (Show, Read, Eq, Data, Typeable)

273276

274277-- | Varieties of HTML slide shows.

275278data HTMLSlideVariant = S5Slides

@@ -278,13 +281,13 @@ data HTMLSlideVariant = S5Slides

278281 | DZSlides

279282 | RevealJsSlides

280283 | NoSlides

281− deriving (Show, Read, Eq)

284+ deriving (Show, Read, Eq, Data, Typeable)

282285

283286-- | Options for accepting or rejecting MS Word track-changes.

284287data TrackChanges = AcceptChanges

285288 | RejectChanges

286289 | AllChanges

287− deriving (Show, Read, Eq)

290+ deriving (Show, Read, Eq, Data, Typeable)

288291

289292-- | Options for writers

290293data WriterOptions = WriterOptions

@@ -331,7 +334,7 @@ data WriterOptions = WriterOptions

331334 , writerMediaBag :: MediaBag -- ^ Media collected by docx or epub reader

332335 , writerVerbose :: Bool -- ^ Verbose debugging output

333336 , writerLaTeXArgs :: [String] -- ^ Flags to pass to latex-engine

334− } deriving Show

337+ } deriving (Show, Data, Typeable)

335338

336339instance Default WriterOptions where

337340 def = WriterOptions { writerStandalone = False