diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index c818df124..396469edd 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -76,7 +76,6 @@ import Data.Maybe (maybeToList, fromMaybe) import Text.Pandoc.Highlighting import qualified Data.Text as T import Control.Applicative ((<|>)) -import Data.Char (isSpace) import Skylighting data WriterEnv = WriterEnv { envMetadata :: Meta @@ -855,9 +854,9 @@ replaceAnchor pe = return pe emptyParaElem :: ParaElem -> Bool emptyParaElem (Run _ s) = - null $ dropWhile isSpace $ reverse $ dropWhile isSpace $ reverse s + null $ Shared.trim s emptyParaElem (MathElem _ ts) = - null $ dropWhile isSpace $ reverse $ dropWhile isSpace $ reverse $ unTeXString ts + null $ Shared.trim $ unTeXString ts emptyParaElem _ = False emptyParagraph :: Paragraph -> Bool diff --git a/test/Tests/Writers/OOXML.hs b/test/Tests/Writers/OOXML.hs index c2601eec8..bdfdea145 100644 --- a/test/Tests/Writers/OOXML.hs +++ b/test/Tests/Writers/OOXML.hs @@ -33,12 +33,10 @@ compareXMLBool (Elem myElem) (Elem goodElem) = elName myElem == elName goodElem && elAttribs myElem == elAttribs goodElem && and (zipWith compareXMLBool (elContent myElem) (elContent goodElem)) - compareXMLBool (Text myCData) (Text goodCData) = cdVerbatim myCData == cdVerbatim goodCData && cdData myCData == cdData goodCData && cdLine myCData == cdLine goodCData - compareXMLBool (CRef myStr) (CRef goodStr) = myStr == goodStr compareXMLBool _ _ = False