dc597a8 · typeable/pandoc

git.iko.soy/typeable/pandoc

Removed all dependencies on 'pretty' package.

commitdc597a8a68eff403d6e800a62ab93548adcc6f41 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 22 Dec 2010, 11:48 (16 years ago) parent8e9c490

2 files changed+2−6

unifiedsplit

pandoc.cabal+2−2

@@ -165,7 +165,7 @@ Library

165165 -- Note: the following material must be in both Library and Executable stanzas.

166166 -- It needs to be duplicated because of the library & executable flags.

167167 -- BEGIN DUPLICATED SECTION

168− Build-Depends: pretty >= 1, containers >= 0.1,

168+ Build-Depends: containers >= 0.1,

169169 parsec >= 2.1, xhtml >= 3000.0,

170170 mtl >= 1.1, network >= 2, filepath >= 1.1,

171171 process >= 1, directory >= 1,

@@ -238,7 +238,7 @@ Executable pandoc

238238 -- Note: the following material must be in both Library and Executable stanzas.

239239 -- It needs to be duplicated because of the library & executable flags.

240240 -- BEGIN DUPLICATED SECTION

241− Build-Depends: pretty >= 1, containers >= 0.1,

241+ Build-Depends: containers >= 0.1,

242242 parsec >= 2.1, xhtml >= 3000.0,

243243 mtl >= 1.1, network >= 2, filepath >= 1.1,

244244 process >= 1, directory >= 1,

src/Text/Pandoc/Templates.hs−4

@@ -72,7 +72,6 @@ import Text.ParserCombinators.Parsec

7272import Control.Monad (liftM, when, forM)

7373import System.FilePath

7474import Data.List (intercalate, intersperse)

75−import Text.PrettyPrint (text, Doc)

7675import Text.XHtml (primHtml, Html)

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

7877import Text.Pandoc.Shared (readDataFile)

@@ -112,9 +111,6 @@ instance TemplateTarget ByteString where

112111instance TemplateTarget Html where

113112 toTarget = primHtml

114113

115−instance TemplateTarget Doc where

116− toTarget = text

117−

118114-- | Renders a template

119115renderTemplate :: TemplateTarget a

120116 => [(String,String)] -- ^ Assoc. list of values for variables