Renamed removedLeadingTrailingSpace to trim.

Also removeLeadingSpace to triml,
removeTrailingSpace to trimr.

3 files changed, 5 insertions, 6 deletions

diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs
index a38f57074..70d6a08ea 100644
--- a/src/Text/Pandoc/Writers/Docbook.hs
+++ b/src/Text/Pandoc/Writers/Docbook.hs
@@ -49,7 +49,7 @@ authorToDocbook opts name' =
   in  if ',' `elem` name
          then -- last name first
               let (lastname, rest) = break (==',') name
-                  firstname = removeLeadingSpace rest in
+                  firstname = triml rest in
               inTagsSimple "firstname" (text $ escapeStringForXML firstname) <>
               inTagsSimple "surname" (text $ escapeStringForXML lastname)
          else -- last name last
@@ -74,7 +74,7 @@ writeDocbook opts (Pandoc (Meta tit auths dat) blocks) =
                     else Nothing
       render' = render colwidth
       opts' = if "/book>" `isSuffixOf`
-                      (removeTrailingSpace $ writerTemplate opts)
+                      (trimr $ writerTemplate opts)
                  then opts{ writerChapters = True }
                  else opts
       startLvl = if writerChapters opts' then 0 else 1
diff --git a/src/Text/Pandoc/Writers/EPUB.hs b/src/Text/Pandoc/Writers/EPUB.hs
index 3fac93c05..18e4d402b 100644
--- a/src/Text/Pandoc/Writers/EPUB.hs
+++ b/src/Text/Pandoc/Writers/EPUB.hs
@@ -151,7 +151,7 @@ writeEPUB opts doc@(Pandoc meta _) = do
                            [("id", takeBaseName $ eRelativePath ent),
                             ("href", eRelativePath ent),
                             ("media-type", maybe "" id $ getMimeType $ eRelativePath ent)] $ ()
-  let plainify t = removeTrailingSpace $
+  let plainify t = trimr $
                     writePlain opts'{ writerStandalone = False } $
                     Pandoc meta [Plain t]
   let plainTitle = plainify $ docTitle meta
@@ -289,7 +289,7 @@ transformInlines _ sourceDir picsRef (Image lab (src,tit) : xs) = do
                         return new
   return $ Image lab (newsrc, tit) : xs
 transformInlines (MathML _) _ _ (x@(Math _ _) : xs) = do
-  let writeHtmlInline opts z = removeTrailingSpace $
+  let writeHtmlInline opts z = trimr $
          writeHtmlString opts $ Pandoc (Meta [] [] []) [Plain [z]]
       mathml = writeHtmlInline def{writerHTMLMathMethod = MathML Nothing } x
       fallback = writeHtmlInline def{writerHTMLMathMethod = PlainMath } x
diff --git a/src/Text/Pandoc/Writers/Man.hs b/src/Text/Pandoc/Writers/Man.hs
index bececde25..3a8aa1437 100644
--- a/src/Text/Pandoc/Writers/Man.hs
+++ b/src/Text/Pandoc/Writers/Man.hs
@@ -63,8 +63,7 @@ pandocToMan opts (Pandoc (Meta title authors date) blocks) = do
                                   (text (reverse xs), char d)
                             xs -> (text (reverse xs), doubleQuotes empty)
   let description = hsep $
-                    map (doubleQuotes . text . removeLeadingTrailingSpace) $
-                    splitBy (== '|') rest
+                    map (doubleQuotes . text . trim) $ splitBy (== '|') rest
   body <- blockListToMan opts blocks
   notes <- liftM stNotes get
   notes' <- notesToMan opts (reverse notes)