Some small CSS compression improvements

* We now also compress whitespace around commas.
* Remove whitespace around some other operators as well.
* Clarified the code around the separator compression and even improved the code (one case slipped through unnoticed).

1 files changed, 7 insertions, 6 deletions

diff --git a/src/Hakyll/Web/CompressCss.hs b/src/Hakyll/Web/CompressCss.hs
index 0371d8b..9f61534 100644
--- a/src/Hakyll/Web/CompressCss.hs
+++ b/src/Hakyll/Web/CompressCss.hs
@@ -33,14 +33,15 @@ compressCss = compressSeparators . stripComments . compressWhitespace
 compressSeparators :: String -> String
 compressSeparators [] = []
 compressSeparators str
-    | isConstant = head str : retainConstants compressSeparators (head str) (drop 1 str)
+    | isConstant  = head str : retainConstants compressSeparators (head str) (drop 1 str)
     | stripFirst  = compressSeparators (drop 1 str)
     | stripSecond = compressSeparators (head str : (drop 2 str))
     | otherwise   = head str : compressSeparators (drop 1 str)
   where
     isConstant  = or $ map (isOfPrefix str) ["\"", "'"]
-    stripFirst  = or $ map (isOfPrefix str) ["  ", " {", " }", " :", ";;", ";}"]
-    stripSecond = or $ map (isOfPrefix str) ["{ ", "} ", ": ", "; "]
+    stripFirst  = or $ map (isOfPrefix str) $ [";;", ";}"] ++ (map (\c -> " " ++ c) separators)
+    stripSecond = or $ map (isOfPrefix str) $ map (\c -> c ++ " ") separators
+    separators  = [" ", "{", "}", ":", ";", ",", ">", "+", "!"]
 
 --------------------------------------------------------------------------------
 -- | Compresses all whitespace.
@@ -50,7 +51,7 @@ compressWhitespace str
     | isConstant = head str : retainConstants compressWhitespace (head str) (drop 1 str)
     | replaceOne = compressWhitespace (' ' : (drop 1 str))
     | replaceTwo = compressWhitespace (' ' : (drop 2 str))
-    | otherwise = head str : compressWhitespace (drop 1 str)
+    | otherwise  = head str : compressWhitespace (drop 1 str)
   where
     isConstant = or $ map (isOfPrefix str) ["\"", "'"]
     replaceOne = or $ map (isOfPrefix str) ["\t", "\n", "\r"]
@@ -61,9 +62,9 @@ compressWhitespace str
 stripComments :: String -> String
 stripComments [] = []
 stripComments str
-    | isConstant = head str : retainConstants stripComments (head str) (drop 1 str)
+    | isConstant          = head str : retainConstants stripComments (head str) (drop 1 str)
     | isPrefixOf "/*" str = stripComments $ eatComments $ drop 2 str
-    | otherwise = head str : stripComments (drop 1 str)
+    | otherwise           = head str : stripComments (drop 1 str)
   where
     isConstant  = or $ map (isOfPrefix str) ["\"", "'"]
     eatComments str'