0287530 · typeable/pandoc

git.iko.soy/typeable/pandoc

Powerpoint writer: use `trim` from Shared

Instead of writing my own.

commit0287530a67dca95197ac59f215de84d6518170b6 authorJesse Rosenthal <jrosenthal@jhu.edu> dateTue 27 Feb 2018, 11:28 (9 years ago) parent9abcb4f

2 files changed+2−5

unifiedsplit

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+2−3

@@ -76,7 +76,6 @@ import Data.Maybe (maybeToList, fromMaybe)

7676import Text.Pandoc.Highlighting

7777import qualified Data.Text as T

7878import Control.Applicative ((<|>))

79−import Data.Char (isSpace)

8079import Skylighting

8180

8281data WriterEnv = WriterEnv { envMetadata :: Meta

@@ -855,9 +854,9 @@ replaceAnchor pe = return pe

855854

856855emptyParaElem :: ParaElem -> Bool

857856emptyParaElem (Run _ s) =

858− null $ dropWhile isSpace $ reverse $ dropWhile isSpace $ reverse s

857+ null $ Shared.trim s

859858emptyParaElem (MathElem _ ts) =

860− null $ dropWhile isSpace $ reverse $ dropWhile isSpace $ reverse $ unTeXString ts

859+ null $ Shared.trim $ unTeXString ts

861860emptyParaElem _ = False

862861

863862emptyParagraph :: Paragraph -> Bool

test/Tests/Writers/OOXML.hs−2

@@ -33,12 +33,10 @@ compareXMLBool (Elem myElem) (Elem goodElem) =

3333 elName myElem == elName goodElem &&

3434 elAttribs myElem == elAttribs goodElem &&

3535 and (zipWith compareXMLBool (elContent myElem) (elContent goodElem))

36−

3736compareXMLBool (Text myCData) (Text goodCData) =

3837 cdVerbatim myCData == cdVerbatim goodCData &&

3938 cdData myCData == cdData goodCData &&

4039 cdLine myCData == cdLine goodCData

41−

4240compareXMLBool (CRef myStr) (CRef goodStr) =

4341 myStr == goodStr

4442compareXMLBool _ _ = False