# HG changeset patch
# User tz
# Date 892145654 -7200
# Node ID 619e0288e4e18c58f2819610fb8e35200ce1502f
# Parent  069a179b1849f216aeeb6266db295615166eb9e9
#cyan:, #magenta:, and #yellow: added

diff -r 069a179b1849 -r 619e0288e4e1 Color.st
--- a/Color.st	Mon Apr 06 10:45:58 1998 +0200
+++ b/Color.st	Thu Apr 09 20:14:14 1998 +0200
@@ -1264,7 +1264,7 @@
 cyan
     "return the cyan color - ST-80 compatibility"
 
-    ^ self redPercent:0 greenPercent:100 bluePercent:100
+    ^ self cyan:100
 
     "
      Color cyan inspect
@@ -1273,6 +1273,14 @@
     "Modified: 23.4.1996 / 13:16:07 / cg"
 !
 
+cyan: cyan
+    "return a cyan color;
+     the argument cyan is interpreted as percent (0..100)"
+
+     ^ self cyan:100 magenta:100-cyan yellow:100-cyan
+                                     
+!
+
 darkGray
     "return the dark grey color (English version ;-)"
 
@@ -1412,7 +1420,7 @@
 magenta
     "return the magenta color - ST-80 compatibility"
 
-    ^ self redPercent:100 greenPercent:0 bluePercent:100
+    ^ self magenta:100
 
     "
      Color magenta inspect
@@ -1421,6 +1429,14 @@
     "Modified: 23.4.1996 / 13:23:41 / cg"
 !
 
+magenta: magenta
+    "return a magenta color;
+     the argument magenta is interpreted as percent (0..100)"
+
+     ^ self cyan:100-magenta magenta:100 yellow:100-magenta
+                                     
+!
+
 mediumGray
     "return medium-grey color (US version ;-)"
 
@@ -1525,9 +1541,17 @@
 yellow
     "return the yellow color - ST-80 compatibility"
 
-    ^ self redPercent:100 greenPercent:100 bluePercent:0
+    ^ self yellow:100
 
     "Modified: 23.4.1996 / 13:33:56 / cg"
+!
+
+yellow: yellow
+    "return a yellow color;
+     the argument yellow is interpreted as percent (0..100)"
+
+     ^ self cyan:100-yellow magenta:100-yellow yellow:100
+                                     
 ! !
 
 !Color class methodsFor:'obsolete'!
@@ -4518,6 +4542,6 @@
 !Color class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Color.st,v 1.113 1998-04-02 08:07:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Color.st,v 1.114 1998-04-09 18:14:14 tz Exp $'
 ! !
 Color initialize!