2c3310a · typeable/pandoc

git.iko.soy/typeable/pandoc

Added Text.Pandoc.Compat.Locale to assist with transition to time 1.5.

commit2c3310a592e33bf4bd4e4a1328efda0d1b6ac218 authorJohn MacFarlane <fiddlosopher@gmail.com> dateFri 19 Dec 2014, 16:13 (12 years ago) parentf72dfc2

7 files changed+19−12

compare with master

unifiedsplit

pandoc.cabal+3−2 src/Text/Pandoc/Compat/Locale.hs+9 src/Text/Pandoc/Readers/Txt2Tags.hs+1−2 src/Text/Pandoc/Shared.hs+1−1 src/Text/Pandoc/Writers/Docx.hs+3−3 src/Text/Pandoc/Writers/EPUB.hs+1−2 src/Text/Pandoc/Writers/OPML.hs+1−2

pandoc.cabal+3−2

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

208208 Default: False

209209

210210Flag network-uri

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

212− Default: True

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

212+ Default: True

213213

214214Library

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

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

339339 Text.Pandoc.ImageSize,

340340 Text.Pandoc.Slides,

341341 Text.Pandoc.Highlighting,

342+ Text.Pandoc.Compat.Locale,

342343 Text.Pandoc.Compat.Monoid,

343344 Text.Pandoc.Compat.Except,

344345 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

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)

5252import Data.Time.LocalTime (getZonedTime)

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

5454import Data.Time.Format (formatTime)

55−import System.Locale (defaultTimeLocale)

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

5656import System.IO.Error (catchIOError)

5757

5858type T2T = ParserT String ParserState (Reader T2TMeta)

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

576576

577577ignoreSpacesCap :: T2T String -> T2T String

578578ignoreSpacesCap 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

115115import qualified Control.Exception as E

116116import Control.Monad (msum, unless)

117117import Text.Pandoc.Pretty (charWidth)

118−import System.Locale (defaultTimeLocale)

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

119119import Data.Time

120120import System.IO (stderr)

121121import System.IO.Temp

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

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

4141import Data.Time.Clock

4242import Data.Time.Format

4343import System.Environment

44−import System.Locale

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

4545import Text.Pandoc.Definition

4646import Text.Pandoc.Generic

4747import Text.Pandoc.ImageSize

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

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

10611061fitToPage (x, y) pageWidth

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

1063− | x > pageWidth =

1064− (pageWidth, round $

1063+ | x > pageWidth =

1064+ (pageWidth, round $

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

10661066 | otherwise = (x, y)

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

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

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

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

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

47−import System.Locale ( defaultTimeLocale )

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

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

4949 , normalizeDate, readDataFile, stringify, warn

5050 , hierarchicalize, fetchItem' )

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

12151215 _ -> []

12161216 go (MetaList xs) = concatMap go xs

12171217 go _ = []

1218−

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

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

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

3939import Text.Pandoc.Pretty

4040import Data.Time

41−import System.Locale (defaultTimeLocale)

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

4242import qualified Text.Pandoc.Builder as B

4343

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

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

8787 | not (null blocks)]

8888 in inTags True "outline" attrs $

8989 vcat (map (elementToOPML opts) rest)

90−