mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
style: Move SVGPathData and its parser into svg_path.rs.
SVGPathData will be used by clip-path and offset-path (and/or more on the properties which support <basic-shape>). Therefore, let's move SVGPathData out of motion.rs. Differential Revision: https://phabricator.services.mozilla.com/D3631
This commit is contained in:
Boris Chiou
Emilio Cobos Álvarez
parent
d4163eae96
commit
a92f9c105a
4 changed files with 522 additions and 500 deletions
|
|
@ -743,7 +743,7 @@ pub mod basic_shape {
|
||||||
impl<'a> From<&'a StyleShapeSource> for OffsetPath {
|
impl<'a> From<&'a StyleShapeSource> for OffsetPath {
|
||||||
fn from(other: &'a StyleShapeSource) -> Self {
|
fn from(other: &'a StyleShapeSource) -> Self {
|
||||||
use gecko_bindings::structs::StylePathCommand;
|
use gecko_bindings::structs::StylePathCommand;
|
||||||
use values::specified::motion::{SVGPathData, PathCommand};
|
use values::specified::svg_path::{SVGPathData, PathCommand};
|
||||||
match other.mType {
|
match other.mType {
|
||||||
StyleShapeSourceType::Path => {
|
StyleShapeSourceType::Path => {
|
||||||
let gecko_path = unsafe { &*other.__bindgen_anon_1.mSVGPath.as_ref().mPtr };
|
let gecko_path = unsafe { &*other.__bindgen_anon_1.mSVGPath.as_ref().mPtr };
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,7 @@ pub use self::position::{PositionComponent, ZIndex};
|
||||||
pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind};
|
pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind};
|
||||||
pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
|
pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
|
||||||
pub use self::svg::MozContextProperties;
|
pub use self::svg::MozContextProperties;
|
||||||
|
pub use self::svg_path::SVGPathData;
|
||||||
pub use self::table::XSpan;
|
pub use self::table::XSpan;
|
||||||
pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize, TextAlign};
|
pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize, TextAlign};
|
||||||
pub use self::text::{TextEmphasisPosition, TextEmphasisStyle};
|
pub use self::text::{TextEmphasisPosition, TextEmphasisStyle};
|
||||||
|
|
@ -109,6 +110,7 @@ pub mod rect;
|
||||||
pub mod resolution;
|
pub mod resolution;
|
||||||
pub mod source_size_list;
|
pub mod source_size_list;
|
||||||
pub mod svg;
|
pub mod svg;
|
||||||
|
pub mod svg_path;
|
||||||
pub mod table;
|
pub mod table;
|
||||||
pub mod text;
|
pub mod text;
|
||||||
pub mod time;
|
pub mod time;
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,8 @@
|
||||||
|
|
||||||
use cssparser::Parser;
|
use cssparser::Parser;
|
||||||
use parser::{Parse, ParserContext};
|
use parser::{Parse, ParserContext};
|
||||||
use std::fmt::{self, Write};
|
use style_traits::{ParseError, StyleParseErrorKind};
|
||||||
use std::iter::Peekable;
|
use values::specified::SVGPathData;
|
||||||
use std::str::Chars;
|
|
||||||
use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
|
|
||||||
use style_traits::values::SequenceWriter;
|
|
||||||
use values::CSSFloat;
|
|
||||||
|
|
||||||
/// The offset-path value.
|
/// The offset-path value.
|
||||||
///
|
///
|
||||||
|
|
@ -63,496 +59,3 @@ impl Parse for OffsetPath {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// SVG Path parser.
|
|
||||||
struct PathParser<'a> {
|
|
||||||
chars: Peekable<Chars<'a>>,
|
|
||||||
path: Vec<PathCommand>,
|
|
||||||
}
|
|
||||||
|
|
||||||
macro_rules! parse_arguments {
|
|
||||||
(
|
|
||||||
$parser:ident,
|
|
||||||
$abs:ident,
|
|
||||||
$enum:ident,
|
|
||||||
[ $para:ident => $func:ident $(, $other_para:ident => $other_func:ident)* ]
|
|
||||||
) => {
|
|
||||||
{
|
|
||||||
loop {
|
|
||||||
let $para = $func(&mut $parser.chars)?;
|
|
||||||
$(
|
|
||||||
skip_comma_wsp(&mut $parser.chars);
|
|
||||||
let $other_para = $other_func(&mut $parser.chars)?;
|
|
||||||
)*
|
|
||||||
$parser.path.push(PathCommand::$enum { $para $(, $other_para)*, $abs });
|
|
||||||
|
|
||||||
// End of string or the next character is a possible new command.
|
|
||||||
if !skip_wsp(&mut $parser.chars) ||
|
|
||||||
$parser.chars.peek().map_or(true, |c| c.is_ascii_alphabetic()) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
skip_comma_wsp(&mut $parser.chars);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> PathParser<'a> {
|
|
||||||
/// Parse a sub-path.
|
|
||||||
fn parse_subpath(&mut self) -> Result<(), ()> {
|
|
||||||
// Handle "moveto" Command first. If there is no "moveto", this is not a valid sub-path
|
|
||||||
// (i.e. not a valid moveto-drawto-command-group).
|
|
||||||
self.parse_moveto()?;
|
|
||||||
|
|
||||||
// Handle other commands.
|
|
||||||
loop {
|
|
||||||
skip_wsp(&mut self.chars);
|
|
||||||
if self.chars.peek().map_or(true, |m| *m == 'M' || *m == 'm') {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
match self.chars.next() {
|
|
||||||
Some(command) => {
|
|
||||||
let abs = command.is_uppercase();
|
|
||||||
macro_rules! parse_command {
|
|
||||||
( $($($p:pat)|+ => $parse_func:ident,)* ) => {
|
|
||||||
match command {
|
|
||||||
$(
|
|
||||||
$($p)|+ => {
|
|
||||||
skip_wsp(&mut self.chars);
|
|
||||||
self.$parse_func(abs)?;
|
|
||||||
},
|
|
||||||
)*
|
|
||||||
_ => return Err(()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
parse_command!(
|
|
||||||
'Z' | 'z' => parse_closepath,
|
|
||||||
'L' | 'l' => parse_lineto,
|
|
||||||
'H' | 'h' => parse_h_lineto,
|
|
||||||
'V' | 'v' => parse_v_lineto,
|
|
||||||
'C' | 'c' => parse_curveto,
|
|
||||||
'S' | 's' => parse_smooth_curveto,
|
|
||||||
'Q' | 'q' => parse_quadratic_bezier_curveto,
|
|
||||||
'T' | 't' => parse_smooth_quadratic_bezier_curveto,
|
|
||||||
'A' | 'a' => parse_elliprical_arc,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
_ => break, // no more commands.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse "moveto" command.
|
|
||||||
fn parse_moveto(&mut self) -> Result<(), ()> {
|
|
||||||
let command = match self.chars.next() {
|
|
||||||
Some(c) if c == 'M' || c == 'm' => c,
|
|
||||||
_ => return Err(()),
|
|
||||||
};
|
|
||||||
|
|
||||||
skip_wsp(&mut self.chars);
|
|
||||||
let point = parse_coord(&mut self.chars)?;
|
|
||||||
let absolute = command == 'M';
|
|
||||||
self.path.push(PathCommand::MoveTo { point, absolute } );
|
|
||||||
|
|
||||||
// End of string or the next character is a possible new command.
|
|
||||||
if !skip_wsp(&mut self.chars) ||
|
|
||||||
self.chars.peek().map_or(true, |c| c.is_ascii_alphabetic()) {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
skip_comma_wsp(&mut self.chars);
|
|
||||||
|
|
||||||
// If a moveto is followed by multiple pairs of coordinates, the subsequent
|
|
||||||
// pairs are treated as implicit lineto commands.
|
|
||||||
self.parse_lineto(absolute)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse "closepath" command.
|
|
||||||
fn parse_closepath(&mut self, _absolute: bool) -> Result<(), ()> {
|
|
||||||
self.path.push(PathCommand::ClosePath);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse "lineto" command.
|
|
||||||
fn parse_lineto(&mut self, absolute: bool) -> Result<(), ()> {
|
|
||||||
parse_arguments!(self, absolute, LineTo, [ point => parse_coord ])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse horizontal "lineto" command.
|
|
||||||
fn parse_h_lineto(&mut self, absolute: bool) -> Result<(), ()> {
|
|
||||||
parse_arguments!(self, absolute, HorizontalLineTo, [ x => parse_number ])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse vertical "lineto" command.
|
|
||||||
fn parse_v_lineto(&mut self, absolute: bool) -> Result<(), ()> {
|
|
||||||
parse_arguments!(self, absolute, VerticalLineTo, [ y => parse_number ])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse cubic Bézier curve command.
|
|
||||||
fn parse_curveto(&mut self, absolute: bool) -> Result<(), ()> {
|
|
||||||
parse_arguments!(self, absolute, CurveTo, [
|
|
||||||
control1 => parse_coord, control2 => parse_coord, point => parse_coord
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse smooth "curveto" command.
|
|
||||||
fn parse_smooth_curveto(&mut self, absolute: bool) -> Result<(), ()> {
|
|
||||||
parse_arguments!(self, absolute, SmoothCurveTo, [
|
|
||||||
control2 => parse_coord, point => parse_coord
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse quadratic Bézier curve command.
|
|
||||||
fn parse_quadratic_bezier_curveto(&mut self, absolute: bool) -> Result<(), ()> {
|
|
||||||
parse_arguments!(self, absolute, QuadBezierCurveTo, [
|
|
||||||
control1 => parse_coord, point => parse_coord
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse smooth quadratic Bézier curveto command.
|
|
||||||
fn parse_smooth_quadratic_bezier_curveto(&mut self, absolute: bool) -> Result<(), ()> {
|
|
||||||
parse_arguments!(self, absolute, SmoothQuadBezierCurveTo, [ point => parse_coord ])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse elliptical arc curve command.
|
|
||||||
fn parse_elliprical_arc(&mut self, absolute: bool) -> Result<(), ()> {
|
|
||||||
// Parse a flag whose value is '0' or '1'; otherwise, return Err(()).
|
|
||||||
let parse_flag = |iter: &mut Peekable<Chars>| -> Result<bool, ()> {
|
|
||||||
let value = match iter.peek() {
|
|
||||||
Some(c) if *c == '0' || *c == '1' => *c == '1',
|
|
||||||
_ => return Err(()),
|
|
||||||
};
|
|
||||||
iter.next();
|
|
||||||
Ok(value)
|
|
||||||
};
|
|
||||||
parse_arguments!(self, absolute, EllipticalArc, [
|
|
||||||
rx => parse_number,
|
|
||||||
ry => parse_number,
|
|
||||||
angle => parse_number,
|
|
||||||
large_arc_flag => parse_flag,
|
|
||||||
sweep_flag => parse_flag,
|
|
||||||
point => parse_coord
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The SVG path data.
|
|
||||||
///
|
|
||||||
/// https://www.w3.org/TR/SVG11/paths.html#PathData
|
|
||||||
#[derive(Clone, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToComputedValue)]
|
|
||||||
pub struct SVGPathData(Box<[PathCommand]>);
|
|
||||||
|
|
||||||
impl SVGPathData {
|
|
||||||
/// Return SVGPathData by a slice of PathCommand.
|
|
||||||
#[inline]
|
|
||||||
pub fn new(cmd: Box<[PathCommand]>) -> Self {
|
|
||||||
debug_assert!(!cmd.is_empty());
|
|
||||||
SVGPathData(cmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Get the array of PathCommand.
|
|
||||||
#[inline]
|
|
||||||
pub fn commands(&self) -> &[PathCommand] {
|
|
||||||
debug_assert!(!self.0.is_empty());
|
|
||||||
&self.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ToCss for SVGPathData {
|
|
||||||
#[inline]
|
|
||||||
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
|
|
||||||
where
|
|
||||||
W: fmt::Write
|
|
||||||
{
|
|
||||||
dest.write_char('"')?;
|
|
||||||
{
|
|
||||||
let mut writer = SequenceWriter::new(dest, " ");
|
|
||||||
for command in self.0.iter() {
|
|
||||||
writer.item(command)?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dest.write_char('"')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Parse for SVGPathData {
|
|
||||||
// We cannot use cssparser::Parser to parse a SVG path string because the spec wants to make
|
|
||||||
// the SVG path string as compact as possible. (i.e. The whitespaces may be dropped.)
|
|
||||||
// e.g. "M100 200L100 200" is a valid SVG path string. If we use tokenizer, the first ident
|
|
||||||
// is "M100", instead of "M", and this is not correct. Therefore, we use a Peekable
|
|
||||||
// str::Char iterator to check each character.
|
|
||||||
fn parse<'i, 't>(
|
|
||||||
_context: &ParserContext,
|
|
||||||
input: &mut Parser<'i, 't>
|
|
||||||
) -> Result<Self, ParseError<'i>> {
|
|
||||||
let location = input.current_source_location();
|
|
||||||
let path_string = input.expect_string()?.as_ref();
|
|
||||||
if path_string.is_empty() {
|
|
||||||
// Treat an empty string as invalid, so we will not set it.
|
|
||||||
return Err(location.new_custom_error(StyleParseErrorKind::UnspecifiedError));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse the svg path string as multiple sub-paths.
|
|
||||||
let mut path_parser = PathParser {
|
|
||||||
chars: path_string.chars().peekable(),
|
|
||||||
path: Vec::new(),
|
|
||||||
};
|
|
||||||
while skip_wsp(&mut path_parser.chars) {
|
|
||||||
if path_parser.parse_subpath().is_err() {
|
|
||||||
return Err(location.new_custom_error(StyleParseErrorKind::UnspecifiedError));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(SVGPathData::new(path_parser.path.into_boxed_slice()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// The SVG path command.
|
|
||||||
/// The fields of these commands are self-explanatory, so we skip the documents.
|
|
||||||
/// Note: the index of the control points, e.g. control1, control2, are mapping to the control
|
|
||||||
/// points of the Bézier curve in the spec.
|
|
||||||
///
|
|
||||||
/// https://www.w3.org/TR/SVG11/paths.html#PathData
|
|
||||||
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo)]
|
|
||||||
#[allow(missing_docs)]
|
|
||||||
#[repr(C, u8)]
|
|
||||||
pub enum PathCommand {
|
|
||||||
/// The unknown type.
|
|
||||||
/// https://www.w3.org/TR/SVG/paths.html#__svg__SVGPathSeg__PATHSEG_UNKNOWN
|
|
||||||
Unknown,
|
|
||||||
/// The "moveto" command.
|
|
||||||
MoveTo { point: CoordPair, absolute: bool },
|
|
||||||
/// The "lineto" command.
|
|
||||||
LineTo { point: CoordPair, absolute: bool },
|
|
||||||
/// The horizontal "lineto" command.
|
|
||||||
HorizontalLineTo { x: CSSFloat, absolute: bool },
|
|
||||||
/// The vertical "lineto" command.
|
|
||||||
VerticalLineTo { y: CSSFloat, absolute: bool },
|
|
||||||
/// The cubic Bézier curve command.
|
|
||||||
CurveTo { control1: CoordPair, control2: CoordPair, point: CoordPair, absolute: bool },
|
|
||||||
/// The smooth curve command.
|
|
||||||
SmoothCurveTo { control2: CoordPair, point: CoordPair, absolute: bool },
|
|
||||||
/// The quadratic Bézier curve command.
|
|
||||||
QuadBezierCurveTo { control1: CoordPair, point: CoordPair, absolute: bool },
|
|
||||||
/// The smooth quadratic Bézier curve command.
|
|
||||||
SmoothQuadBezierCurveTo { point: CoordPair, absolute: bool },
|
|
||||||
/// The elliptical arc curve command.
|
|
||||||
EllipticalArc {
|
|
||||||
rx: CSSFloat,
|
|
||||||
ry: CSSFloat,
|
|
||||||
angle: CSSFloat,
|
|
||||||
large_arc_flag: bool,
|
|
||||||
sweep_flag: bool,
|
|
||||||
point: CoordPair,
|
|
||||||
absolute: bool
|
|
||||||
},
|
|
||||||
/// The "closepath" command.
|
|
||||||
ClosePath,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ToCss for PathCommand {
|
|
||||||
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
|
|
||||||
where
|
|
||||||
W: fmt::Write
|
|
||||||
{
|
|
||||||
use self::PathCommand::*;
|
|
||||||
match *self {
|
|
||||||
Unknown => dest.write_str("X"),
|
|
||||||
ClosePath => dest.write_str("Z"),
|
|
||||||
MoveTo { point, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'M' } else { 'm' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
point.to_css(dest)
|
|
||||||
}
|
|
||||||
LineTo { point, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'L' } else { 'l' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
point.to_css(dest)
|
|
||||||
}
|
|
||||||
CurveTo { control1, control2, point, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'C' } else { 'c' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
control1.to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
control2.to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
point.to_css(dest)
|
|
||||||
},
|
|
||||||
QuadBezierCurveTo { control1, point, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'Q' } else { 'q' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
control1.to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
point.to_css(dest)
|
|
||||||
},
|
|
||||||
EllipticalArc { rx, ry, angle, large_arc_flag, sweep_flag, point, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'A' } else { 'a' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
rx.to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
ry.to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
angle.to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
(large_arc_flag as i32).to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
(sweep_flag as i32).to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
point.to_css(dest)
|
|
||||||
},
|
|
||||||
HorizontalLineTo { x, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'H' } else { 'h' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
x.to_css(dest)
|
|
||||||
},
|
|
||||||
VerticalLineTo { y, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'V' } else { 'v' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
y.to_css(dest)
|
|
||||||
},
|
|
||||||
SmoothCurveTo { control2, point, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'S' } else { 's' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
control2.to_css(dest)?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
point.to_css(dest)
|
|
||||||
},
|
|
||||||
SmoothQuadBezierCurveTo { point, absolute } => {
|
|
||||||
dest.write_char(if absolute { 'T' } else { 't' })?;
|
|
||||||
dest.write_char(' ')?;
|
|
||||||
point.to_css(dest)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The path coord type.
|
|
||||||
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToCss)]
|
|
||||||
#[repr(C)]
|
|
||||||
pub struct CoordPair(CSSFloat, CSSFloat);
|
|
||||||
|
|
||||||
impl CoordPair {
|
|
||||||
/// Create a CoordPair.
|
|
||||||
#[inline]
|
|
||||||
pub fn new(x: CSSFloat, y: CSSFloat) -> Self {
|
|
||||||
CoordPair(x, y)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse a pair of numbers into CoordPair.
|
|
||||||
fn parse_coord(iter: &mut Peekable<Chars>) -> Result<CoordPair, ()> {
|
|
||||||
let x = parse_number(iter)?;
|
|
||||||
skip_comma_wsp(iter);
|
|
||||||
let y = parse_number(iter)?;
|
|
||||||
Ok(CoordPair::new(x, y))
|
|
||||||
}
|
|
||||||
|
|
||||||
/// This is a special version which parses the number for SVG Path. e.g. "M 0.6.5" should be parsed
|
|
||||||
/// as MoveTo with a coordinate of ("0.6", ".5"), instead of treating 0.6.5 as a non-valid floating
|
|
||||||
/// point number. In other words, the logic here is similar with that of
|
|
||||||
/// tokenizer::consume_numeric, which also consumes the number as many as possible, but here the
|
|
||||||
/// input is a Peekable and we only accept an integer of a floating point number.
|
|
||||||
///
|
|
||||||
/// The "number" syntax in https://www.w3.org/TR/SVG/paths.html#PathDataBNF
|
|
||||||
fn parse_number(iter: &mut Peekable<Chars>) -> Result<CSSFloat, ()> {
|
|
||||||
// 1. Check optional sign.
|
|
||||||
let sign = if iter.peek().map_or(false, |&sign: &char| sign == '+' || sign == '-') {
|
|
||||||
if iter.next().unwrap() == '-' { -1. } else { 1. }
|
|
||||||
} else {
|
|
||||||
1.
|
|
||||||
};
|
|
||||||
|
|
||||||
// 2. Check integer part.
|
|
||||||
let mut integral_part: f64 = 0.;
|
|
||||||
let got_dot = if !iter.peek().map_or(false, |&n: &char| n == '.') {
|
|
||||||
// If the first digit in integer part is neither a dot nor a digit, this is not a number.
|
|
||||||
if iter.peek().map_or(true, |n: &char| !n.is_ascii_digit()) {
|
|
||||||
return Err(());
|
|
||||||
}
|
|
||||||
|
|
||||||
while iter.peek().map_or(false, |n: &char| n.is_ascii_digit()) {
|
|
||||||
integral_part =
|
|
||||||
integral_part * 10. + iter.next().unwrap().to_digit(10).unwrap() as f64;
|
|
||||||
}
|
|
||||||
|
|
||||||
iter.peek().map_or(false, |&n: &char| n == '.')
|
|
||||||
} else {
|
|
||||||
true
|
|
||||||
};
|
|
||||||
|
|
||||||
// 3. Check fractional part.
|
|
||||||
let mut fractional_part: f64 = 0.;
|
|
||||||
if got_dot {
|
|
||||||
// Consume '.'.
|
|
||||||
iter.next();
|
|
||||||
// If the first digit in fractional part is not a digit, this is not a number.
|
|
||||||
if iter.peek().map_or(true, |n: &char| !n.is_ascii_digit()) {
|
|
||||||
return Err(());
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut factor = 0.1;
|
|
||||||
while iter.peek().map_or(false, |n: &char| n.is_ascii_digit()) {
|
|
||||||
fractional_part += iter.next().unwrap().to_digit(10).unwrap() as f64 * factor;
|
|
||||||
factor *= 0.1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut value = sign * (integral_part + fractional_part);
|
|
||||||
|
|
||||||
// 4. Check exp part. The segment name of SVG Path doesn't include 'E' or 'e', so it's ok to
|
|
||||||
// treat the numbers after 'E' or 'e' are in the exponential part.
|
|
||||||
if iter.peek().map_or(false, |&exp: &char| exp == 'E' || exp == 'e') {
|
|
||||||
// Consume 'E' or 'e'.
|
|
||||||
iter.next();
|
|
||||||
let exp_sign = if iter.peek().map_or(false, |&sign: &char| sign == '+' || sign == '-') {
|
|
||||||
if iter.next().unwrap() == '-' { -1. } else { 1. }
|
|
||||||
} else {
|
|
||||||
1.
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut exp: f64 = 0.;
|
|
||||||
while iter.peek().map_or(false, |n: &char| n.is_ascii_digit()) {
|
|
||||||
exp = exp * 10. + iter.next().unwrap().to_digit(10).unwrap() as f64;
|
|
||||||
}
|
|
||||||
|
|
||||||
value *= f64::powf(10., exp * exp_sign);
|
|
||||||
}
|
|
||||||
|
|
||||||
if value.is_finite() {
|
|
||||||
Ok(value.min(::std::f32::MAX as f64).max(::std::f32::MIN as f64) as CSSFloat)
|
|
||||||
} else {
|
|
||||||
Err(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Skip all svg whitespaces, and return true if |iter| hasn't finished.
|
|
||||||
#[inline]
|
|
||||||
fn skip_wsp(iter: &mut Peekable<Chars>) -> bool {
|
|
||||||
// Note: SVG 1.1 defines the whitespaces as \u{9}, \u{20}, \u{A}, \u{D}.
|
|
||||||
// However, SVG 2 has one extra whitespace: \u{C}.
|
|
||||||
// Therefore, we follow the newest spec for the definition of whitespace,
|
|
||||||
// i.e. \u{9}, \u{20}, \u{A}, \u{C}, \u{D}, by is_ascii_whitespace().
|
|
||||||
while iter.peek().map_or(false, |c: &char| c.is_ascii_whitespace()) {
|
|
||||||
iter.next();
|
|
||||||
}
|
|
||||||
iter.peek().is_some()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Skip all svg whitespaces and one comma, and return true if |iter| hasn't finished.
|
|
||||||
#[inline]
|
|
||||||
fn skip_comma_wsp(iter: &mut Peekable<Chars>) -> bool {
|
|
||||||
if !skip_wsp(iter) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if *iter.peek().unwrap() != ',' {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
iter.next();
|
|
||||||
|
|
||||||
skip_wsp(iter)
|
|
||||||
}
|
|
||||||
|
|
|
||||||
517
components/style/values/specified/svg_path.rs
Normal file
517
components/style/values/specified/svg_path.rs
Normal file
|
|
@ -0,0 +1,517 @@
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
//! Specified types for SVG Path.
|
||||||
|
|
||||||
|
use cssparser::Parser;
|
||||||
|
use parser::{Parse, ParserContext};
|
||||||
|
use std::fmt::{self, Write};
|
||||||
|
use std::iter::Peekable;
|
||||||
|
use std::str::Chars;
|
||||||
|
use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
|
||||||
|
use style_traits::values::SequenceWriter;
|
||||||
|
use values::CSSFloat;
|
||||||
|
|
||||||
|
|
||||||
|
/// The SVG path data.
|
||||||
|
///
|
||||||
|
/// https://www.w3.org/TR/SVG11/paths.html#PathData
|
||||||
|
#[derive(Clone, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToComputedValue)]
|
||||||
|
pub struct SVGPathData(Box<[PathCommand]>);
|
||||||
|
|
||||||
|
impl SVGPathData {
|
||||||
|
/// Return SVGPathData by a slice of PathCommand.
|
||||||
|
#[inline]
|
||||||
|
pub fn new(cmd: Box<[PathCommand]>) -> Self {
|
||||||
|
debug_assert!(!cmd.is_empty());
|
||||||
|
SVGPathData(cmd)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the array of PathCommand.
|
||||||
|
#[inline]
|
||||||
|
pub fn commands(&self) -> &[PathCommand] {
|
||||||
|
debug_assert!(!self.0.is_empty());
|
||||||
|
&self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToCss for SVGPathData {
|
||||||
|
#[inline]
|
||||||
|
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
|
||||||
|
where
|
||||||
|
W: fmt::Write
|
||||||
|
{
|
||||||
|
dest.write_char('"')?;
|
||||||
|
{
|
||||||
|
let mut writer = SequenceWriter::new(dest, " ");
|
||||||
|
for command in self.0.iter() {
|
||||||
|
writer.item(command)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dest.write_char('"')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Parse for SVGPathData {
|
||||||
|
// We cannot use cssparser::Parser to parse a SVG path string because the spec wants to make
|
||||||
|
// the SVG path string as compact as possible. (i.e. The whitespaces may be dropped.)
|
||||||
|
// e.g. "M100 200L100 200" is a valid SVG path string. If we use tokenizer, the first ident
|
||||||
|
// is "M100", instead of "M", and this is not correct. Therefore, we use a Peekable
|
||||||
|
// str::Char iterator to check each character.
|
||||||
|
fn parse<'i, 't>(
|
||||||
|
_context: &ParserContext,
|
||||||
|
input: &mut Parser<'i, 't>
|
||||||
|
) -> Result<Self, ParseError<'i>> {
|
||||||
|
let location = input.current_source_location();
|
||||||
|
let path_string = input.expect_string()?.as_ref();
|
||||||
|
if path_string.is_empty() {
|
||||||
|
// Treat an empty string as invalid, so we will not set it.
|
||||||
|
return Err(location.new_custom_error(StyleParseErrorKind::UnspecifiedError));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse the svg path string as multiple sub-paths.
|
||||||
|
let mut path_parser = PathParser::new(path_string);
|
||||||
|
while skip_wsp(&mut path_parser.chars) {
|
||||||
|
if path_parser.parse_subpath().is_err() {
|
||||||
|
return Err(location.new_custom_error(StyleParseErrorKind::UnspecifiedError));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(SVGPathData::new(path_parser.path.into_boxed_slice()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// The SVG path command.
|
||||||
|
/// The fields of these commands are self-explanatory, so we skip the documents.
|
||||||
|
/// Note: the index of the control points, e.g. control1, control2, are mapping to the control
|
||||||
|
/// points of the Bézier curve in the spec.
|
||||||
|
///
|
||||||
|
/// https://www.w3.org/TR/SVG11/paths.html#PathData
|
||||||
|
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo)]
|
||||||
|
#[allow(missing_docs)]
|
||||||
|
#[repr(C, u8)]
|
||||||
|
pub enum PathCommand {
|
||||||
|
/// The unknown type.
|
||||||
|
/// https://www.w3.org/TR/SVG/paths.html#__svg__SVGPathSeg__PATHSEG_UNKNOWN
|
||||||
|
Unknown,
|
||||||
|
/// The "moveto" command.
|
||||||
|
MoveTo { point: CoordPair, absolute: bool },
|
||||||
|
/// The "lineto" command.
|
||||||
|
LineTo { point: CoordPair, absolute: bool },
|
||||||
|
/// The horizontal "lineto" command.
|
||||||
|
HorizontalLineTo { x: CSSFloat, absolute: bool },
|
||||||
|
/// The vertical "lineto" command.
|
||||||
|
VerticalLineTo { y: CSSFloat, absolute: bool },
|
||||||
|
/// The cubic Bézier curve command.
|
||||||
|
CurveTo { control1: CoordPair, control2: CoordPair, point: CoordPair, absolute: bool },
|
||||||
|
/// The smooth curve command.
|
||||||
|
SmoothCurveTo { control2: CoordPair, point: CoordPair, absolute: bool },
|
||||||
|
/// The quadratic Bézier curve command.
|
||||||
|
QuadBezierCurveTo { control1: CoordPair, point: CoordPair, absolute: bool },
|
||||||
|
/// The smooth quadratic Bézier curve command.
|
||||||
|
SmoothQuadBezierCurveTo { point: CoordPair, absolute: bool },
|
||||||
|
/// The elliptical arc curve command.
|
||||||
|
EllipticalArc {
|
||||||
|
rx: CSSFloat,
|
||||||
|
ry: CSSFloat,
|
||||||
|
angle: CSSFloat,
|
||||||
|
large_arc_flag: bool,
|
||||||
|
sweep_flag: bool,
|
||||||
|
point: CoordPair,
|
||||||
|
absolute: bool
|
||||||
|
},
|
||||||
|
/// The "closepath" command.
|
||||||
|
ClosePath,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToCss for PathCommand {
|
||||||
|
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
|
||||||
|
where
|
||||||
|
W: fmt::Write
|
||||||
|
{
|
||||||
|
use self::PathCommand::*;
|
||||||
|
match *self {
|
||||||
|
Unknown => dest.write_str("X"),
|
||||||
|
ClosePath => dest.write_str("Z"),
|
||||||
|
MoveTo { point, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'M' } else { 'm' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
point.to_css(dest)
|
||||||
|
}
|
||||||
|
LineTo { point, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'L' } else { 'l' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
point.to_css(dest)
|
||||||
|
}
|
||||||
|
CurveTo { control1, control2, point, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'C' } else { 'c' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
control1.to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
control2.to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
point.to_css(dest)
|
||||||
|
},
|
||||||
|
QuadBezierCurveTo { control1, point, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'Q' } else { 'q' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
control1.to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
point.to_css(dest)
|
||||||
|
},
|
||||||
|
EllipticalArc { rx, ry, angle, large_arc_flag, sweep_flag, point, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'A' } else { 'a' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
rx.to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
ry.to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
angle.to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
(large_arc_flag as i32).to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
(sweep_flag as i32).to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
point.to_css(dest)
|
||||||
|
},
|
||||||
|
HorizontalLineTo { x, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'H' } else { 'h' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
x.to_css(dest)
|
||||||
|
},
|
||||||
|
VerticalLineTo { y, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'V' } else { 'v' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
y.to_css(dest)
|
||||||
|
},
|
||||||
|
SmoothCurveTo { control2, point, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'S' } else { 's' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
control2.to_css(dest)?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
point.to_css(dest)
|
||||||
|
},
|
||||||
|
SmoothQuadBezierCurveTo { point, absolute } => {
|
||||||
|
dest.write_char(if absolute { 'T' } else { 't' })?;
|
||||||
|
dest.write_char(' ')?;
|
||||||
|
point.to_css(dest)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// The path coord type.
|
||||||
|
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToCss)]
|
||||||
|
#[repr(C)]
|
||||||
|
pub struct CoordPair(CSSFloat, CSSFloat);
|
||||||
|
|
||||||
|
impl CoordPair {
|
||||||
|
/// Create a CoordPair.
|
||||||
|
#[inline]
|
||||||
|
pub fn new(x: CSSFloat, y: CSSFloat) -> Self {
|
||||||
|
CoordPair(x, y)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// SVG Path parser.
|
||||||
|
struct PathParser<'a> {
|
||||||
|
chars: Peekable<Chars<'a>>,
|
||||||
|
path: Vec<PathCommand>,
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! parse_arguments {
|
||||||
|
(
|
||||||
|
$parser:ident,
|
||||||
|
$abs:ident,
|
||||||
|
$enum:ident,
|
||||||
|
[ $para:ident => $func:ident $(, $other_para:ident => $other_func:ident)* ]
|
||||||
|
) => {
|
||||||
|
{
|
||||||
|
loop {
|
||||||
|
let $para = $func(&mut $parser.chars)?;
|
||||||
|
$(
|
||||||
|
skip_comma_wsp(&mut $parser.chars);
|
||||||
|
let $other_para = $other_func(&mut $parser.chars)?;
|
||||||
|
)*
|
||||||
|
$parser.path.push(PathCommand::$enum { $para $(, $other_para)*, $abs });
|
||||||
|
|
||||||
|
// End of string or the next character is a possible new command.
|
||||||
|
if !skip_wsp(&mut $parser.chars) ||
|
||||||
|
$parser.chars.peek().map_or(true, |c| c.is_ascii_alphabetic()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
skip_comma_wsp(&mut $parser.chars);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> PathParser<'a> {
|
||||||
|
/// Return a PathParser.
|
||||||
|
#[inline]
|
||||||
|
fn new(string: &'a str) -> Self {
|
||||||
|
PathParser {
|
||||||
|
chars: string.chars().peekable(),
|
||||||
|
path: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse a sub-path.
|
||||||
|
fn parse_subpath(&mut self) -> Result<(), ()> {
|
||||||
|
// Handle "moveto" Command first. If there is no "moveto", this is not a valid sub-path
|
||||||
|
// (i.e. not a valid moveto-drawto-command-group).
|
||||||
|
self.parse_moveto()?;
|
||||||
|
|
||||||
|
// Handle other commands.
|
||||||
|
loop {
|
||||||
|
skip_wsp(&mut self.chars);
|
||||||
|
if self.chars.peek().map_or(true, |m| *m == 'M' || *m == 'm') {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
match self.chars.next() {
|
||||||
|
Some(command) => {
|
||||||
|
let abs = command.is_uppercase();
|
||||||
|
macro_rules! parse_command {
|
||||||
|
( $($($p:pat)|+ => $parse_func:ident,)* ) => {
|
||||||
|
match command {
|
||||||
|
$(
|
||||||
|
$($p)|+ => {
|
||||||
|
skip_wsp(&mut self.chars);
|
||||||
|
self.$parse_func(abs)?;
|
||||||
|
},
|
||||||
|
)*
|
||||||
|
_ => return Err(()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
parse_command!(
|
||||||
|
'Z' | 'z' => parse_closepath,
|
||||||
|
'L' | 'l' => parse_lineto,
|
||||||
|
'H' | 'h' => parse_h_lineto,
|
||||||
|
'V' | 'v' => parse_v_lineto,
|
||||||
|
'C' | 'c' => parse_curveto,
|
||||||
|
'S' | 's' => parse_smooth_curveto,
|
||||||
|
'Q' | 'q' => parse_quadratic_bezier_curveto,
|
||||||
|
'T' | 't' => parse_smooth_quadratic_bezier_curveto,
|
||||||
|
'A' | 'a' => parse_elliprical_arc,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
_ => break, // no more commands.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse "moveto" command.
|
||||||
|
fn parse_moveto(&mut self) -> Result<(), ()> {
|
||||||
|
let command = match self.chars.next() {
|
||||||
|
Some(c) if c == 'M' || c == 'm' => c,
|
||||||
|
_ => return Err(()),
|
||||||
|
};
|
||||||
|
|
||||||
|
skip_wsp(&mut self.chars);
|
||||||
|
let point = parse_coord(&mut self.chars)?;
|
||||||
|
let absolute = command == 'M';
|
||||||
|
self.path.push(PathCommand::MoveTo { point, absolute } );
|
||||||
|
|
||||||
|
// End of string or the next character is a possible new command.
|
||||||
|
if !skip_wsp(&mut self.chars) ||
|
||||||
|
self.chars.peek().map_or(true, |c| c.is_ascii_alphabetic()) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
skip_comma_wsp(&mut self.chars);
|
||||||
|
|
||||||
|
// If a moveto is followed by multiple pairs of coordinates, the subsequent
|
||||||
|
// pairs are treated as implicit lineto commands.
|
||||||
|
self.parse_lineto(absolute)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse "closepath" command.
|
||||||
|
fn parse_closepath(&mut self, _absolute: bool) -> Result<(), ()> {
|
||||||
|
self.path.push(PathCommand::ClosePath);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse "lineto" command.
|
||||||
|
fn parse_lineto(&mut self, absolute: bool) -> Result<(), ()> {
|
||||||
|
parse_arguments!(self, absolute, LineTo, [ point => parse_coord ])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse horizontal "lineto" command.
|
||||||
|
fn parse_h_lineto(&mut self, absolute: bool) -> Result<(), ()> {
|
||||||
|
parse_arguments!(self, absolute, HorizontalLineTo, [ x => parse_number ])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse vertical "lineto" command.
|
||||||
|
fn parse_v_lineto(&mut self, absolute: bool) -> Result<(), ()> {
|
||||||
|
parse_arguments!(self, absolute, VerticalLineTo, [ y => parse_number ])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse cubic Bézier curve command.
|
||||||
|
fn parse_curveto(&mut self, absolute: bool) -> Result<(), ()> {
|
||||||
|
parse_arguments!(self, absolute, CurveTo, [
|
||||||
|
control1 => parse_coord, control2 => parse_coord, point => parse_coord
|
||||||
|
])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse smooth "curveto" command.
|
||||||
|
fn parse_smooth_curveto(&mut self, absolute: bool) -> Result<(), ()> {
|
||||||
|
parse_arguments!(self, absolute, SmoothCurveTo, [
|
||||||
|
control2 => parse_coord, point => parse_coord
|
||||||
|
])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse quadratic Bézier curve command.
|
||||||
|
fn parse_quadratic_bezier_curveto(&mut self, absolute: bool) -> Result<(), ()> {
|
||||||
|
parse_arguments!(self, absolute, QuadBezierCurveTo, [
|
||||||
|
control1 => parse_coord, point => parse_coord
|
||||||
|
])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse smooth quadratic Bézier curveto command.
|
||||||
|
fn parse_smooth_quadratic_bezier_curveto(&mut self, absolute: bool) -> Result<(), ()> {
|
||||||
|
parse_arguments!(self, absolute, SmoothQuadBezierCurveTo, [ point => parse_coord ])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parse elliptical arc curve command.
|
||||||
|
fn parse_elliprical_arc(&mut self, absolute: bool) -> Result<(), ()> {
|
||||||
|
// Parse a flag whose value is '0' or '1'; otherwise, return Err(()).
|
||||||
|
let parse_flag = |iter: &mut Peekable<Chars>| -> Result<bool, ()> {
|
||||||
|
let value = match iter.peek() {
|
||||||
|
Some(c) if *c == '0' || *c == '1' => *c == '1',
|
||||||
|
_ => return Err(()),
|
||||||
|
};
|
||||||
|
iter.next();
|
||||||
|
Ok(value)
|
||||||
|
};
|
||||||
|
parse_arguments!(self, absolute, EllipticalArc, [
|
||||||
|
rx => parse_number,
|
||||||
|
ry => parse_number,
|
||||||
|
angle => parse_number,
|
||||||
|
large_arc_flag => parse_flag,
|
||||||
|
sweep_flag => parse_flag,
|
||||||
|
point => parse_coord
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// Parse a pair of numbers into CoordPair.
|
||||||
|
fn parse_coord(iter: &mut Peekable<Chars>) -> Result<CoordPair, ()> {
|
||||||
|
let x = parse_number(iter)?;
|
||||||
|
skip_comma_wsp(iter);
|
||||||
|
let y = parse_number(iter)?;
|
||||||
|
Ok(CoordPair::new(x, y))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// This is a special version which parses the number for SVG Path. e.g. "M 0.6.5" should be parsed
|
||||||
|
/// as MoveTo with a coordinate of ("0.6", ".5"), instead of treating 0.6.5 as a non-valid floating
|
||||||
|
/// point number. In other words, the logic here is similar with that of
|
||||||
|
/// tokenizer::consume_numeric, which also consumes the number as many as possible, but here the
|
||||||
|
/// input is a Peekable and we only accept an integer of a floating point number.
|
||||||
|
///
|
||||||
|
/// The "number" syntax in https://www.w3.org/TR/SVG/paths.html#PathDataBNF
|
||||||
|
fn parse_number(iter: &mut Peekable<Chars>) -> Result<CSSFloat, ()> {
|
||||||
|
// 1. Check optional sign.
|
||||||
|
let sign = if iter.peek().map_or(false, |&sign: &char| sign == '+' || sign == '-') {
|
||||||
|
if iter.next().unwrap() == '-' { -1. } else { 1. }
|
||||||
|
} else {
|
||||||
|
1.
|
||||||
|
};
|
||||||
|
|
||||||
|
// 2. Check integer part.
|
||||||
|
let mut integral_part: f64 = 0.;
|
||||||
|
let got_dot = if !iter.peek().map_or(false, |&n: &char| n == '.') {
|
||||||
|
// If the first digit in integer part is neither a dot nor a digit, this is not a number.
|
||||||
|
if iter.peek().map_or(true, |n: &char| !n.is_ascii_digit()) {
|
||||||
|
return Err(());
|
||||||
|
}
|
||||||
|
|
||||||
|
while iter.peek().map_or(false, |n: &char| n.is_ascii_digit()) {
|
||||||
|
integral_part =
|
||||||
|
integral_part * 10. + iter.next().unwrap().to_digit(10).unwrap() as f64;
|
||||||
|
}
|
||||||
|
|
||||||
|
iter.peek().map_or(false, |&n: &char| n == '.')
|
||||||
|
} else {
|
||||||
|
true
|
||||||
|
};
|
||||||
|
|
||||||
|
// 3. Check fractional part.
|
||||||
|
let mut fractional_part: f64 = 0.;
|
||||||
|
if got_dot {
|
||||||
|
// Consume '.'.
|
||||||
|
iter.next();
|
||||||
|
// If the first digit in fractional part is not a digit, this is not a number.
|
||||||
|
if iter.peek().map_or(true, |n: &char| !n.is_ascii_digit()) {
|
||||||
|
return Err(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut factor = 0.1;
|
||||||
|
while iter.peek().map_or(false, |n: &char| n.is_ascii_digit()) {
|
||||||
|
fractional_part += iter.next().unwrap().to_digit(10).unwrap() as f64 * factor;
|
||||||
|
factor *= 0.1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut value = sign * (integral_part + fractional_part);
|
||||||
|
|
||||||
|
// 4. Check exp part. The segment name of SVG Path doesn't include 'E' or 'e', so it's ok to
|
||||||
|
// treat the numbers after 'E' or 'e' are in the exponential part.
|
||||||
|
if iter.peek().map_or(false, |&exp: &char| exp == 'E' || exp == 'e') {
|
||||||
|
// Consume 'E' or 'e'.
|
||||||
|
iter.next();
|
||||||
|
let exp_sign = if iter.peek().map_or(false, |&sign: &char| sign == '+' || sign == '-') {
|
||||||
|
if iter.next().unwrap() == '-' { -1. } else { 1. }
|
||||||
|
} else {
|
||||||
|
1.
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut exp: f64 = 0.;
|
||||||
|
while iter.peek().map_or(false, |n: &char| n.is_ascii_digit()) {
|
||||||
|
exp = exp * 10. + iter.next().unwrap().to_digit(10).unwrap() as f64;
|
||||||
|
}
|
||||||
|
|
||||||
|
value *= f64::powf(10., exp * exp_sign);
|
||||||
|
}
|
||||||
|
|
||||||
|
if value.is_finite() {
|
||||||
|
Ok(value.min(::std::f32::MAX as f64).max(::std::f32::MIN as f64) as CSSFloat)
|
||||||
|
} else {
|
||||||
|
Err(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Skip all svg whitespaces, and return true if |iter| hasn't finished.
|
||||||
|
#[inline]
|
||||||
|
fn skip_wsp(iter: &mut Peekable<Chars>) -> bool {
|
||||||
|
// Note: SVG 1.1 defines the whitespaces as \u{9}, \u{20}, \u{A}, \u{D}.
|
||||||
|
// However, SVG 2 has one extra whitespace: \u{C}.
|
||||||
|
// Therefore, we follow the newest spec for the definition of whitespace,
|
||||||
|
// i.e. \u{9}, \u{20}, \u{A}, \u{C}, \u{D}, by is_ascii_whitespace().
|
||||||
|
while iter.peek().map_or(false, |c: &char| c.is_ascii_whitespace()) {
|
||||||
|
iter.next();
|
||||||
|
}
|
||||||
|
iter.peek().is_some()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Skip all svg whitespaces and one comma, and return true if |iter| hasn't finished.
|
||||||
|
#[inline]
|
||||||
|
fn skip_comma_wsp(iter: &mut Peekable<Chars>) -> bool {
|
||||||
|
if !skip_wsp(iter) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if *iter.peek().unwrap() != ',' {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
iter.next();
|
||||||
|
|
||||||
|
skip_wsp(iter)
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue