6d74b35 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Move `metaValueToInlines` to T.P.W.Shared

6d74b35Jesse Rosenthal9 years ago

src/Text/Pandoc/Writers/Docx.hs+1−11

compare with master

unifiedsplit

@@ -1,4 +1,3 @@

1−

2{-# LANGUAGE PatternGuards #-}

1{-# LANGUAGE PatternGuards #-}

3{-# LANGUAGE RankNTypes #-}

2{-# LANGUAGE RankNTypes #-}

4{-# LANGUAGE ScopedTypeVariables #-}

3{-# LANGUAGE ScopedTypeVariables #-}

@@ -65,7 +64,7 @@ import Text.Pandoc.Readers.Docx.StyleMap

65import Text.Pandoc.Shared hiding (Element)

64import Text.Pandoc.Shared hiding (Element)

66import Text.Pandoc.Walk

65import Text.Pandoc.Walk

67import Text.Pandoc.Writers.Math

66import Text.Pandoc.Writers.Math

68−import Text.Pandoc.Writers.Shared (fixDisplayMath)

67+import Text.Pandoc.Writers.Shared (fixDisplayMath, metaValueToInlines)

69import Text.Printf (printf)

68import Text.Printf (printf)

70import Text.TeXMath

69import Text.TeXMath

71import Text.XML.Light as XML

70import Text.XML.Light as XML

@@ -196,15 +195,6 @@ isValidChar (ord -> c)

196 | 0x10000 <= c && c <= 0x10FFFF = True

195 | 0x10000 <= c && c <= 0x10FFFF = True

197 | otherwise = False

196 | otherwise = False

198

197

199−metaValueToInlines :: MetaValue -> [Inline]

200−metaValueToInlines (MetaString s) = [Str s]

201−metaValueToInlines (MetaInlines ils) = ils

202−metaValueToInlines (MetaBlocks bs) = query return bs

203−metaValueToInlines (MetaBool b) = [Str $ show b]

204−metaValueToInlines _ = []

205−

206−

207−

208writeDocx :: (PandocMonad m)

198writeDocx :: (PandocMonad m)

209 => WriterOptions -- ^ Writer options

199 => WriterOptions -- ^ Writer options

210 -> Pandoc -- ^ Document to convert

200 -> Pandoc -- ^ Document to convert

src/Text/Pandoc/Writers/Shared.hs+9

@@ -40,6 +40,7 @@ module Text.Pandoc.Writers.Shared (

40 , fixDisplayMath

41 , unsmartify

42 , gridTable

43+ , metaValueToInlines

43 )

44 )

44where

45where

45import Control.Monad (zipWithM)

46import Control.Monad (zipWithM)

@@ -55,6 +56,7 @@ import qualified Text.Pandoc.Builder as Builder

55import Text.Pandoc.Definition

56import Text.Pandoc.Definition

56import Text.Pandoc.Options

57import Text.Pandoc.Options

57import Text.Pandoc.Pretty

58import Text.Pandoc.Pretty

59+import Text.Pandoc.Walk (query)

58import Text.Pandoc.UTF8 (toStringLazy)

60import Text.Pandoc.UTF8 (toStringLazy)

59import Text.Pandoc.XML (escapeStringForXML)

61import Text.Pandoc.XML (escapeStringForXML)

@@ -308,3 +310,10 @@ gridTable opts blocksToDoc headless aligns widths headers rows = do

308 head'' $$

310 head'' $$

309 body $$

311 body $$

310 border '-' (repeat AlignDefault) widthsInChars

312 border '-' (repeat AlignDefault) widthsInChars

313+

314+metaValueToInlines :: MetaValue -> [Inline]

315+metaValueToInlines (MetaString s) = [Str s]

316+metaValueToInlines (MetaInlines ils) = ils

317+metaValueToInlines (MetaBlocks bs) = query return bs

318+metaValueToInlines (MetaBool b) = [Str $ show b]

319+metaValueToInlines _ = []