Move black and white to the Color module

Author: sharkdp

docs/Color.md

@@ -67,6 +67,22 @@ hsl :: Number -> Number -> Number -> Color
 
 Create a `Color` from hue, saturation, lightness and alpha values.
 
+#### `black`
+
+``` purescript
+black :: Color
+```
+
+The color black.
+
+#### `white`
+
+``` purescript
+white :: Color
+```
+
+The color white.
+
 #### `grayscale`
 
 ``` purescript

docs/Color/Scheme/HTML.md

@@ -1,7 +1,8 @@
 ## Module Color.Scheme.HTML
 
-Sixteen named colors from the HTML 4.01 specification.
-https://www.w3.org/TR/REC-html40/types.html#h-6.5
+Sixteen named colors from the HTML 4.01 specification (except black and
+white).
+See: https://www.w3.org/TR/REC-html40/types.html#h-6.5
 
 
 ### Re-exported from Color.Scheme.X11:
@@ -12,12 +13,6 @@ https://www.w3.org/TR/REC-html40/types.html#h-6.5
 aqua :: Color
 ```
 
-#### `black`
-
-``` purescript
-black :: Color
-```
-
 #### `blue`
 
 ``` purescript
@@ -90,12 +85,6 @@ silver :: Color
 teal :: Color
 ```
 
-#### `white`
-
-``` purescript
-white :: Color
-```
-
 #### `yellow`
 
 ``` purescript

docs/Color/Scheme/X11.md

@@ -1,7 +1,8 @@
 ## Module Color.Scheme.X11
 
-X11 colors as specified by the CSS3 specification.
-https://www.w3.org/TR/css3-color/#svg-color
+X11 colors as specified by the CSS3 specification (except black and
+white).
+See: https://www.w3.org/TR/css3-color/#svg-color
 
 #### `aliceblue`
 
@@ -45,12 +46,6 @@ beige :: Color
 bisque :: Color
 ```
 
-#### `black`
-
-``` purescript
-black :: Color
-```
-
 #### `blanchedalmond`
 
 ``` purescript
@@ -861,12 +856,6 @@ violet :: Color
 wheat :: Color
 ```
 
-#### `white`
-
-``` purescript
-white :: Color
-```
-
 #### `whitesmoke`
 
 ``` purescript

src/Color.purs

@@ -8,6 +8,8 @@ module Color
   , rgb'
   , hsla
   , hsl
+  , black
+  , white
   , grayscale
   , toHSLA
   , toRGBA
@@ -106,6 +108,14 @@ hsla = HSLA
 hsl :: Number -> Number -> Number -> Color
 hsl h s l = HSLA h s l 1.0
 
+-- | The color black.
+black :: Color
+black = hsl 0.0 0.0 0.0
+
+-- | The color white.
+white :: Color
+white = hsl 0.0 0.0 1.0
+
 -- | Create a gray tone from a lightness values (0.0 is black, 1.0 is white).
 grayscale :: Number -> Color
 grayscale l = hsl 0.0 0.0 l

src/Color/Scheme/HTML.purs

@@ -1,9 +1,10 @@
--- | Sixteen named colors from the HTML 4.01 specification.
--- | https://www.w3.org/TR/REC-html40/types.html#h-6.5
+-- | Sixteen named colors from the HTML 4.01 specification (except black and
+-- | white).
+-- | See: https://www.w3.org/TR/REC-html40/types.html#h-6.5
+
 module Color.Scheme.HTML
   (module Color.Scheme.X11
   ) where
 
-import Color.Scheme.X11 (black, silver, gray, white, maroon, red, purple,
-                         fuchsia, green, lime, olive, yellow, navy, blue, teal,
-                         aqua)
+import Color.Scheme.X11 (silver, gray, maroon, red, purple, fuchsia, green,
+                         lime, olive, yellow, navy, blue, teal, aqua)

src/Color/Scheme/X11.purs

@@ -1,5 +1,7 @@
--- | X11 colors as specified by the CSS3 specification.
--- | https://www.w3.org/TR/css3-color/#svg-color
+-- | X11 colors as specified by the CSS3 specification (except black and
+-- | white).
+-- | See: https://www.w3.org/TR/css3-color/#svg-color
+
 module Color.Scheme.X11 where
 
 import Color (Color(), rgb)
@@ -25,9 +27,6 @@ beige = rgb 245 245 220
 bisque :: Color
 bisque = rgb 255 228 196
 
-black :: Color
-black = rgb 0 0 0
-
 blanchedalmond :: Color
 blanchedalmond = rgb 255 235 205
 
@@ -433,9 +432,6 @@ violet = rgb 238 130 238
 wheat :: Color
 wheat = rgb 245 222 179
 
-white :: Color
-white = rgb 255 255 255
-
 whitesmoke :: Color
 whitesmoke = rgb 245 245 245
 

test/Interactive.purs

@@ -52,6 +52,8 @@ main = do
     doc "rgba" $
       (\(Int255 r) (Int255 g) (Int255 b) (Number1 a) -> TColor (rgba r g b a))
     doc "cssStringHSLA" (\(TColor c) -> cssStringHSLA c)
+    doc "black" (TColor black)
+    doc "white" (TColor white)
     doc "grayscale" (\(Number1 s) -> TColor (grayscale s))
     doc "complementary" (\(TColor c) -> TColor (complementary c))
     doc "lighten"    (\(Number1 a) (TColor c) -> TColor (lighten a c))
@@ -92,7 +94,6 @@ main = do
     docx11 "azure" (TColor azure)
     docx11 "beige" (TColor beige)
     docx11 "bisque" (TColor bisque)
-    docx11 "black" (TColor black)
     docx11 "blanchedalmond" (TColor blanchedalmond)
     docx11 "blue" (TColor blue)
     docx11 "blueviolet" (TColor blueviolet)
@@ -228,7 +229,6 @@ main = do
     docx11 "turquoise" (TColor turquoise)
     docx11 "violet" (TColor violet)
     docx11 "wheat" (TColor wheat)
-    docx11 "white" (TColor white)
     docx11 "whitesmoke" (TColor whitesmoke)
     docx11 "yellow" (TColor yellow)
     docx11 "yellowgreen" (TColor yellowgreen)