Skip to content

Commit 95de187

Browse files
tabatkinstabatkins
committed
[css-color] Fixing various typos/etc.
1 parent 2a797fe commit 95de187

2 files changed

Lines changed: 246 additions & 121 deletions

File tree

‎css-color/Overview.bs‎

Lines changed: 86 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Editor: Tab Atkins Jr., Google, http://xanthir.com/contact
1010
Editor: Chris Lilley, W3C, chris@w3.org
1111
Former Editor: L. David Baron, Mozilla Corporation, dbaron@dbaron.org
1212
Abstract: This specification describes CSS <<color>> values and properties for foreground color and group opacity.
13-
Ignored Terms: stacking context, double, octet, cmykcolor
13+
Ignored Terms: stacking context, double, octet, DOMString
1414
</pre>
1515

1616
<style>
@@ -2525,9 +2525,9 @@ The RGBColor Object</h3>
25252525
<pre class='idl'>
25262526
[Constructor(double r, double g, double b, optional double a=1),
25272527
Constructor(RGBColor rgb),
2528-
Constructor(CSSColor csscolor),
2528+
Constructor(CSSColor css),
25292529
Constructor(optional RGBColorInit color),
2530-
Constructor(DOMString css)]
2530+
Constructor(DOMString cssstring)]
25312531
interface RGBColor : CSSColor {
25322532
attribute double r;
25332533
attribute double g;
@@ -2602,13 +2602,13 @@ The RGBColor Object</h3>
26022602
}
26032603
</pre>
26042604

2605-
<dt><dfn constructor title="RGBColor(csscolor)">RGBColor</dfn>({{RGBColor}} <dfn argument for="RGBColor(csscolor)">csscolor</dfn>)
2605+
<dt><dfn constructor title="RGBColor(css)">RGBColor</dfn>({{CSSColor}} <dfn argument for="RGBColor(css)">css</dfn>)
26062606
<dd>
26072607
Defined as follows in ECMAScript:
26082608

26092609
<pre>
2610-
function(csscolor) {
2611-
const color = csscolor.toRGB();
2610+
function(css) {
2611+
const color = css.toRGB();
26122612
this.r = color.r;
26132613
this.g = color.g;
26142614
this.b = color.b;
@@ -2632,7 +2632,7 @@ The RGBColor Object</h3>
26322632
}
26332633
</pre>
26342634

2635-
<dt><dfn constructor title="RGBColor(css)">RGBColor</dfn>(DOMString css)
2635+
<dt><dfn constructor title="RGBColor(cssstring)">RGBColor</dfn>(DOMString cssstring)
26362636
<dd>
26372637
<a>Parse a component value</a> from the passed string.
26382638
If this operation succeeds and the result is a valid CSS color,
@@ -2742,16 +2742,18 @@ The HSLColor Class</h3>
27422742
<pre class='idl'>
27432743
[Constructor(double h, double s, double l, optional double a=1),
27442744
Constructor(RGBColor rgb),
2745+
Constructor(HSLColor hsl),
2746+
Constructor(CSSColor css),
27452747
Constructor(optional HSLColorInit color),
2746-
Constructor(CSSColor csscolor),
2747-
Constructor(DOMString css)]
2748+
Constructor(DOMString cssstring)]
27482749
interface HSLColor : CSSColor {
27492750
attribute double h;
27502751
attribute double s;
27512752
attribute double l;
27522753
attribute double a;
27532754

27542755
RGBColor toRGB();
2756+
HSLColor toHSL();
27552757

27562758
static attribute ColorStringifiers stringifiers;
27572759
attribute ColorStringifierType defaultStringifier;
@@ -2780,7 +2782,7 @@ The HSLColor Class</h3>
27802782
}
27812783
</pre>
27822784

2783-
<dt><dfn constructor title="HSLColor(rgb)">HSLColor</dfn>(<a idl>RGBColor</a> <dfn argument for="HSLColor/HSLColor(rgb)">rgb</dfn>)
2785+
<dt><dfn constructor title="HSLColor(rgb)">HSLColor</dfn>({{RGBColor}} <dfn argument for="HSLColor/HSLColor(rgb)">rgb</dfn>)
27842786
<dd>
27852787
Defined as follows in ECMAScript:
27862788

@@ -2814,13 +2816,27 @@ The HSLColor Class</h3>
28142816
}
28152817
</pre>
28162818

2817-
<dt><dfn constructor title="HSLColor(csscolor)">HSLColor</dfn>({{CSSColor}} <dfn argument for="HSLColor(csscolor)">csscolor</dfn>)
2819+
<dt><dfn constructor title="HSLColor(hsl)">HSLColor</dfn>({{HSLColor}} <dfn argument for="HSLColor(hsl)">hsl</dfn>)
28182820
<dd>
28192821
Defined as follows in ECMAScript:
28202822

28212823
<pre>
2822-
function(csscolor) {
2823-
const color = csscolor.toHSL();
2824+
function(hsl) {
2825+
this.h = hsl.h;
2826+
this.s = hsl.s;
2827+
this.l = hsl.l;
2828+
this.a = hsl.a;
2829+
return this;
2830+
}
2831+
</pre>
2832+
2833+
<dt><dfn constructor title="HSLColor(css)">HSLColor</dfn>({{CSSColor}} <dfn argument for="HSLColor(css)">css</dfn>)
2834+
<dd>
2835+
Defined as follows in ECMAScript:
2836+
2837+
<pre>
2838+
function(css) {
2839+
const color = css.toHSL();
28242840
this.h = color.h;
28252841
this.s = color.s;
28262842
this.l = color.l;
@@ -2829,7 +2845,7 @@ The HSLColor Class</h3>
28292845
}
28302846
</pre>
28312847

2832-
<dt><dfn constructor title="HSLColor(color) | HSLColor()">HSLColor</dfn>(optional HSLColorInit color)
2848+
<dt><dfn constructor title="HSLColor(color) | HSLColor()">HSLColor</dfn>(optional {{HSLColorInit}} color)
28332849
<dd>
28342850
Defined as follows in ECMAScript:
28352851

@@ -2844,7 +2860,7 @@ The HSLColor Class</h3>
28442860
}
28452861
</pre>
28462862

2847-
<dt><dfn constructor title="HSLColor(css)">HSLColor</dfn>(DOMString css)
2863+
<dt><dfn constructor title="HSLColor(cssstring)">HSLColor</dfn>(DOMString cssstring)
28482864
<dd>
28492865
<a>Parse a component value</a> from the passed string.
28502866
If this operation succeeds and the result is a valid CSS color,
@@ -2879,6 +2895,16 @@ The HSLColor Class</h3>
28792895
}
28802896
</pre>
28812897

2898+
<dt><dfn method>toHSL()</dfn>
2899+
<dd>
2900+
Defined as follows in ECMAScript:
2901+
2902+
<pre>
2903+
function() {
2904+
return new HSLColor(this);
2905+
}
2906+
</pre>
2907+
28822908
<dt><dfn attribute>h</dfn> <span attribute-info for="HSLColor/h"></span>
28832909
<dt><dfn attribute>s</dfn> <span attribute-info for="HSLColor/s"></span>
28842910
<dt><dfn attribute>l</dfn> <span attribute-info for="HSLColor/l"></span>
@@ -2918,16 +2944,18 @@ The HexColor Class</h3>
29182944
<pre class='idl'>
29192945
[Constructor([Clamp] octet r, [Clamp] octet g, [Clamp] octet b, optional [Clamp] octet a = 255),
29202946
Constructor(RGBColor rgb),
2921-
Constructor(CSSColor csscolor),
2947+
Constructor(HexColor hex),
2948+
Constructor(CSSColor css),
29222949
Constructor(optional HexColorInit color),
2923-
Constructor(DOMString css)]
2950+
Constructor(DOMString cssstring)]
29242951
interface HexColor : CSSColor {
29252952
[Clamp] attribute octet r;
29262953
[Clamp] attribute octet g;
29272954
[Clamp] attribute octet b;
29282955
[Clamp] attribute octet a;
29292956

29302957
RGBColor toRGB();
2958+
HexColor toHex();
29312959

29322960
static attribute ColorStringifiers stringifiers;
29332961
attribute ColorStringifierType defaultStringifier;
@@ -2973,13 +3001,27 @@ The HexColor Class</h3>
29733001
}
29743002
</pre>
29753003

