Added new metric values

FlorianRappl · FlorianRappl · commit 9abdd1b61075 · 2024-01-18T17:16:55.000+01:00
diff --git a/src/AngleSharp.Css/Constants/InitialValues.cs b/src/AngleSharp.Css/Constants/InitialValues.cs
@@ -151,11 +151,11 @@ static class InitialValues
         public static readonly ICssValue ColumnGapDecl = new Constant<Length>(CssKeywords.Normal, Length.Normal);
         public static readonly ICssValue RowGapDecl = new Constant<Length>(CssKeywords.Normal, Length.Normal);
         public static readonly ICssValue PerspectiveDecl = new Constant<Object>(CssKeywords.None, null);
-        public static readonly ICssValue PerspectiveOriginDecl = Point.Center;
+        public static readonly ICssValue PerspectiveOriginDecl = CssPoint2D.Center;
         public static readonly ICssValue PositionDecl = new Constant<PositionMode>(CssKeywords.Inline, PositionMode.Static);
         public static readonly ICssValue TransformDecl = new Constant<Object>(CssKeywords.None, null);
         public static readonly ICssValue TransformStyleDecl = new Constant<Boolean>(CssKeywords.Flat, true);
-        public static readonly ICssValue TransformOriginDecl = Point.Center;
+        public static readonly ICssValue TransformOriginDecl = CssPoint2D.Center;
         public static readonly ICssValue TableLayoutDecl = new Constant<Boolean>(CssKeywords.Auto, false);
         public static readonly ICssValue ClearDecl = new Constant<ClearMode>(CssKeywords.None, ClearMode.None);
         public static readonly ICssValue ClipDecl = new Constant<Length>(CssKeywords.Auto, Length.Auto);
@@ -199,7 +199,7 @@ static class InitialValues
         public static readonly ICssValue OrphansDecl = new Length(2, Length.Unit.None);
         public static readonly ICssValue OrderDecl = new Length(0, Length.Unit.None);
         public static readonly ICssValue ObjectFitDecl = new Constant<ObjectFitting>(CssKeywords.Fill, ObjectFitting.Fill);
-        public static readonly ICssValue ObjectPositionDecl = Point.Center;
+        public static readonly ICssValue ObjectPositionDecl = CssPoint2D.Center;
         public static readonly ICssValue WhiteSpaceDecl = new Constant<Whitespace>(CssKeywords.Normal, Whitespace.Normal);
         public static readonly ICssValue ZIndexDecl = new Constant<Length>(CssKeywords.Auto, Length.Auto);
         public static readonly ICssValue WidthDecl = Length.Auto;
diff --git a/src/AngleSharp.Css/Declarations/BackgroundDeclaration.cs b/src/AngleSharp.Css/Declarations/BackgroundDeclaration.cs
@@ -102,7 +102,7 @@ public ICssValue Convert(StringSource source)
                     }
 
                     var image = default(ICssImageValue);
-                    var position = default(Point?);
+                    var position = default(CssPoint2D?);
                     var size = default(CssBackgroundSizeValue);
                     var repeat = default(CssImageRepeatsValue);
                     var attachment = default(ICssValue);
diff --git a/src/AngleSharp.Css/Declarations/BackgroundPositionDeclaration.cs b/src/AngleSharp.Css/Declarations/BackgroundPositionDeclaration.cs
@@ -47,7 +47,7 @@ public ICssValue Merge(ICssValue[] values)
 
                     for (var i = 0; i < points.Length; i++)
                     {
-                        points[i] = new Point(x.Items[i], y.Items[i]);
+                        points[i] = new CssPoint2D(x.Items[i], y.Items[i]);
                     }
 
                     return new CssListValue(points);
@@ -60,7 +60,7 @@ public ICssValue[] Split(ICssValue value)
             {
                 if (value is CssListValue list)
                 {
-                    var points = list.Items.OfType<Point>();
+                    var points = list.Items.OfType<CssPoint2D>();
                     var x = points.Select(m => m.X).ToArray();
                     var y = points.Select(m => m.Y).ToArray();
                     return new ICssValue[]
diff --git a/src/AngleSharp.Css/Declarations/CursorDeclaration.cs b/src/AngleSharp.Css/Declarations/CursorDeclaration.cs
@@ -40,13 +40,13 @@ public ICssValue Convert(StringSource source)
                             break;
 
                         source.SkipCurrentAndSpaces();
-                        var position = default(Point?);
+                        var position = default(CssPoint2D?);
 
                         if (x.HasValue)
                         {
                             var xp = new Length(x.Value, Length.Unit.None);
                             var yp = new Length(y.Value, Length.Unit.None);
-                            position = new Point(xp, yp);
+                            position = new CssPoint2D(xp, yp);
                         }
 
                         definitions.Add(new CssCustomCursorValue(imageSource, position));
diff --git a/src/AngleSharp.Css/Extensions/StringExtensions.cs b/src/AngleSharp.Css/Extensions/StringExtensions.cs
@@ -18,16 +18,36 @@ public static class StringExtensions
         /// <returns>The CSS color representation.</returns>
         public static String CssColor(this String value)
         {
-            var color = default(Color);
-
-            if (Color.TryFromHex(value, out color))
+            if (Color.TryFromHex(value, out var color))
             {
                 return color.CssText;
             }
 
             return value;
         }
 
+        /// <summary>
+        /// Parses the integer according to the rules.
+        /// </summary>
+        /// <param name="value">The string to parse.</param>
+        /// <param name="result">The result of parsing the string.</param>
+        /// <returns>The indicator if the string was indeed an integer.</returns>
+        public static Boolean CssInteger(this String value, out Int32 result)
+        {
+            return Int32.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result);
+        }
+
+        /// <summary>
+        /// Parses the number according to the rules.
+        /// </summary>
+        /// <param name="value">The string to parse.</param>
+        /// <param name="result">The result of parsing the string.</param>
+        /// <returns>The indicator if the string was indeed a number.</returns>
+        public static Boolean CssNumber(this String value, out Double result)
+        {
+            return Double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out result);
+        }
+
         /// <summary>
         /// Splits the string in a numeric value (result) and a unit. Returns
         /// null if the provided string is ill-formatted.
@@ -46,7 +66,7 @@ public static String CssUnit(this String value, out Double result)
                     // Intentional empty.
                 }
 
-                if (firstLetter > 0 && Double.TryParse(value.Substring(0, firstLetter), NumberStyles.Any, CultureInfo.InvariantCulture, out result))
+                if (firstLetter > 0 && value.Substring(0, firstLetter).CssNumber(out result))
                 {
                     return value.Substring(firstLetter);
                 }
