d7a19c2 · typeable/pandoc

git.iko.soy/typeable/pandoc

Move the variable pandocVersion from `src/Text/Pandoc.hs` to

`src/Text/Pandoc/Shared.hs`, so that all Writers can access this variable without importing `src/Text/Pandoc.hs`, preventing circular import. * pandoc.hs: Import pandocVersion from `Text.Pandoc.Shared`. * src/Text/Pandoc.hs: Remove the definition of pandocVersion and relevant import. * src/Text/Pandoc/Shared.hs: Add the definition of pandocVersion and relevant import.

commitd7a19c22be073854ea3e2d677913c1d81991b182 authorAlex Vong <alexvong1995@gmail.com> dateFri 25 Sep 2015, 03:54 (11 years ago) parentf5e33e0

3 files changed+10−10

compare with master

unifiedsplit

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

pandoc.hs+1−1

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

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

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

3939 safeRead, headerShift, normalize, err, warn,

40− openURL )

40+ openURL, pandocVersion )

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

4242import Text.Pandoc.XML ( toEntities )

4343import Text.Pandoc.SelfContained ( makeSelfContained )

src/Text/Pandoc.hs−8

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

117117 , writeCustom

118118 -- * Rendering templates and default templates

119119 , module Text.Pandoc.Templates

120− -- * Version

121− , pandocVersion

122120 -- * Miscellaneous

123121 , getReader

124122 , getWriter

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

178176import Data.Aeson

179177import qualified Data.ByteString.Lazy as BL

180178import Data.List (intercalate)

181−import Data.Version (showVersion)

182179import Data.Set (Set)

183180import qualified Data.Set as Set

184181import Text.Parsec

185182import Text.Parsec.Error

186183import 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

192184

193185parseFormatSpec :: String

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

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

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

9292 -- * Safe read

9393 safeRead,

9494 -- * Temp directory

95− withTempDir

95+ withTempDir,

96+ -- * Version

97+ pandocVersion

9698 ) where

9799

98100import Text.Pandoc.Definition

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

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

107109 isLetter, isDigit, isSpace )

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

111+import Data.Version ( showVersion )

109112import qualified Data.Map as M

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

111114 unEscapeString, parseURIReference, isAllowedInURI )

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

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

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

138141import qualified Data.ByteString.Lazy as BL

142+import Paths_pandoc (version)

139143

140144import Codec.Archive.Zip

141145

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

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

166170#endif

167171

172+-- | Version number of pandoc library.

173+pandocVersion :: String

174+pandocVersion = showVersion version

175+

168176--

169177-- List processing

170178--