2976-
<dt><dfn constructor title="HexColor(csscolor)">HexColor</dfn>({{CSSColor}} <dfn argument for="HexColor(csscolor)">csscolor</dfn>)
3004+
<dt><dfn constructor title="HexColor(hex)">HexColor</dfn>({{HexColor}} <dfn argument for="HexColor(hex)">hex</dfn>)
3005+
<dd>
3006+
Defined as follows in ECMAScript:
3007+
3008+
<pre>
3009+
function(hex) {
3010+
this.r = hex.r;
3011+
this.g = hex.g;
3012+
this.b = hex.b;
3013+
this.a = hex.a;
3014+
return this;
3015+
}
3016+
</pre>
3017+
3018+
<dt><dfn constructor title="HexColor(css)">HexColor</dfn>({{CSSColor}} <dfn argument for="HexColor(css)">css</dfn>)
29773019
<dd>
29783020
Defined as follows in ECMAScript:
29793021

29803022
<pre>
2981-
function(csscolor) {
2982-
const color = csscolor.toHex();
3023+
function(css) {
3024+
const color = css.toHex();
29833025
this.r = color.r;
29843026
this.g = color.g;
29853027
this.b = color.b;
@@ -3003,7 +3045,7 @@ The HexColor Class</h3>
30033045
}
30043046
</pre>
30053047

3006-
<dt><dfn constructor title="HexColor(css)">HexColor</dfn>(DOMString css)
3048+
<dt><dfn constructor title="HexColor(cssstring)">HexColor</dfn>(DOMString cssstring)
30073049
<dd>
30083050
<a>Parse a component value</a> from the passed string.
30093051
If this operation succeeds and the result is a valid CSS color,
@@ -3062,9 +3104,10 @@ The CMYKColor Class</h3>
30623104
<pre class='idl'>
30633105
[Constructor(double c, double m, double y, double k, optional double a=1, optional fallback RGBColor?=null),
30643106
Constructor(RGBColor rgb),
3065-
Constructor(CSSColor csscolor),
3107+
Constructor(CMYKColor cmyk),
3108+
Constructor(CSSColor css),
30663109
Constructor(optional CMYKColorInit color),
3067-
Constructor(DOMString css)]
3110+
Constructor(DOMString cssstring)]
30683111
interface CMYKColor : CSSColor {
30693112
attribute double c;
30703113
attribute double m;
@@ -3133,13 +3176,29 @@ The CMYKColor Class</h3>
31333176
}
31343177
</pre>
31353178

3136-
<dt><dfn constructor title="CMYKColor(csscolor)">CMYKColor</dfn>({{CSSColor}} <dfn argument for="CMYKColor(csscolor)">csscolor</dfn>)
3179+
<dt><dfn constructor title="CMYKColor(cmykcolor)">CMYKColor</dfn>({{CMYKColor}} <dfn argument for="CMYKColor(cmyk)">cmyk</dfn>)
3180+
<dd>
3181+
Defined as follows in ECMAScript:
3182+
3183+
<pre>
3184+
function(cmyk) {
3185+
this.c = cmyk.c;
3186+
this.m = cmyk.m;
3187+
this.y = cmyk.y;
3188+
this.k = cmyk.k;
3189+
this.a = cmyk.a;
3190+
this.fallback = cmyk.fallback;
3191+
return this;
3192+
}
3193+
</pre>
3194+
3195+
<dt><dfn constructor title="CMYKColor(css)">CMYKColor</dfn>({{CSSColor}} <dfn argument for="CMYKColor(css)">css</dfn>)
31373196
<dd>
31383197
Defined as follows in ECMAScript:
31393198

31403199
<pre>
3141-
function(csscolor) {
3142-
const color = csscolor.toCMYK();
3200+
function(css) {
3201+
const color = css.toCMYK();
31433202
this.c = color.c;
31443203
this.m = color.m;
31453204
this.y = color.y;
@@ -3166,7 +3225,7 @@ The CMYKColor Class</h3>
31663225
}
31673226
</pre>
31683227

3169-
<dt><dfn constructor title="CMYKColor(css)">CMYKColor</dfn>(DOMString css)
3228+
<dt><dfn constructor title="CMYKColor(cssstring)">CMYKColor</dfn>(DOMString cssstring)
31703229
<dd>
31713230
<a>Parse a component value</a> from the passed string.
31723231
If this operation succeeds and the result is a valid ''device-cmyk()'' function,

0 commit comments

Comments
 (0)