From: akr <akr>
Date: Fri, 27 Oct 2000 08:46:54 +0000 (+0000)
Subject: regenerate Y from V as follows.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b07298f14fed18705d6564c1b7ad6db9902c560c;p=elisp%2Fmunsell.git

regenerate Y from V as follows.
Y = 1.1913*V - 0.22532*V**2 + 0.23351*V**3 - 0.020483*V**4 +0.00081936*V**5
---

diff --git a/Makefile b/Makefile
index 920d268..79ea8e7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ WHITEx = 0.3101
 WHITEy = 0.3162
 
 munsell-data.el: all.dat 
-	awk 'NR != 1 {printf("(\"%s%s/%s\" . \"CIExyY:%s/%s/%s\")\n", $$1, $$2, $$3, $$4, $$5, $$6 / 100)}' all.dat > _generated
-	awk 'NR != 1 {printf("(\"N%s\" . \"CIExyY:%s/%s/%s\")\n", $$2, $(WHITEx), $(WHITEy), $$6 / 100)}' all.dat|uniq >> _generated
+	awk 'NR != 1 {v = $$2; Y = 1.1913*v - 0.22532*v**2 + 0.23351*v**3 - 0.020483*v**4 +0.00081936*v**5; printf("(\"%s%s/%s\" . \"CIExyY:%s/%s/%s\")\n", $$1, $$2, $$3, $$4, $$5, Y / 100)}' all.dat > _generated
+	awk 'NR != 1 {v = $$2; Y = 1.1913*v - 0.22532*v**2 + 0.23351*v**3 - 0.020483*v**4 +0.00081936*v**5; printf("(\"N%s\" . \"CIExyY:%s/%s/%s\")\n", $$2, $(WHITEx), $(WHITEy), Y / 100)}' all.dat|uniq >> _generated
 	m4 munsell-data.template > munsell-data.el
 
 all.dat: