4aabcf3 · typeable/pandoc

pandoc.hs+1−1

compare with master

unifiedsplit

@@ -37,7 +37,7 @@ import Text.Pandoc.Walk (walk)

37import Text.Pandoc.Readers.LaTeX (handleIncludes)

38import Text.Pandoc.Shared ( tabFilter, readDataFileUTF8, readDataFile,

39 safeRead, headerShift, normalize, err, warn,

40− openURL )

40+ openURL, pandocVersion )

41import Text.Pandoc.MediaBag ( mediaDirectory, extractMediaBag, MediaBag )

42import Text.Pandoc.XML ( toEntities )

43import Text.Pandoc.SelfContained ( makeSelfContained )

src/Text/Pandoc.hs−8

@@ -117,8 +117,6 @@ module Text.Pandoc

117 , writeCustom

118 -- * Rendering templates and default templates

119 , module Text.Pandoc.Templates

120− -- * Version

121− , pandocVersion

122 -- * Miscellaneous

120 -- * Miscellaneous

123 , getReader

121 , getReader

124 , getWriter

122 , getWriter

@@ -178,17 +176,11 @@ import Text.Pandoc.Error

178import Data.Aeson

176import Data.Aeson

179import qualified Data.ByteString.Lazy as BL

177import qualified Data.ByteString.Lazy as BL

180import Data.List (intercalate)

178import Data.List (intercalate)

181−import Data.Version (showVersion)

182import Data.Set (Set)

179import Data.Set (Set)

183import qualified Data.Set as Set

180import qualified Data.Set as Set

184import Text.Parsec

181import Text.Parsec

185import Text.Parsec.Error

182import Text.Parsec.Error

186import qualified Text.Pandoc.UTF8 as UTF8

183import qualified Text.Pandoc.UTF8 as UTF8

187−import Paths_pandoc (version)

188−

189−-- | Version number of pandoc library.

190−pandocVersion :: String

191−pandocVersion = showVersion version

192

184

193parseFormatSpec :: String

185parseFormatSpec :: String

194 -> Either ParseError (String, Set Extension -> Set Extension)

186 -> Either ParseError (String, Set Extension -> Set Extension)

src/Text/Pandoc/Shared.hs+9−1

@@ -92,7 +92,9 @@ module Text.Pandoc.Shared (

92 -- * Safe read

93 safeRead,

94 -- * Temp directory

95− withTempDir

95+ withTempDir,

96+ -- * Version

97+ pandocVersion

96 ) where

98 ) where

97

99

98import Text.Pandoc.Definition

100import Text.Pandoc.Definition

@@ -106,6 +108,7 @@ import System.Exit (exitWith, ExitCode(..))

106import Data.Char ( toLower, isLower, isUpper, isAlpha,

108import Data.Char ( toLower, isLower, isUpper, isAlpha,

107 isLetter, isDigit, isSpace )

109 isLetter, isDigit, isSpace )

108import Data.List ( find, stripPrefix, intercalate )

110import Data.List ( find, stripPrefix, intercalate )

111+import Data.Version ( showVersion )

109import qualified Data.Map as M

112import qualified Data.Map as M

110import Network.URI ( escapeURIString, isURI, nonStrictRelativeTo,

113import Network.URI ( escapeURIString, isURI, nonStrictRelativeTo,

111 unEscapeString, parseURIReference, isAllowedInURI )

114 unEscapeString, parseURIReference, isAllowedInURI )

@@ -136,6 +139,7 @@ import Data.Sequence (ViewR(..), ViewL(..), viewl, viewr)

136import qualified Data.Text as T (toUpper, pack, unpack)

139import qualified Data.Text as T (toUpper, pack, unpack)

137import Data.ByteString.Lazy (toChunks, fromChunks)

140import Data.ByteString.Lazy (toChunks, fromChunks)

138import qualified Data.ByteString.Lazy as BL

141import qualified Data.ByteString.Lazy as BL

142+import Paths_pandoc (version)

139

143

140import Codec.Archive.Zip

144import Codec.Archive.Zip

141

145

@@ -165,6 +169,10 @@ import Network.HTTP (findHeader, rspBody,

165import Network.Browser (browse, setAllowRedirects, setOutHandler, request)

169import Network.Browser (browse, setAllowRedirects, setOutHandler, request)

166#endif

170#endif

167

171

172+-- | Version number of pandoc library.

173+pandocVersion :: String

174+pandocVersion = showVersion version

175+

168--

176--

169-- List processing

177-- List processing

170--

178--

src/Text/Pandoc/Writers/Man.hs+2

@@ -85,6 +85,8 @@ pandocToMan opts (Pandoc meta blocks) = do

85 let context = defField "body" main

86 $ setFieldsFromTitle

87 $ defField "has-tables" hasTables

88+ $ defField "hyphenate" True

89+ $ defField "pandoc-version" pandocVersion

88 $ metadata

90 $ metadata

89 if writerStandalone opts

91 if writerStandalone opts

90 then return $ renderTemplate' (writerTemplate opts) context

92 then return $ renderTemplate' (writerTemplate opts) context