Skip to content
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

Support floating point hue in hsl() and hsla() #31

Merged
merged 3 commits into from
Dec 3, 2024
Merged

Support floating point hue in hsl() and hsla() #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10f848c
feat: support floating point hue in `hsl()` and `hsla()`
erxclau Nov 30, 2024
f2b6346
Comment out integer parsing functions
erxclau Nov 30, 2024
ad7ec80
Remove integer parsing
erxclau Dec 3, 2024
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
16 changes: 14 additions & 2 deletions src/color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ impl Stream<'_> {
} else if name == "hsl" || name == "hsla" {
self.consume_byte(b'(')?;

let mut hue = self.parse_list_integer()?;
hue = ((hue % 360) + 360) % 360;
let mut hue = self.parse_list_number()?;
hue = ((hue % 360.0) + 360.0) % 360.0;

let saturation = f64_bound(0.0, self.parse_list_number_or_percent()?, 1.0);
let lightness = f64_bound(0.0, self.parse_list_number_or_percent()?, 1.0);
Expand Down Expand Up @@ -554,6 +554,18 @@ mod tests {
Color::new_rgba(127, 255, 127, 127)
);

test!(
hsl_with_hue_float,
"hsl(120.152, 100%, 75%)",
Color::new_rgba(127, 255, 127, 255)
);

test!(
hsla_with_hue_float,
"hsla(120.152, 100%, 75%, 0.5)",
Color::new_rgba(127, 255, 127, 127)
);

macro_rules! test_err {
($name:ident, $text:expr, $err:expr) => {
#[test]
Expand Down
68 changes: 0 additions & 68 deletions src/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright 2018 the SVG Types Authors
// SPDX-License-Identifier: Apache-2.0 OR MIT

use std::str::FromStr;

use crate::Error;

/// Extension methods for XML-subset only operations.
Expand Down Expand Up @@ -409,52 +407,6 @@ impl<'a> Stream<'a> {
&self.text[self.pos..]
}

/// Parses integer number from the stream.
///
/// Same as [`parse_number()`], but only for integer. Does not refer to any SVG type.
///
/// [`parse_number()`]: #method.parse_number
pub fn parse_integer(&mut self) -> Result<i32, Error> {
self.skip_spaces();

if self.at_end() {
return Err(Error::InvalidNumber(self.calc_char_pos()));
}

let start = self.pos();

// Consume sign.
if self.curr_byte()?.is_sign() {
self.advance(1);
}

// The current char must be a digit.
if !self.curr_byte()?.is_digit() {
return Err(Error::InvalidNumber(self.calc_char_pos_at(start)));
}

self.skip_digits();

// Use the default i32 parser now.
let s = self.slice_back(start);
match i32::from_str(s) {
Ok(n) => Ok(n),
Err(_) => Err(Error::InvalidNumber(self.calc_char_pos_at(start))),
}
}

/// Parses integer from a list of numbers.
pub fn parse_list_integer(&mut self) -> Result<i32, Error> {
if self.at_end() {
return Err(Error::UnexpectedEndOfStream);
}

let n = self.parse_integer()?;
self.skip_spaces();
self.parse_list_separator();
Ok(n)
}

/// Parses number or percent from the stream.
///
/// Percent value will be normalized.
Expand Down Expand Up @@ -494,23 +446,3 @@ impl<'a> Stream<'a> {
}
}
}

#[rustfmt::skip]
#[cfg(test)]
mod tests {
use super::*;

#[test]
fn parse_integer_1() {
let mut s = Stream::from("10");
assert_eq!(s.parse_integer().unwrap(), 10);
}

#[test]
fn parse_err_integer_1() {
// error because of overflow
let mut s = Stream::from("10000000000000");
assert_eq!(s.parse_integer().unwrap_err().to_string(),
"invalid number at position 1");
}
}
Loading