Skip to content

css-color-4 #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jan 11, 2019
Merged

css-color-4 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b88f463
prepare rgb() and rgba() for the 'modern' syntax of css-color-4
ylafon Dec 11, 2018
fbf75b2
proper constructors and CSS3 statis definiton updated
ylafon Dec 11, 2018
cb334fe
as the alpha channel is optional, the output needs to care about this
ylafon Dec 12, 2018
d56e63d
new parsing of rgb() and rgba() based on css-color-4 (no stable point…
ylafon Dec 12, 2018
ddf6091
do not forget the quad-comma separated value known as 'old syntax'
ylafon Dec 12, 2018
8fe9708
HSL redone using css-color-4 modern syntax
ylafon Dec 12, 2018
9553130
change normalization order to avoid rounding issues
ylafon Dec 12, 2018
99d96d0
LAB and LCH per current draft of css-color-4 amended by issue #csswg-…
ylafon Dec 14, 2018
ce73f4e
and its typo
ylafon Dec 14, 2018
80c6651
fix for lab and lch parsing
ylafon Dec 14, 2018
85dcde9
added gray() as an alias of lab(), note #csswg-drafts/635 about allow…
ylafon Dec 18, 2018
e71dcc7
opacity per https://www.w3.org/TR/2016/WD-css-color-4-20160705/#propd…
ylafon Dec 18, 2018
656eacd
fix syntax per latest css-color-4 draft
ylafon Dec 19, 2018
3ffc6a4
fixed output for new syntax
ylafon Dec 19, 2018
ae4fc8d
added parsing of short rgba form (#1234 and #10203040) per css-color-…
ylafon Dec 20, 2018
7e1d486
finished parsing of device-cmyk() per draft css-color-4
ylafon Dec 20, 2018
c898850
fix operator check for cmyk parsing
ylafon Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 39 additions & 31 deletions org/w3c/css/parser/analyzer/CssParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Iterator;
import java.net.URL;
import java.math.BigDecimal;

import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssOperator;
Expand Down Expand Up @@ -39,7 +37,6 @@
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssVolume;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.parser.CssError;
import org.w3c.css.parser.CssErrorToken;
import org.w3c.css.parser.CssSelectors;
Expand All @@ -63,7 +60,6 @@
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.WarningParamException;
import org.w3c.css.util.Util;
import org.w3c.css.util.Messages;

import org.w3c.css.selectors.AdjacentSiblingSelector;
import org.w3c.css.selectors.AttributeSelector;
Expand Down Expand Up @@ -6097,19 +6093,31 @@ final public boolean prio() throws ParseException {
jj_consume_token(LPARAN);
String funcname = n.image.toLowerCase();
if (funcname.equals("rgb(")) {
color.setRGBColor(exp, ac);
color.setRGBColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("rgba(")) {
color.setRGBAColor(exp, ac);
color.setRGBAColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("hsl(")) {
color.setHSLColor(exp, ac);
color.setHSLColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("hsla(")) {
color.setHSLAColor(exp, ac);
color.setHSLColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("hwb(")) {
color.setHWBColor(exp, ac);
color.setHWBColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("lab(")) {
color.setLABColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("gray(")) {
color.setGrayColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("lch(")) {
color.setLCHColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("device-cmyk(")) {
color.setDeviceCMYKColor(ac, exp);
{if ("" != null) return color;}
} else if (funcname.equals("image(")) {
CssImage img = new CssImage();
Expand All @@ -6133,7 +6141,7 @@ final public boolean prio() throws ParseException {
{if ("" != null) return img;}
} else if (funcname.equals("atsc-rgba(")) {
if (getAtRule().toString().equals("@media atsc-tv")) {
color.setATSCRGBAColor(exp, ac);
color.setATSCRGBAColor(ac, exp);
{if ("" != null) return color;}
} else {
addError(new InvalidParamException("onlyATSC", "", ac),
Expand Down Expand Up @@ -6975,15 +6983,15 @@ private boolean jj_3R_200()
return false;
}

private boolean jj_3R_211()
private boolean jj_3R_199()
{
if (jj_scan_token(COMMA)) return true;
if (jj_scan_token(IMPORTANT_NOT)) return true;
return false;
}

private boolean jj_3R_199()
private boolean jj_3R_211()
{
if (jj_scan_token(IMPORTANT_NOT)) return true;
if (jj_scan_token(COMMA)) return true;
return false;
}

Expand Down Expand Up @@ -7023,6 +7031,17 @@ private boolean jj_3R_216()
return false;
}

private boolean jj_3R_214()
{
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(39)) {
jj_scanpos = xsp;
if (jj_scan_token(40)) return true;
}
return false;
}

private boolean jj_3R_197()
{
if (jj_scan_token(DIMEN)) return true;
Expand Down Expand Up @@ -7071,17 +7090,6 @@ private boolean jj_3R_190()
return false;
}

private boolean jj_3R_214()
{
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(39)) {
jj_scanpos = xsp;
if (jj_scan_token(40)) return true;
}
return false;
}

private boolean jj_3R_189()
{
if (jj_scan_token(ABSOLUTLENGTH)) return true;
Expand All @@ -7094,6 +7102,12 @@ private boolean jj_3R_188()
return false;
}

private boolean jj_3R_217()
{
if (jj_scan_token(IDENT)) return true;
return false;
}

private boolean jj_3R_187()
{
if (jj_scan_token(RELFONTLENGTH)) return true;
Expand Down Expand Up @@ -7194,12 +7208,6 @@ private boolean jj_3R_169()
return false;
}

private boolean jj_3R_217()
{
if (jj_scan_token(IDENT)) return true;
return false;
}

private boolean jj_3_1()
{
if (jj_3R_147()) return true;
Expand Down
28 changes: 18 additions & 10 deletions org/w3c/css/parser/analyzer/CssParser.jj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Iterator;
import java.net.URL;
import java.math.BigDecimal;

import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssOperator;
Expand Down Expand Up @@ -58,7 +56,6 @@ import org.w3c.css.values.CssSemitone;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssVolume;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.parser.CssError;
import org.w3c.css.parser.CssErrorToken;
import org.w3c.css.parser.CssSelectors;
Expand All @@ -82,7 +79,6 @@ import org.w3c.css.util.CssVersion;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.WarningParamException;
import org.w3c.css.util.Util;
import org.w3c.css.util.Messages;

import org.w3c.css.selectors.AdjacentSiblingSelector;
import org.w3c.css.selectors.AttributeSelector;
Expand Down Expand Up @@ -3037,19 +3033,31 @@ CssValue function() :
")" {
String funcname = n.image.toLowerCase();
if (funcname.equals("rgb(")) {
color.setRGBColor(exp, ac);
color.setRGBColor(ac, exp);
return color;
} else if (funcname.equals("rgba(")) {
color.setRGBAColor(exp, ac);
color.setRGBAColor(ac, exp);
return color;
} else if (funcname.equals("hsl(")) {
color.setHSLColor(exp, ac);
color.setHSLColor(ac, exp);
return color;
} else if (funcname.equals("hsla(")) {
color.setHSLAColor(exp, ac);
color.setHSLColor(ac, exp);
return color;
} else if (funcname.equals("hwb(")) {
color.setHWBColor(exp, ac);
color.setHWBColor(ac, exp);
return color;
} else if (funcname.equals("lab(")) {
color.setLABColor(ac, exp);
return color;
} else if (funcname.equals("gray(")) {
color.setGrayColor(ac, exp);
return color;
} else if (funcname.equals("lch(")) {
color.setLCHColor(ac, exp);
return color;
} else if (funcname.equals("device-cmyk(")) {
color.setDeviceCMYKColor(ac, exp);
return color;
} else if (funcname.equals("image(")) {
CssImage img = new CssImage();
Expand All @@ -3073,7 +3081,7 @@ CssValue function() :
return img;
} else if (funcname.equals("atsc-rgba(")) {
if (getAtRule().toString().equals("@media atsc-tv")) {
color.setATSCRGBAColor(exp, ac);
color.setATSCRGBAColor(ac, exp);
return color;
} else {
addError(new InvalidParamException("onlyATSC", "", ac),
Expand Down
4 changes: 0 additions & 4 deletions org/w3c/css/parser/analyzer/CssParserTokenManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Iterator;
import java.net.URL;
import java.math.BigDecimal;
import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssAngle;
Expand Down Expand Up @@ -37,7 +35,6 @@
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssVolume;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.parser.CssError;
import org.w3c.css.parser.CssErrorToken;
import org.w3c.css.parser.CssSelectors;
Expand All @@ -61,7 +58,6 @@
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.WarningParamException;
import org.w3c.css.util.Util;
import org.w3c.css.util.Messages;
import org.w3c.css.selectors.AdjacentSiblingSelector;
import org.w3c.css.selectors.AttributeSelector;
import org.w3c.css.selectors.ChildSelector;
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css1/CssBackgroundColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public CssBackgroundColor(ApplContext ac, CssExpression expression,
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
setColor(c);
break;
case CssTypes.CSS_COLOR:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css1/CssBorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ protected static SideValues checkBorderSide(ApplContext ac, CssProperty caller,
break;
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
_color = c;
break;
case CssTypes.CSS_COLOR:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css1/CssBorderColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public CssBorderColor(ApplContext ac, CssExpression expression,
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
res.add(c);
break;
case CssTypes.CSS_COLOR:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css1/CssColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public CssColor(ApplContext ac, CssExpression expression, boolean check)
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
color = c;
break;
case CssTypes.CSS_IDENT:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css2/CssBackgroundColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public CssBackgroundColor(ApplContext ac, CssExpression expression,
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
setColor(c);
break;
case CssTypes.CSS_COLOR:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css2/CssBorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ protected static SideValues checkBorderSide(ApplContext ac, CssProperty caller,
break;
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
_color = c;
break;
case CssTypes.CSS_COLOR:
Expand Down
4 changes: 2 additions & 2 deletions org/w3c/css/properties/css2/CssBorderColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public CssBorderColor(ApplContext ac, CssExpression expression,
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
res.add(c);
break;
case CssTypes.CSS_COLOR:
Expand Down Expand Up @@ -148,7 +148,7 @@ protected static CssValue checkBorderSideColor(ApplContext ac, CssProperty calle
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
retval = c;
break;
case CssTypes.CSS_COLOR:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css2/CssColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public CssColor(ApplContext ac, CssExpression expression, boolean check)
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
color = c;
break;
case CssTypes.CSS_IDENT:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css2/CssOutlineColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public CssOutlineColor(ApplContext ac, CssExpression expression, boolean check)
break;
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
value = c;
break;
case CssTypes.CSS_IDENT:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css21/CssBackgroundColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public CssBackgroundColor(ApplContext ac, CssExpression expression,
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
setColor(c);
break;
case CssTypes.CSS_COLOR:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css21/CssBorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ protected static SideValues checkBorderSide(ApplContext ac, CssProperty caller,
break;
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
_color = c;
break;
case CssTypes.CSS_COLOR:
Expand Down
4 changes: 2 additions & 2 deletions org/w3c/css/properties/css21/CssBorderColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public CssBorderColor(ApplContext ac, CssExpression expression,
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
res.add(c);
break;
case CssTypes.CSS_COLOR:
Expand Down Expand Up @@ -149,7 +149,7 @@ protected static CssValue checkBorderSideColor(ApplContext ac, CssProperty calle
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
retval = c;
break;
case CssTypes.CSS_COLOR:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css21/CssColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public CssColor(ApplContext ac, CssExpression expression, boolean check)
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
color = c;
break;
case CssTypes.CSS_IDENT:
Expand Down
2 changes: 1 addition & 1 deletion org/w3c/css/properties/css21/CssOutlineColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public CssOutlineColor(ApplContext ac, CssExpression expression, boolean check)
switch (val.getType()) {
case CssTypes.CSS_HASH_IDENT:
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
c.setShortRGBColor(val.toString(), ac);
c.setShortRGBColor(ac, val.toString());
value = c;
break;
case CssTypes.CSS_COLOR:
Expand Down
Loading