2c3310a · typeable/pandoc

pandoc.cabal+3−2

compare with master

unifiedsplit

@@ -208,8 +208,8 @@ Flag make-pandoc-man-pages

208 Default: False

209

210Flag network-uri

211− Description: Get Network.URI from the network-uri package

211+ Description: Get Network.URI from the network-uri package

212− Default: True

212+ Default: True

213

214Library

215 Build-Depends: base >= 4.2 && <5,

@@ -339,6 +339,7 @@ Library

339 Text.Pandoc.ImageSize,

340 Text.Pandoc.Slides,

341 Text.Pandoc.Highlighting,

342+ Text.Pandoc.Compat.Locale,

342 Text.Pandoc.Compat.Monoid,

343 Text.Pandoc.Compat.Monoid,

343 Text.Pandoc.Compat.Except,

344 Text.Pandoc.Compat.Except,

344 Text.Pandoc.Compat.TagSoupEntity,

345 Text.Pandoc.Compat.TagSoupEntity,

src/Text/Pandoc/Compat/Locale.hsnew file+9

@@ -0,0 +1,9 @@

1+{-# LANGUAGE CPP #-}

2+module Text.Pandoc.Compat.Locale ( defaultTimeLocale )

3+where

4+

5+#if MIN_VERSION_time(1,5,0)

6+import Data.Time.Format ( defaultTimeLocale )

7+#else

8+import System.Locale ( defaultTimeLocale )

9+#endif

src/Text/Pandoc/Readers/Txt2Tags.hs+1−2

@@ -52,7 +52,7 @@ import Control.Monad.Reader (Reader, runReader, asks)

52import Data.Time.LocalTime (getZonedTime)

53import Text.Pandoc.Compat.Directory(getModificationTime)

54import Data.Time.Format (formatTime)

55−import System.Locale (defaultTimeLocale)

55+import Text.Pandoc.Compat.Locale (defaultTimeLocale)

56import System.IO.Error (catchIOError)

57

58type T2T = ParserT String ParserState (Reader T2TMeta)

@@ -576,4 +576,3 @@ atStart = (sourceColumn <$> getPosition) >>= guard . (== 1)

576

577ignoreSpacesCap :: T2T String -> T2T String

578ignoreSpacesCap p = map toLower <$> (spaces *> p <* spaces)

579−

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

@@ -115,7 +115,7 @@ import qualified Control.Monad.State as S

115import qualified Control.Exception as E

116import Control.Monad (msum, unless)

117import Text.Pandoc.Pretty (charWidth)

118−import System.Locale (defaultTimeLocale)

118+import Text.Pandoc.Compat.Locale (defaultTimeLocale)

119import Data.Time

120import System.IO (stderr)

121import System.IO.Temp

src/Text/Pandoc/Writers/Docx.hs+3−3

@@ -41,7 +41,7 @@ import Data.Time.Clock.POSIX

41import Data.Time.Clock

42import Data.Time.Format

43import System.Environment

44−import System.Locale

44+import Text.Pandoc.Compat.Locale (defaultTimeLocale)

45import Text.Pandoc.Definition

46import Text.Pandoc.Generic

47import Text.Pandoc.ImageSize

@@ -1060,7 +1060,7 @@ parseXml refArchive distArchive relpath =

1060fitToPage :: (Integer, Integer) -> Integer -> (Integer, Integer)

1061fitToPage (x, y) pageWidth

1062 -- Fixes width to the page width and scales the height

1063− | x > pageWidth =

1063+ | x > pageWidth =

1064− (pageWidth, round $

1064+ (pageWidth, round $

1065 ((fromIntegral pageWidth) / ((fromIntegral :: Integer -> Double) x)) * (fromIntegral y))

1066 | otherwise = (x, y)

src/Text/Pandoc/Writers/EPUB.hs+1−2

@@ -44,7 +44,7 @@ import Codec.Archive.Zip ( emptyArchive, addEntryToArchive, eRelativePath, fromE

44import Control.Applicative ((<$>))

45import Data.Time.Clock.POSIX ( getPOSIXTime )

46import Data.Time (getCurrentTime,UTCTime, formatTime)

47−import System.Locale ( defaultTimeLocale )

47+import Text.Pandoc.Compat.Locale ( defaultTimeLocale )

48import Text.Pandoc.Shared ( trimr, renderTags', safeRead, uniqueIdent, trim

49 , normalizeDate, readDataFile, stringify, warn

50 , hierarchicalize, fetchItem' )

@@ -1215,4 +1215,3 @@ docTitle' meta = fromMaybe [] $ go <$> lookupMeta "title" meta

1215 _ -> []

1216 go (MetaList xs) = concatMap go xs

1217 go _ = []

1218−

src/Text/Pandoc/Writers/OPML.hs+1−2

@@ -38,7 +38,7 @@ import Text.Pandoc.Writers.HTML (writeHtmlString)

38import Text.Pandoc.Writers.Markdown (writeMarkdown)

39import Text.Pandoc.Pretty

40import Data.Time

41−import System.Locale (defaultTimeLocale)

41+import Text.Pandoc.Compat.Locale (defaultTimeLocale)

42import qualified Text.Pandoc.Builder as B

43

44-- | Convert Pandoc document to string in OPML format.

@@ -87,4 +87,3 @@ elementToOPML opts (Sec _ _num _ title elements) =

87 | not (null blocks)]

88 in inTags True "outline" attrs $

89 vcat (map (elementToOPML opts) rest)

90−