From 0f74b77b27df5f6e69d9fef25e81ff18bbf4229a Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sun, 22 Jun 2014 07:04:09 -0700
Subject: [PATCH] colors.xyz: some refactoring.

---
 extra/colors/luv/luv.factor      | 11 ++---------
 extra/colors/xyy/summary.txt     |  2 +-
 extra/colors/xyy/xyy-docs.factor |  6 +++---
 extra/colors/xyz/summary.txt     |  2 +-
 extra/colors/xyz/xyz-docs.factor |  6 +++---
 extra/colors/xyz/xyz.factor      |  7 +++++++
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/extra/colors/luv/luv.factor b/extra/colors/luv/luv.factor
index 465bea8945..c756e8230b 100644
--- a/extra/colors/luv/luv.factor
+++ b/extra/colors/luv/luv.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2014 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: accessors colors colors.xyz kernel locals math
-math.functions ;
+USING: accessors colors colors.xyz colors.xyz.private kernel
+locals math math.functions ;
 
 IN: colors.luv
 
@@ -12,18 +12,11 @@ C: <luva> luva
 
 <PRIVATE
 
-CONSTANT: xyz_epsilon 216/24389
-CONSTANT: xyz_kappa 24389/27
-
 :: xyz-to-uv ( x y z -- u v )
     x y 15 * z 3 * + + :> d
     4 x * d /
     9 y * d / ; foldable
 
-CONSTANT: wp_x 0.95047
-CONSTANT: wp_y 1.00000
-CONSTANT: wp_z 1.08883
-
 PRIVATE>
 
 M: luva >rgba >xyza >rgba ;
diff --git a/extra/colors/xyy/summary.txt b/extra/colors/xyy/summary.txt
index 2f28ff1867..8c52adb77d 100644
--- a/extra/colors/xyy/summary.txt
+++ b/extra/colors/xyy/summary.txt
@@ -1 +1 @@
-CIE xyY colors
+CIE 1931 xyY colors
diff --git a/extra/colors/xyy/xyy-docs.factor b/extra/colors/xyy/xyy-docs.factor
index f99eb97d54..dca7582e4d 100644
--- a/extra/colors/xyy/xyy-docs.factor
+++ b/extra/colors/xyy/xyy-docs.factor
@@ -2,10 +2,10 @@ USING: help.markup help.syntax ;
 IN: colors.xyy
 
 HELP: xyYa
-{ $class-description "The class of CIE xyY colors with an alpha channel." } ;
+{ $class-description "The class of CIE 1931 xyY colors with an alpha channel." } ;
 
-ARTICLE: "colors.xyy" "CIE xyY colors"
-"The " { $vocab-link "colors.xyy" } " vocabulary implements CIE xyY colors, together with an alpha channel."
+ARTICLE: "colors.xyy" "CIE 1931 xyY colors"
+"The " { $vocab-link "colors.xyy" } " vocabulary implements CIE 1931 xyY colors, together with an alpha channel."
 { $subsections
     xyYa
     <xyYa>
diff --git a/extra/colors/xyz/summary.txt b/extra/colors/xyz/summary.txt
index 358c776a38..a0dce8c17a 100644
--- a/extra/colors/xyz/summary.txt
+++ b/extra/colors/xyz/summary.txt
@@ -1 +1 @@
-CIE XYZ colors
+CIE 1931 XYZ colors
diff --git a/extra/colors/xyz/xyz-docs.factor b/extra/colors/xyz/xyz-docs.factor
index 15659be844..e234ad6688 100644
--- a/extra/colors/xyz/xyz-docs.factor
+++ b/extra/colors/xyz/xyz-docs.factor
@@ -2,10 +2,10 @@ USING: help.markup help.syntax ;
 IN: colors.xyz
 
 HELP: xyza
-{ $class-description "The class of CIE XYZ colors with an alpha channel." } ;
+{ $class-description "The class of CIE 1931 XYZ colors with an alpha channel." } ;
 
-ARTICLE: "colors.xyz" "CIE XYZ colors"
-"The " { $vocab-link "colors.xyz" } " vocabulary implements CIE XYZ colors, together with an alpha channel."
+ARTICLE: "colors.xyz" "CIE 1931 XYZ colors"
+"The " { $vocab-link "colors.xyz" } " vocabulary implements CIE 1931 XYZ colors, together with an alpha channel."
 { $subsections
     xyza
     <xyza>
diff --git a/extra/colors/xyz/xyz.factor b/extra/colors/xyz/xyz.factor
index 3b1e368e47..7a60549b6a 100644
--- a/extra/colors/xyz/xyz.factor
+++ b/extra/colors/xyz/xyz.factor
@@ -12,6 +12,13 @@ C: <xyza> xyza
 
 <PRIVATE
 
+CONSTANT: xyz_epsilon 216/24389
+CONSTANT: xyz_kappa 24389/27
+
+CONSTANT: wp_x 0.95047
+CONSTANT: wp_y 1.00000
+CONSTANT: wp_z 1.08883
+
 : srgb-compand ( v -- v' )
     dup 0.0031308 <= [ 12.92 * ] [ 2.4 recip ^ 1.055 * 0.055 - ] if ;