5ae0e0d · typeable/pandoc

git.iko.soy/typeable/pandoc

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

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

commit5ae0e0d442f643ddd5a5a5e378f994e868b6d92d authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateFri 19 Mar 2010, 02:33 (17 years ago) parentbd433b5

2 files changed+3−8

compare with master

unifiedsplit

pandoc.cabal+3−2 src/Text/Pandoc/Templates.hs−6

pandoc.cabal+3−2

@@ -144,11 +144,12 @@ Library

144144 process >= 1, directory >= 1,

145145 bytestring >= 0.9, zip-archive >= 0.1.1.4,

146146 utf8-string >= 0.3, old-time >= 1,

147− HTTP >= 4000.0.5, texmath, xml >= 1.3.5 && < 1.4

147+ HTTP >= 4000.0.5, texmath, xml >= 1.3.5 && < 1.4,

148+ extensible-exceptions

148149 if impl(ghc >= 6.10)

149150 Build-depends: base >= 4 && < 5, syb

150151 else

151− Build-depends: base >= 3 && < 4, extensible-exceptions

152+ Build-depends: base >= 3 && < 4

152153 if flag(highlighting)

153154 Build-depends: highlighting-kate >= 0.2.3

154155 cpp-options: -D_HIGHLIGHTING

src/Text/Pandoc/Templates.hs−6

@@ -76,13 +76,7 @@ import Text.PrettyPrint (text, Doc)

7676import Text.XHtml (primHtml, Html)

7777import Data.ByteString.Lazy.UTF8 (ByteString, fromString)

7878import Text.Pandoc.Shared (readDataFile)

79−-- Note: it would be simpler just to use Control.Exception.Extensible

80−-- for all versions of base, but extensible-exceptions is not in debian.

81−#if MIN_VERSION_base(4,0,0)

82−import qualified Control.Exception as E (try, IOException)

83−#else

8479import qualified Control.Exception.Extensible as E (try, IOException)

85−#endif

8680

8781-- | Get default template for the specified writer.

8882getDefaultTemplate :: (Maybe FilePath) -- ^ User data directory to search first