Regenerate color images, update SVG colors. Update hspec setup

lehins · Jun 19, 2021 · 504d3f8 · 504d3f8
1 parent 937b0bd
commit 504d3f8
Show file tree

Hide file tree

Showing 152 changed files with 151 additions and 150 deletions.
diff --git a/Color/Color.cabal b/Color/Color.cabal
@@ -185,6 +185,7 @@ benchmark conversion
   ghc-options:         -Wall
                        -threaded
                        -O2
+  build-tool-depends:  hspec-discover:hspec-discover
   build-depends:       base
                      , criterion
                      , Color

diff --git a/Color/files/mkStdSVGModule b/Color/files/mkStdSVGModule
@@ -89,7 +89,7 @@ instance StandardColor SVG "{name_lower}" where color _ = convert {name}
 -- >>> import Codec.Picture as JP
 -- >>> import Codec.Picture.Png (writePng)
 -- >>> let ColorSRGB r g b = {name}
--- >>> let img = JP.generateImage (\_ _ -> JP.PixelRGB8 r g b) 200 29
+-- >>> let img = JP.generateImage (\_ _ -> JP.PixelRGB8 r g b) 200 34
 -- >>> writePng "files/svg/{name_capital}.png" img
 --
 -- @since 0.3.3

diff --git a/Color/files/svg/AliceBlue.png b/Color/files/svg/AliceBlue.png
diff --git a/Color/files/svg/AntiqueWhite.png b/Color/files/svg/AntiqueWhite.png
diff --git a/Color/files/svg/Aqua.png b/Color/files/svg/Aqua.png
diff --git a/Color/files/svg/AquaMarine.png b/Color/files/svg/AquaMarine.png
diff --git a/Color/files/svg/Azure.png b/Color/files/svg/Azure.png
diff --git a/Color/files/svg/Beige.png b/Color/files/svg/Beige.png
diff --git a/Color/files/svg/Bisque.png b/Color/files/svg/Bisque.png
diff --git a/Color/files/svg/Black.png b/Color/files/svg/Black.png
diff --git a/Color/files/svg/BlanchedAlmond.png b/Color/files/svg/BlanchedAlmond.png
diff --git a/Color/files/svg/Blue.png b/Color/files/svg/Blue.png
diff --git a/Color/files/svg/BlueViolet.png b/Color/files/svg/BlueViolet.png
diff --git a/Color/files/svg/Brown.png b/Color/files/svg/Brown.png
diff --git a/Color/files/svg/BurlyWood.png b/Color/files/svg/BurlyWood.png
diff --git a/Color/files/svg/CadetBlue.png b/Color/files/svg/CadetBlue.png
diff --git a/Color/files/svg/Chartreuse.png b/Color/files/svg/Chartreuse.png
diff --git a/Color/files/svg/Chocolate.png b/Color/files/svg/Chocolate.png
diff --git a/Color/files/svg/Coral.png b/Color/files/svg/Coral.png
diff --git a/Color/files/svg/CornFlowerBlue.png b/Color/files/svg/CornFlowerBlue.png
diff --git a/Color/files/svg/CornSilk.png b/Color/files/svg/CornSilk.png
diff --git a/Color/files/svg/Crimson.png b/Color/files/svg/Crimson.png
diff --git a/Color/files/svg/Cyan.png b/Color/files/svg/Cyan.png
diff --git a/Color/files/svg/DarkBlue.png b/Color/files/svg/DarkBlue.png
diff --git a/Color/files/svg/DarkCyan.png b/Color/files/svg/DarkCyan.png
diff --git a/Color/files/svg/DarkGoldenRod.png b/Color/files/svg/DarkGoldenRod.png
diff --git a/Color/files/svg/DarkGray.png b/Color/files/svg/DarkGray.png
diff --git a/Color/files/svg/DarkGreen.png b/Color/files/svg/DarkGreen.png
diff --git a/Color/files/svg/DarkGrey.png b/Color/files/svg/DarkGrey.png
diff --git a/Color/files/svg/DarkKhaki.png b/Color/files/svg/DarkKhaki.png
diff --git a/Color/files/svg/DarkMagenta.png b/Color/files/svg/DarkMagenta.png
diff --git a/Color/files/svg/DarkOliveGreen.png b/Color/files/svg/DarkOliveGreen.png
diff --git a/Color/files/svg/DarkOrange.png b/Color/files/svg/DarkOrange.png
diff --git a/Color/files/svg/DarkOrchid.png b/Color/files/svg/DarkOrchid.png
diff --git a/Color/files/svg/DarkRed.png b/Color/files/svg/DarkRed.png
diff --git a/Color/files/svg/DarkSalmon.png b/Color/files/svg/DarkSalmon.png
diff --git a/Color/files/svg/DarkSeaGreen.png b/Color/files/svg/DarkSeaGreen.png
diff --git a/Color/files/svg/DarkSlateBlue.png b/Color/files/svg/DarkSlateBlue.png
diff --git a/Color/files/svg/DarkSlateGray.png b/Color/files/svg/DarkSlateGray.png
diff --git a/Color/files/svg/DarkSlateGrey.png b/Color/files/svg/DarkSlateGrey.png
diff --git a/Color/files/svg/DarkTurquoise.png b/Color/files/svg/DarkTurquoise.png
diff --git a/Color/files/svg/DarkViolet.png b/Color/files/svg/DarkViolet.png
diff --git a/Color/files/svg/DeepPink.png b/Color/files/svg/DeepPink.png
diff --git a/Color/files/svg/DeepSkyBlue.png b/Color/files/svg/DeepSkyBlue.png
diff --git a/Color/files/svg/DimGray.png b/Color/files/svg/DimGray.png
diff --git a/Color/files/svg/DimGrey.png b/Color/files/svg/DimGrey.png
diff --git a/Color/files/svg/DodgerBlue.png b/Color/files/svg/DodgerBlue.png
diff --git a/Color/files/svg/FireBrick.png b/Color/files/svg/FireBrick.png
diff --git a/Color/files/svg/FloralWhite.png b/Color/files/svg/FloralWhite.png
diff --git a/Color/files/svg/ForestGreen.png b/Color/files/svg/ForestGreen.png
diff --git a/Color/files/svg/Fuchsia.png b/Color/files/svg/Fuchsia.png
diff --git a/Color/files/svg/Gainsboro.png b/Color/files/svg/Gainsboro.png
diff --git a/Color/files/svg/GhostWhite.png b/Color/files/svg/GhostWhite.png
diff --git a/Color/files/svg/Gold.png b/Color/files/svg/Gold.png
diff --git a/Color/files/svg/GoldenRod.png b/Color/files/svg/GoldenRod.png
diff --git a/Color/files/svg/Gray.png b/Color/files/svg/Gray.png
diff --git a/Color/files/svg/Green.png b/Color/files/svg/Green.png
diff --git a/Color/files/svg/GreenYellow.png b/Color/files/svg/GreenYellow.png
diff --git a/Color/files/svg/Grey.png b/Color/files/svg/Grey.png
diff --git a/Color/files/svg/Honeydew.png b/Color/files/svg/Honeydew.png
diff --git a/Color/files/svg/HotPink.png b/Color/files/svg/HotPink.png
diff --git a/Color/files/svg/IndianRed.png b/Color/files/svg/IndianRed.png
diff --git a/Color/files/svg/Indigo.png b/Color/files/svg/Indigo.png
diff --git a/Color/files/svg/Ivory.png b/Color/files/svg/Ivory.png
diff --git a/Color/files/svg/Khaki.png b/Color/files/svg/Khaki.png
diff --git a/Color/files/svg/Lavender.png b/Color/files/svg/Lavender.png
diff --git a/Color/files/svg/LavenderBlush.png b/Color/files/svg/LavenderBlush.png
diff --git a/Color/files/svg/LawnGreen.png b/Color/files/svg/LawnGreen.png
diff --git a/Color/files/svg/LemonChiffon.png b/Color/files/svg/LemonChiffon.png
diff --git a/Color/files/svg/LightBlue.png b/Color/files/svg/LightBlue.png
diff --git a/Color/files/svg/LightCoral.png b/Color/files/svg/LightCoral.png
diff --git a/Color/files/svg/LightCyan.png b/Color/files/svg/LightCyan.png
diff --git a/Color/files/svg/LightGoldenRodYellow.png b/Color/files/svg/LightGoldenRodYellow.png
diff --git a/Color/files/svg/LightGray.png b/Color/files/svg/LightGray.png
diff --git a/Color/files/svg/LightGreen.png b/Color/files/svg/LightGreen.png
diff --git a/Color/files/svg/LightGrey.png b/Color/files/svg/LightGrey.png
diff --git a/Color/files/svg/LightPink.png b/Color/files/svg/LightPink.png
diff --git a/Color/files/svg/LightSalmon.png b/Color/files/svg/LightSalmon.png
diff --git a/Color/files/svg/LightSeaGreen.png b/Color/files/svg/LightSeaGreen.png
diff --git a/Color/files/svg/LightSkyBlue.png b/Color/files/svg/LightSkyBlue.png
diff --git a/Color/files/svg/LightSlateGray.png b/Color/files/svg/LightSlateGray.png
diff --git a/Color/files/svg/LightSlateGrey.png b/Color/files/svg/LightSlateGrey.png
diff --git a/Color/files/svg/LightSteelBlue.png b/Color/files/svg/LightSteelBlue.png
diff --git a/Color/files/svg/LightYellow.png b/Color/files/svg/LightYellow.png
diff --git a/Color/files/svg/Lime.png b/Color/files/svg/Lime.png
diff --git a/Color/files/svg/LimeGreen.png b/Color/files/svg/LimeGreen.png
diff --git a/Color/files/svg/Linen.png b/Color/files/svg/Linen.png
diff --git a/Color/files/svg/Magenta.png b/Color/files/svg/Magenta.png
diff --git a/Color/files/svg/Maroon.png b/Color/files/svg/Maroon.png
diff --git a/Color/files/svg/MediumAquaMarine.png b/Color/files/svg/MediumAquaMarine.png
diff --git a/Color/files/svg/MediumBlue.png b/Color/files/svg/MediumBlue.png
diff --git a/Color/files/svg/MediumOrchid.png b/Color/files/svg/MediumOrchid.png
diff --git a/Color/files/svg/MediumPurple.png b/Color/files/svg/MediumPurple.png
diff --git a/Color/files/svg/MediumSeaGreen.png b/Color/files/svg/MediumSeaGreen.png
diff --git a/Color/files/svg/MediumSlateBlue.png b/Color/files/svg/MediumSlateBlue.png
diff --git a/Color/files/svg/MediumSpringGreen.png b/Color/files/svg/MediumSpringGreen.png
diff --git a/Color/files/svg/MediumTurquoise.png b/Color/files/svg/MediumTurquoise.png
diff --git a/Color/files/svg/MediumVioletRed.png b/Color/files/svg/MediumVioletRed.png
diff --git a/Color/files/svg/MidnightBlue.png b/Color/files/svg/MidnightBlue.png
diff --git a/Color/files/svg/MintCream.png b/Color/files/svg/MintCream.png
diff --git a/Color/files/svg/MistyRose.png b/Color/files/svg/MistyRose.png
diff --git a/Color/files/svg/Moccasin.png b/Color/files/svg/Moccasin.png
diff --git a/Color/files/svg/NavajoWhite.png b/Color/files/svg/NavajoWhite.png
diff --git a/Color/files/svg/Navy.png b/Color/files/svg/Navy.png
diff --git a/Color/files/svg/OldLace.png b/Color/files/svg/OldLace.png
diff --git a/Color/files/svg/Olive.png b/Color/files/svg/Olive.png
diff --git a/Color/files/svg/OliveDrab.png b/Color/files/svg/OliveDrab.png
diff --git a/Color/files/svg/Orange.png b/Color/files/svg/Orange.png
diff --git a/Color/files/svg/OrangeRed.png b/Color/files/svg/OrangeRed.png
diff --git a/Color/files/svg/Orchid.png b/Color/files/svg/Orchid.png
diff --git a/Color/files/svg/PaleGoldenRod.png b/Color/files/svg/PaleGoldenRod.png
diff --git a/Color/files/svg/PaleGreen.png b/Color/files/svg/PaleGreen.png
diff --git a/Color/files/svg/PaleTurquoise.png b/Color/files/svg/PaleTurquoise.png
diff --git a/Color/files/svg/PaleVioletRed.png b/Color/files/svg/PaleVioletRed.png
diff --git a/Color/files/svg/PapayaWhip.png b/Color/files/svg/PapayaWhip.png
diff --git a/Color/files/svg/PeachPuff.png b/Color/files/svg/PeachPuff.png
diff --git a/Color/files/svg/Peru.png b/Color/files/svg/Peru.png
diff --git a/Color/files/svg/Pink.png b/Color/files/svg/Pink.png
diff --git a/Color/files/svg/Plum.png b/Color/files/svg/Plum.png
diff --git a/Color/files/svg/PowderBlue.png b/Color/files/svg/PowderBlue.png
diff --git a/Color/files/svg/Purple.png b/Color/files/svg/Purple.png
diff --git a/Color/files/svg/Red.png b/Color/files/svg/Red.png
diff --git a/Color/files/svg/RosyBrown.png b/Color/files/svg/RosyBrown.png
diff --git a/Color/files/svg/RoyalBlue.png b/Color/files/svg/RoyalBlue.png
diff --git a/Color/files/svg/SaddleBrown.png b/Color/files/svg/SaddleBrown.png
diff --git a/Color/files/svg/Salmon.png b/Color/files/svg/Salmon.png
diff --git a/Color/files/svg/SandyBrown.png b/Color/files/svg/SandyBrown.png
diff --git a/Color/files/svg/SeaGreen.png b/Color/files/svg/SeaGreen.png
diff --git a/Color/files/svg/Seashell.png b/Color/files/svg/Seashell.png
diff --git a/Color/files/svg/Sienna.png b/Color/files/svg/Sienna.png
diff --git a/Color/files/svg/Silver.png b/Color/files/svg/Silver.png
diff --git a/Color/files/svg/SkyBlue.png b/Color/files/svg/SkyBlue.png
diff --git a/Color/files/svg/SlateBlue.png b/Color/files/svg/SlateBlue.png
diff --git a/Color/files/svg/SlateGray.png b/Color/files/svg/SlateGray.png
diff --git a/Color/files/svg/SlateGrey.png b/Color/files/svg/SlateGrey.png
diff --git a/Color/files/svg/Snow.png b/Color/files/svg/Snow.png
diff --git a/Color/files/svg/SpringGreen.png b/Color/files/svg/SpringGreen.png
diff --git a/Color/files/svg/SteelBlue.png b/Color/files/svg/SteelBlue.png
diff --git a/Color/files/svg/Tan.png b/Color/files/svg/Tan.png
diff --git a/Color/files/svg/Teal.png b/Color/files/svg/Teal.png
diff --git a/Color/files/svg/Thistle.png b/Color/files/svg/Thistle.png
diff --git a/Color/files/svg/Tomato.png b/Color/files/svg/Tomato.png
diff --git a/Color/files/svg/Turquoise.png b/Color/files/svg/Turquoise.png
diff --git a/Color/files/svg/Violet.png b/Color/files/svg/Violet.png
diff --git a/Color/files/svg/Wheat.png b/Color/files/svg/Wheat.png
diff --git a/Color/files/svg/White.png b/Color/files/svg/White.png
diff --git a/Color/files/svg/WhiteSmoke.png b/Color/files/svg/WhiteSmoke.png
diff --git a/Color/files/svg/Yellow.png b/Color/files/svg/Yellow.png
diff --git a/Color/files/svg/YellowGreen.png b/Color/files/svg/YellowGreen.png
diff --git a/Color/src/Graphics/Color/Standard/SVG.hs b/Color/src/Graphics/Color/Standard/SVG.hs
diff --git a/Color/tests/Main.hs b/Color/tests/Main.hs
@@ -1,6 +1,6 @@
 module Main where
 
-import Spec
+import Spec (spec)
 import System.IO (BufferMode (LineBuffering), hSetBuffering, hSetEncoding, stdout, utf8)
 import Test.Hspec
 

diff --git a/Color/tests/Spec.hs b/Color/tests/Spec.hs
@@ -1 +1 @@
-{-# OPTIONS_GHC -F -pgmF hspec-discover -optF --no-main #-}
+{-# OPTIONS_GHC -F -pgmF hspec-discover -optF --module-name=Spec #-}