diff --git a/src/AngleSharp.Css/Parser/Micro/GradientParser.cs b/src/AngleSharp.Css/Parser/Micro/GradientParser.cs
@@ -125,7 +125,7 @@ private static ICssGradientFunctionValue ParseRadialGradient(StringSource source
             if (stops != null && source.Current == Symbols.RoundBracketClose)
             {
                 var circle = options?.Circle ?? false;
-                var center = options?.Center ?? Point.Center;
+                var center = options?.Center ?? CssPoint2D.Center;
                 var width = options?.Width;
                 var height = options?.Height;
                 var sizeMode = options?.Size ?? CssRadialGradientValue.SizeMode.None;
@@ -302,7 +302,7 @@ private static ICssValue ParseLinearAngleKeywords(StringSource source)
         private static RadialOptions? ParseRadialOptions(StringSource source)
         {
             var circle = false;
-            var center = Point.Center;
+            var center = CssPoint2D.Center;
             var width = default(ICssValue);
             var height = default(ICssValue);
             var size = CssRadialGradientValue.SizeMode.None;
@@ -445,7 +445,7 @@ public struct RadialOptions
             /// <summary>
             /// Gets or sets the center of the gradient.
             /// </summary>
-            public Point Center;
+            public CssPoint2D Center;
 
             /// <summary>
             /// Gets or sets the width of the gradient.
diff --git a/src/AngleSharp.Css/Parser/Micro/PointParser.cs b/src/AngleSharp.Css/Parser/Micro/PointParser.cs
@@ -69,7 +69,7 @@ public static CssOriginValue ParseOrigin(this StringSource source)
         /// <summary>
         /// Parses a point value.
         /// </summary>
-        public static Point? ParsePoint(this StringSource source)
+        public static CssPoint2D? ParsePoint(this StringSource source)
         {
             var pos = source.Index;
             var x = new Length(50f, Length.Unit.Percent);
@@ -91,7 +91,7 @@ public static CssOriginValue ParseOrigin(this StringSource source)
                 {
                     x = KeywordToLength(l).Value;
                     y = KeywordToLength(r).Value;
-                    return new Point(x, y);
+                    return new CssPoint2D(x, y);
                 }
             }
             else if (l != null)
@@ -101,12 +101,12 @@ public static CssOriginValue ParseOrigin(this StringSource source)
                 if (IsHorizontal(l))
                 {
                     x = KeywordToLength(l).Value;
-                    return new Point(x, s ?? y);
+                    return new CssPoint2D(x, s ?? y);
                 }
                 else if (IsVertical(l))
                 {
                     y = KeywordToLength(l).Value;
-                    return new Point(s ?? x, y);
+                    return new CssPoint2D(s ?? x, y);
                 }
             }
             else
@@ -117,7 +117,7 @@ public static CssOriginValue ParseOrigin(this StringSource source)
 
                 if (s != null)
                 {
-                    return new Point(f ?? x, s ?? y);
+                    return new CssPoint2D(f ?? x, s ?? y);
                 }
                 else if (f != null)
                 {
@@ -126,22 +126,22 @@ public static CssOriginValue ParseOrigin(this StringSource source)
 
                     if (r == null)
                     {
-                        return new Point(f, y);
+                        return new CssPoint2D(f, y);
                     }
                     else if (IsVertical(r))
                     {
                         y = KeywordToLength(r).Value;
-                        return new Point(f ?? x, y);
+                        return new CssPoint2D(f ?? x, y);
                     }
                     else if (IsHorizontal(r))
                     {
                         x = KeywordToLength(r).Value;
-                        return new Point(x, f ?? y);
+                        return new CssPoint2D(x, f ?? y);
                     }
                     else
                     {
                         source.BackTo(pos);
-                        return new Point(f ?? x, y);
+                        return new CssPoint2D(f ?? x, y);
                     }
                 }
             }
diff --git a/src/AngleSharp.Css/ValueConverters.cs b/src/AngleSharp.Css/ValueConverters.cs
@@ -214,7 +214,7 @@ static class ValueConverters
         /// Represents a position object.
         /// http://www.w3.org/TR/css3-background/#ltpositiongt
         /// </summary>
-        public static readonly IValueConverter PointConverter = new StructValueConverter<Point>(PointParser.ParsePoint);
+        public static readonly IValueConverter PointConverter = new StructValueConverter<CssPoint2D>(PointParser.ParsePoint);
 
         /// <summary>
         /// Represents an origin (Point3D) object.
diff --git a/src/AngleSharp.Css/Values/Composites/CssCustomCursorValue.cs b/src/AngleSharp.Css/Values/Composites/CssCustomCursorValue.cs
@@ -9,7 +9,7 @@ sealed class CssCustomCursorValue : ICssCompositeValue
         #region Fields
 
         private readonly ICssImageValue _source;
-        private readonly Point? _position;
+        private readonly CssPoint2D? _position;
 
         #endregion
 
@@ -20,7 +20,7 @@ sealed class CssCustomCursorValue : ICssCompositeValue
         /// </summary>
         /// <param name="source">The image source to display.</param>
         /// <param name="position">The position offset, if any.</param>
-        public CssCustomCursorValue(ICssImageValue source, Point? position)
+        public CssCustomCursorValue(ICssImageValue source, CssPoint2D? position)
         {
             _source = source;
             _position = position;
@@ -38,7 +38,7 @@ public CssCustomCursorValue(ICssImageValue source, Point? position)
         /// <summary>
         /// Gets the positional offset, if any.
         /// </summary>
-        public Point? Position => _position;
+        public CssPoint2D? Position => _position;
 
         /// <summary>
         /// Gets the CSS text representation.
@@ -68,7 +68,7 @@ public String CssText
         ICssValue ICssValue.Compute(ICssComputeContext context)
         {
             var source = (ICssImageValue)_source.Compute(context);
-            var position = _position.HasValue ? (Point?)((ICssValue)_position.Value).Compute(context) : null;
+            var position = _position.HasValue ? (CssPoint2D?)((ICssValue)_position.Value).Compute(context) : null;
             return new CssCustomCursorValue(source, position);
         }
 
diff --git a/src/AngleSharp.Css/Values/Composites/CssOriginValue.cs b/src/AngleSharp.Css/Values/Composites/CssOriginValue.cs
@@ -42,7 +42,7 @@ public String CssText
         {
             get
             {
-                var pt = new Point(_x, _y).CssText;
+                var pt = new CssPoint2D(_x, _y).CssText;
                 return _z != null ? String.Concat(pt, " ", _z.CssText) : pt;
             }
         }
diff --git a/src/AngleSharp.Css/Values/Functions/CssConicGradientValue.cs b/src/AngleSharp.Css/Values/Functions/CssConicGradientValue.cs
@@ -77,7 +77,7 @@ public String CssText
             get
             {
                 var defaultAngle = _angle as Angle?;
-                var defaultPosition = _center as Point?;
+                var defaultPosition = _center as CssPoint2D?;
                 var offset = (defaultAngle.HasValue ? 1 : 0) + (defaultPosition.HasValue ? 1 : 0);
                 var args = new String[_stops.Length + offset];
 
@@ -108,7 +108,7 @@ public String CssText
         /// <summary>
         /// Gets the position of the conic gradient.
         /// </summary>
-        public ICssValue Center => _center ?? Point.Center;
+        public ICssValue Center => _center ?? CssPoint2D.Center;
 
         /// <summary>
         /// Gets all stops.
diff --git a/src/AngleSharp.Css/Values/Functions/CssRadialGradientValue.cs b/src/AngleSharp.Css/Values/Functions/CssRadialGradientValue.cs
@@ -16,7 +16,7 @@ public sealed class CssRadialGradientValue : ICssGradientFunctionValue
         #region Fields
 
         private readonly CssGradientStopValue[] _stops;
-        private readonly Point _center;
+        private readonly CssPoint2D _center;
         private readonly ICssValue _width;
         private readonly ICssValue _height;
         private readonly Boolean _repeating;
@@ -37,7 +37,7 @@ public sealed class CssRadialGradientValue : ICssGradientFunctionValue
         /// <param name="sizeMode">The size mode of the ellipsoid.</param>
         /// <param name="stops">A collection of stops to use.</param>
         /// <param name="repeating">The repeating setting.</param>
-        public CssRadialGradientValue(Boolean circle, Point center, ICssValue width, ICssValue height, SizeMode sizeMode, CssGradientStopValue[] stops, Boolean repeating = false)
+        public CssRadialGradientValue(Boolean circle, CssPoint2D center, ICssValue width, ICssValue height, SizeMode sizeMode, CssGradientStopValue[] stops, Boolean repeating = false)
         {
             _stops = stops;
             _center = center;
@@ -64,7 +64,7 @@ public ICssValue[] Arguments
         {
             get
             {
-                var isDefault = _center == Point.Center && !_circle && _height == null && _width == null && _sizeMode == SizeMode.None;
+                var isDefault = _center == CssPoint2D.Center && !_circle && _height == null && _width == null && _sizeMode == SizeMode.None;
                 var args = new List<ICssValue>();
 
                 if (!isDefault)
@@ -130,7 +130,7 @@ public ICssValue[] Arguments
         /// <summary>
         /// Gets the position of the radial gradient.
         /// </summary>
-        public Point Position => _center;
+        public CssPoint2D Position => _center;
 
         /// <summary>
         /// Gets the horizontal radius.
@@ -158,7 +158,7 @@ public ICssValue[] Arguments
 
         ICssValue ICssValue.Compute(ICssComputeContext context)
         {
-            var center = (Point)((ICssValue)_center).Compute(context);
+            var center = (CssPoint2D)((ICssValue)_center).Compute(context);
             var width = _width.Compute(context);
             var height = _height.Compute(context);
             var stops = _stops.Select(m => (CssGradientStopValue)((ICssValue)m).Compute(context)).ToArray();
diff --git a/src/AngleSharp.Css/Values/Multiples/CssPoint2D.cs b/src/AngleSharp.Css/Values/Multiples/CssPoint2D.cs
diff --git a/src/AngleSharp.Css/Values/Primitives/Fraction.cs b/src/AngleSharp.Css/Values/Primitives/Fraction.cs
diff --git a/src/AngleSharp.Css/Values/Primitives/Integer.cs b/src/AngleSharp.Css/Values/Primitives/Integer.cs
diff --git a/src/AngleSharp.Css/Values/Primitives/Number.cs b/src/AngleSharp.Css/Values/Primitives/Number.cs
diff --git a/src/AngleSharp.Css/Values/Primitives/Percentage.cs b/src/AngleSharp.Css/Values/Primitives/Percentage.cs

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public ICssValue Convert(StringSource source)`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`var image = default(ICssImageValue);`
`105`		`- var position = default(Point?);`
	`105`	`+ var position = default(CssPoint2D?);`
`106`	`106`	`var size = default(CssBackgroundSizeValue);`
`107`	`107`	`var repeat = default(CssImageRepeatsValue);`
`108`	`108`	`var attachment = default(ICssValue);`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public ICssValue Merge(ICssValue[] values)`
`47`	`47`
`48`	`48`	`for (var i = 0; i < points.Length; i++)`
`49`	`49`	`{`
`50`		`- points[i] = new Point(x.Items[i], y.Items[i]);`
	`50`	`+ points[i] = new CssPoint2D(x.Items[i], y.Items[i]);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`return new CssListValue(points);`
`@@ -60,7 +60,7 @@ public ICssValue[] Split(ICssValue value)`
`60`	`60`	`{`
`61`	`61`	`if (value is CssListValue list)`
`62`	`62`	`{`
`63`		`- var points = list.Items.OfType<Point>();`
	`63`	`+ var points = list.Items.OfType<CssPoint2D>();`
`64`	`64`	`var x = points.Select(m => m.X).ToArray();`
`65`	`65`	`var y = points.Select(m => m.Y).ToArray();`
`66`	`66`	`return new ICssValue[]`
Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,13 @@ public ICssValue Convert(StringSource source)`
`40`	`40`	`break;`
`41`	`41`
`42`	`42`	`source.SkipCurrentAndSpaces();`
`43`		`- var position = default(Point?);`
	`43`	`+ var position = default(CssPoint2D?);`
`44`	`44`
`45`	`45`	`if (x.HasValue)`
`46`	`46`	`{`
`47`	`47`	`var xp = new Length(x.Value, Length.Unit.None);`
`48`	`48`	`var yp = new Length(y.Value, Length.Unit.None);`
`49`		`- position = new Point(xp, yp);`
	`49`	`+ position = new CssPoint2D(xp, yp);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`definitions.Add(new CssCustomCursorValue(imageSource, position));`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static CssOriginValue ParseOrigin(this StringSource source)`
`69`	`69`	`/// <summary>`
`70`	`70`	`/// Parses a point value.`
`71`	`71`	`/// </summary>`
`72`		`- public static Point? ParsePoint(this StringSource source)`
	`72`	`+ public static CssPoint2D? ParsePoint(this StringSource source)`
`73`	`73`	`{`
`74`	`74`	`var pos = source.Index;`
`75`	`75`	`var x = new Length(50f, Length.Unit.Percent);`
`@@ -91,7 +91,7 @@ public static CssOriginValue ParseOrigin(this StringSource source)`
`91`	`91`	`{`
`92`	`92`	`x = KeywordToLength(l).Value;`
`93`	`93`	`y = KeywordToLength(r).Value;`
`94`		`- return new Point(x, y);`
	`94`	`+ return new CssPoint2D(x, y);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`else if (l != null)`
`@@ -101,12 +101,12 @@ public static CssOriginValue ParseOrigin(this StringSource source)`
`101`	`101`	`if (IsHorizontal(l))`
`102`	`102`	`{`
`103`	`103`	`x = KeywordToLength(l).Value;`
`104`		`- return new Point(x, s ?? y);`
	`104`	`+ return new CssPoint2D(x, s ?? y);`
`105`	`105`	`}`
`106`	`106`	`else if (IsVertical(l))`
`107`	`107`	`{`
`108`	`108`	`y = KeywordToLength(l).Value;`
`109`		`- return new Point(s ?? x, y);`
	`109`	`+ return new CssPoint2D(s ?? x, y);`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`else`
`@@ -117,7 +117,7 @@ public static CssOriginValue ParseOrigin(this StringSource source)`
`117`	`117`
`118`	`118`	`if (s != null)`
`119`	`119`	`{`
`120`		`- return new Point(f ?? x, s ?? y);`
	`120`	`+ return new CssPoint2D(f ?? x, s ?? y);`
`121`	`121`	`}`
`122`	`122`	`else if (f != null)`
`123`	`123`	`{`
`@@ -126,22 +126,22 @@ public static CssOriginValue ParseOrigin(this StringSource source)`
`126`	`126`
`127`	`127`	`if (r == null)`
`128`	`128`	`{`
`129`		`- return new Point(f, y);`
	`129`	`+ return new CssPoint2D(f, y);`
`130`	`130`	`}`
`131`	`131`	`else if (IsVertical(r))`
`132`	`132`	`{`
`133`	`133`	`y = KeywordToLength(r).Value;`
`134`		`- return new Point(f ?? x, y);`
	`134`	`+ return new CssPoint2D(f ?? x, y);`
`135`	`135`	`}`
`136`	`136`	`else if (IsHorizontal(r))`
`137`	`137`	`{`
`138`	`138`	`x = KeywordToLength(r).Value;`
`139`		`- return new Point(x, f ?? y);`
	`139`	`+ return new CssPoint2D(x, f ?? y);`
`140`	`140`	`}`
`141`	`141`	`else`
`142`	`142`	`{`
`143`	`143`	`source.BackTo(pos);`
`144`		`- return new Point(f ?? x, y);`
	`144`	`+ return new CssPoint2D(f ?? x, y);`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public String CssText`
`42`	`42`	`{`
`43`	`43`	`get`
`44`	`44`	`{`
`45`		`- var pt = new Point(_x, _y).CssText;`
	`45`	`+ var pt = new CssPoint2D(_x, _y).CssText;`
`46`	`46`	`return _z != null ? String.Concat(pt, " ", _z.CssText) : pt;`
`47`	`47`	`}`
`48`	`48`	`}`