Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Depend on extensible-exceptions, remove CPP in Templates module.

Browse source 
It's safe to depend on extensible-exceptions, since this is
shipped with GHC 6.10 and 6.12.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1911 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
fiddlosopher 2010-03-19 02:33:15 +00:00
parent bd433b5738
commit 5ae0e0d442
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pandoc.cabal
View file

@ -144,11 +144,12 @@ Library
process >= 1, directory >= 1, process >= 1, directory >= 1,
bytestring >= 0.9, zip-archive >= 0.1.1.4, bytestring >= 0.9, zip-archive >= 0.1.1.4,
utf8-string >= 0.3, old-time >= 1, utf8-string >= 0.3, old-time >= 1,
HTTP >= 4000.0.5, texmath, xml >= 1.3.5 && < 1.4 HTTP >= 4000.0.5, texmath, xml >= 1.3.5 && < 1.4,
extensible-exceptions
if impl(ghc >= 6.10) if impl(ghc >= 6.10)
Build-depends: base >= 4 && < 5, syb Build-depends: base >= 4 && < 5, syb
else else
Build-depends: base >= 3 && < 4, extensible-exceptions Build-depends: base >= 3 && < 4
if flag(highlighting) if flag(highlighting)
Build-depends: highlighting-kate >= 0.2.3 Build-depends: highlighting-kate >= 0.2.3
cpp-options: -D_HIGHLIGHTING cpp-options: -D_HIGHLIGHTING

6
src/Text/Pandoc/Templates.hs
View file

@ -76,13 +76,7 @@ import Text.PrettyPrint (text, Doc)
import Text.XHtml (primHtml, Html) import Text.XHtml (primHtml, Html)
import Data.ByteString.Lazy.UTF8 (ByteString, fromString) import Data.ByteString.Lazy.UTF8 (ByteString, fromString)
import Text.Pandoc.Shared (readDataFile) import Text.Pandoc.Shared (readDataFile)
-- Note: it would be simpler just to use Control.Exception.Extensible
-- for all versions of base, but extensible-exceptions is not in debian.
#if MIN_VERSION_base(4,0,0)
import qualified Control.Exception as E (try, IOException)
#else
import qualified Control.Exception.Extensible as E (try, IOException) import qualified Control.Exception.Extensible as E (try, IOException)
#endif
-- | Get default template for the specified writer. -- | Get default template for the specified writer.
getDefaultTemplate :: (Maybe FilePath) -- ^ User data directory to search first getDefaultTemplate :: (Maybe FilePath) -- ^ User data directory to search first