Skip to content

Commit

Permalink
Revert "Support number or percentage in lab, lch, oklab, and oklch co…
Browse files Browse the repository at this point in the history 
…lors"

This reverts commit 835e5bc.
  • Loading branch information
@devongovett
devongovett committed Apr 15, 2023
1 parent ec6767e commit 81cd955
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 56 deletions.
32 changes: 0 additions & 32 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13534,14 +13534,6 @@ mod tests {
".foo { color: lab(29.2345% 39.3825 20.0664); }",
".foo{color:lab(29.2345% 39.3825 20.0664)}",
);
minify_test(
".foo { color: lab(29.2345 39.3825 20.0664); }",
".foo{color:lab(29.2345% 39.3825 20.0664)}",
);
minify_test(
".foo { color: lab(29.2345% 39.3825% 20.0664%); }",
".foo{color:lab(29.2345% 49.2281 25.083)}",
);
minify_test(
".foo { color: lab(29.2345% 39.3825 20.0664 / 100%); }",
".foo{color:lab(29.2345% 39.3825 20.0664)}",
Expand All @@ -13554,14 +13546,6 @@ mod tests {
".foo { color: lch(29.2345% 44.2 27); }",
".foo{color:lch(29.2345% 44.2 27)}",
);
minify_test(
".foo { color: lch(29.2345 44.2 27); }",
".foo{color:lch(29.2345% 44.2 27)}",
);
minify_test(
".foo { color: lch(29.2345% 44.2% 27deg); }",
".foo{color:lch(29.2345% 66.3 27)}",
);
minify_test(
".foo { color: lch(29.2345% 44.2 45deg); }",
".foo{color:lch(29.2345% 44.2 45)}",
Expand All @@ -13582,26 +13566,10 @@ mod tests {
".foo { color: oklab(40.101% 0.1147 0.0453); }",
".foo{color:oklab(40.101% .1147 .0453)}",
);
minify_test(
".foo { color: oklab(.40101 0.1147 0.0453); }",
".foo{color:oklab(40.101% .1147 .0453)}",
);
minify_test(
".foo { color: oklab(40.101% 0.1147% 0.0453%); }",
".foo{color:oklab(40.101% .0004588 .0001812)}",
);
minify_test(
".foo { color: oklch(40.101% 0.12332 21.555); }",
".foo{color:oklch(40.101% .12332 21.555)}",
);
minify_test(
".foo { color: oklch(.40101 0.12332 21.555); }",
".foo{color:oklch(40.101% .12332 21.555)}",
);
minify_test(
".foo { color: oklch(40.101% 0.12332% 21.555); }",
".foo{color:oklch(40.101% .00049328 21.555)}",
);
minify_test(
".foo { color: oklch(40.101% 0.12332 .5turn); }",
".foo{color:oklch(40.101% .12332 180)}",
Expand Down
42 changes: 18 additions & 24 deletions src/values/color.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ impl ToCss for CssColor {
Ok(())
}
CssColor::LAB(lab) => match &**lab {
LABColor::LAB(lab) => write_components("lab", lab.l / 100.0, lab.a, lab.b, lab.alpha, dest),
LABColor::LCH(lch) => write_components("lch", lch.l / 100.0, lch.c, lch.h, lch.alpha, dest),
LABColor::LAB(lab) => write_components("lab", lab.l, lab.a, lab.b, lab.alpha, dest),
LABColor::LCH(lch) => write_components("lch", lch.l, lch.c, lch.h, lch.alpha, dest),
LABColor::OKLAB(lab) => write_components("oklab", lab.l, lab.a, lab.b, lab.alpha, dest),
LABColor::OKLCH(lch) => write_components("oklch", lch.l, lch.c, lch.h, lch.alpha, dest),
},
Expand Down Expand Up @@ -826,22 +826,22 @@ fn parse_color_function<'i, 't>(input: &mut Parser<'i, 't>) -> Result<CssColor,

match_ignore_ascii_case! {&*function,
"lab" => {
let (l, a, b, alpha) = parse_lab::<LAB>(input, &mut parser, 100.0, 125.0)?;
let (l, a, b, alpha) = parse_lab::<LAB>(input, &mut parser)?;
let lab = LABColor::LAB(LAB { l, a, b, alpha });
Ok(CssColor::LAB(Box::new(lab)))
},
"oklab" => {
let (l, a, b, alpha) = parse_lab::<OKLAB>(input, &mut parser, 1.0, 0.4)?;
let (l, a, b, alpha) = parse_lab::<OKLAB>(input, &mut parser)?;
let lab = LABColor::OKLAB(OKLAB { l, a, b, alpha });
Ok(CssColor::LAB(Box::new(lab)))
},
"lch" => {
let (l, c, h, alpha) = parse_lch::<LCH>(input, &mut parser, 100.0, 150.0)?;
let (l, c, h, alpha) = parse_lch::<LCH>(input, &mut parser)?;
let lab = LABColor::LCH(LCH { l, c, h, alpha });
Ok(CssColor::LAB(Box::new(lab)))
},
"oklch" => {
let (l, c, h, alpha) = parse_lch::<OKLCH>(input, &mut parser, 1.0, 0.4)?;
let (l, c, h, alpha) = parse_lch::<OKLCH>(input, &mut parser)?;
let lab = LABColor::OKLCH(OKLCH { l, c, h, alpha });
Ok(CssColor::LAB(Box::new(lab)))
},
Expand Down Expand Up @@ -875,17 +875,15 @@ fn parse_color_function<'i, 't>(input: &mut Parser<'i, 't>) -> Result<CssColor,
fn parse_lab<'i, 't, T: From<CssColor> + ColorSpace>(
input: &mut Parser<'i, 't>,
parser: &mut ComponentParser,
l_basis: f32,
ab_basis: f32,
) -> Result<(f32, f32, f32, f32), ParseError<'i, ParserError<'i>>> {
// https://www.w3.org/TR/css-color-4/#funcdef-lab
let res = input.parse_nested_block(|input| {
parser.parse_relative::<T>(input)?;

// f32::max() does not propagate NaN, so use clamp for now until f32::maximum() is stable.
let l = parse_number_or_percentage(input, parser, l_basis)?.clamp(0.0, f32::MAX);
let a = parse_number_or_percentage(input, parser, ab_basis)?;
let b = parse_number_or_percentage(input, parser, ab_basis)?;
let l = parser.parse_percentage(input)?.clamp(0.0, f32::MAX);
let a = parser.parse_number(input)?;
let b = parser.parse_number(input)?;
let alpha = parse_alpha(input, parser)?;

Ok((l, a, b, alpha))
Expand All @@ -899,8 +897,6 @@ fn parse_lab<'i, 't, T: From<CssColor> + ColorSpace>(
fn parse_lch<'i, 't, T: From<CssColor> + ColorSpace>(
input: &mut Parser<'i, 't>,
parser: &mut ComponentParser,
l_basis: f32,
c_basis: f32,
) -> Result<(f32, f32, f32, f32), ParseError<'i, ParserError<'i>>> {
// https://www.w3.org/TR/css-color-4/#funcdef-lch
let res = input.parse_nested_block(|input| {
Expand All @@ -914,8 +910,8 @@ fn parse_lch<'i, 't, T: From<CssColor> + ColorSpace>(
}
}

let l = parse_number_or_percentage(input, parser, l_basis)?.clamp(0.0, f32::MAX);
let c = parse_number_or_percentage(input, parser, c_basis)?.clamp(0.0, f32::MAX);
let l = parser.parse_percentage(input)?.clamp(0.0, f32::MAX);
let c = parser.parse_number(input)?.clamp(0.0, f32::MAX);
let h = parse_angle_or_number(input, parser)?;
let alpha = parse_alpha(input, parser)?;

Expand Down Expand Up @@ -960,13 +956,13 @@ fn parse_predefined<'i, 't>(
// Out of gamut values should not be clamped, i.e. values < 0 or > 1 should be preserved.
// The browser will gamut-map the color for the target device that it is rendered on.
let a = input
.try_parse(|input| parse_number_or_percentage(input, parser, 1.0))
.try_parse(|input| parse_number_or_percentage(input, parser))
.unwrap_or(0.0);
let b = input
.try_parse(|input| parse_number_or_percentage(input, parser, 1.0))
.try_parse(|input| parse_number_or_percentage(input, parser))
.unwrap_or(0.0);
let c = input
.try_parse(|input| parse_number_or_percentage(input, parser, 1.0))
.try_parse(|input| parse_number_or_percentage(input, parser))
.unwrap_or(0.0);
let alpha = parse_alpha(input, parser)?;

Expand Down Expand Up @@ -1092,11 +1088,10 @@ fn parse_angle_or_number<'i, 't>(
fn parse_number_or_percentage<'i, 't>(
input: &mut Parser<'i, 't>,
parser: &ComponentParser,
percent_basis: f32,
) -> Result<f32, ParseError<'i, ParserError<'i>>> {
Ok(match parser.parse_number_or_percentage(input)? {
NumberOrPercentage::Number { value } => value,
NumberOrPercentage::Percentage { unit_value } => unit_value * percent_basis,
NumberOrPercentage::Percentage { unit_value } => unit_value,
})
}

Expand All @@ -1106,7 +1101,7 @@ fn parse_alpha<'i, 't>(
parser: &ComponentParser,
) -> Result<f32, ParseError<'i, ParserError<'i>>> {
let res = if input.try_parse(|input| input.expect_delim('/')).is_ok() {
parse_number_or_percentage(input, parser, 1.0)?.clamp(0.0, 1.0)
parse_number_or_percentage(input, parser)?.clamp(0.0, 1.0)
} else {
1.0
};
Expand All @@ -1130,7 +1125,6 @@ where
if a.is_nan() {
dest.write_str("none")?;
} else {
// Safari 15 only supports percentages.
Percentage(a).to_css(dest)?;
}
dest.write_char(' ')?;
Expand Down Expand Up @@ -1585,7 +1579,7 @@ impl From<LAB> for XYZd50 {
const E: f32 = 216.0 / 24389.0; // 6^3/29^3

let lab = lab.resolve_missing();
let l = lab.l;
let l = lab.l * 100.0;
let a = lab.a;
let b = lab.b;

Expand Down Expand Up @@ -1844,7 +1838,7 @@ impl From<XYZd50> for LAB {

let f2 = if z > E { z.cbrt() } else { (K * z + 16.0) / 116.0 };

let l = (116.0 * f1) - 16.0;
let l = ((116.0 * f1) - 16.0) / 100.0;
let a = 500.0 * (f0 - f1);
let b = 200.0 * (f1 - f2);
LAB {
Expand Down

0 comments on commit 81cd955

Please sign in to comment.