Remove CPP from default-extensions; add pragmas to modules as needed.
This commit is contained in:
parent
5050cff37c
commit
2d6e0b1530
5 changed files with 4 additions and 10 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
{-# LANGUAGE CPP #-}
|
||||||
-- Create pandoc.1 man and pandoc_markdown.5 man pages from README
|
-- Create pandoc.1 man and pandoc_markdown.5 man pages from README
|
||||||
import Text.Pandoc
|
import Text.Pandoc
|
||||||
import qualified Text.Pandoc.UTF8 as UTF8
|
import qualified Text.Pandoc.UTF8 as UTF8
|
||||||
|
|
|
@ -277,7 +277,6 @@ Library
|
||||||
Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
|
Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
|
||||||
Ghc-Prof-Options: -auto-all -caf-all -rtsopts
|
Ghc-Prof-Options: -auto-all -caf-all -rtsopts
|
||||||
Default-Language: Haskell98
|
Default-Language: Haskell98
|
||||||
Default-Extensions: CPP
|
|
||||||
Other-Extensions: PatternGuards, OverloadedStrings,
|
Other-Extensions: PatternGuards, OverloadedStrings,
|
||||||
ScopedTypeVariables, GeneralizedNewtypeDeriving,
|
ScopedTypeVariables, GeneralizedNewtypeDeriving,
|
||||||
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
|
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
|
||||||
|
@ -357,7 +356,6 @@ Executable pandoc
|
||||||
if os(windows)
|
if os(windows)
|
||||||
Cpp-options: -D_WINDOWS
|
Cpp-options: -D_WINDOWS
|
||||||
Default-Language: Haskell98
|
Default-Language: Haskell98
|
||||||
Default-Extensions: CPP
|
|
||||||
Other-Extensions: PatternGuards, OverloadedStrings,
|
Other-Extensions: PatternGuards, OverloadedStrings,
|
||||||
ScopedTypeVariables, GeneralizedNewtypeDeriving,
|
ScopedTypeVariables, GeneralizedNewtypeDeriving,
|
||||||
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
|
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
|
||||||
|
@ -377,7 +375,6 @@ Executable make-pandoc-man-pages
|
||||||
old-time >= 1.0 && < 1.2,
|
old-time >= 1.0 && < 1.2,
|
||||||
time >= 1.2 && < 1.5
|
time >= 1.2 && < 1.5
|
||||||
Default-Language: Haskell98
|
Default-Language: Haskell98
|
||||||
Default-Extensions: CPP
|
|
||||||
|
|
||||||
Test-Suite test-pandoc
|
Test-Suite test-pandoc
|
||||||
Type: exitcode-stdio-1.0
|
Type: exitcode-stdio-1.0
|
||||||
|
@ -415,7 +412,6 @@ Test-Suite test-pandoc
|
||||||
Tests.Writers.LaTeX
|
Tests.Writers.LaTeX
|
||||||
Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
|
Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
|
||||||
Default-Language: Haskell98
|
Default-Language: Haskell98
|
||||||
Default-Extensions: CPP
|
|
||||||
|
|
||||||
benchmark benchmark-pandoc
|
benchmark benchmark-pandoc
|
||||||
Type: exitcode-stdio-1.0
|
Type: exitcode-stdio-1.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
|
{-# LANGUAGE GeneralizedNewtypeDeriving, CPP #-}
|
||||||
{-
|
{-
|
||||||
Copyright (C) 2010 John MacFarlane <jgm@berkeley.edu>
|
Copyright (C) 2010 John MacFarlane <jgm@berkeley.edu>
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{-# LANGUAGE CPP #-}
|
||||||
{-
|
{-
|
||||||
Copyright (C) 2010 John MacFarlane <jgm@berkeley.edu>
|
Copyright (C) 2010 John MacFarlane <jgm@berkeley.edu>
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{-# LANGUAGE PatternGuards #-}
|
{-# LANGUAGE PatternGuards, CPP #-}
|
||||||
{-
|
{-
|
||||||
Copyright (C) 2010 John MacFarlane <jgm@berkeley.edu>
|
Copyright (C) 2010 John MacFarlane <jgm@berkeley.edu>
|
||||||
|
|
||||||
|
@ -62,11 +62,7 @@ import Text.Pandoc.MIME (getMimeType)
|
||||||
import Prelude hiding (catch)
|
import Prelude hiding (catch)
|
||||||
#endif
|
#endif
|
||||||
import Control.Exception (catch, SomeException)
|
import Control.Exception (catch, SomeException)
|
||||||
#if MIN_VERSION_blaze_html(0,5,0)
|
|
||||||
import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
|
import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
|
||||||
#else
|
|
||||||
import Text.Blaze.Renderer.Utf8 (renderHtml)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-- A Chapter includes a list of blocks and maybe a section
|
-- A Chapter includes a list of blocks and maybe a section
|
||||||
-- number offset. Note, some chapters are unnumbered. The section
|
-- number offset. Note, some chapters are unnumbered. The section
|
||||||
|
|
Loading…
Add table
Reference in a new issue