Added rgb function syntax L4 #131

CHANGELOG.md

@@ -13,6 +13,7 @@ Released on tbd.
 - Added further compactification of CSS tuples (#89, #93)
 - Added support for 8-digit hex color codes (#132)
 - Added more CSSOM possibilities and helpers (#6)
+- Added parts of recent color spec update such as `rgb` with spaces (#131)
 
 # 0.17.0
 

src/AngleSharp.Css.Tests/Functions/CssColorFunction.cs

@@ -19,6 +19,39 @@ public void ColorNotParsedCorrectly_Issue109()
             var color = s.GetColor();
             Assert.AreEqual("rgba(0, 17, 0, 1)", color);
         }
+
+        [Test]
+        public void ParseRgbWithSpacesL4_Issue131()
+        {
+            var html = @"<p style='color: rgb(255 122 127 / 80%)'>Text</p>";
+            var dom = ParseDocument(html);
+            var p = dom.QuerySelector("p");
+            var s = p.GetStyle();
+            var color = s.GetColor();
+            Assert.AreEqual("rgba(255, 122, 127, 0.8)", color);
+        }
+
+        [Test]
+        public void ParseRgbWithSpacesInPercentL4_Issue131()
+        {
+            var html = @"<p style='color: rgb(100% 10% 50% / 0.7)'>Text</p>";
+            var dom = ParseDocument(html);
+            var p = dom.QuerySelector("p");
+            var s = p.GetStyle();
+            var color = s.GetColor();
+            Assert.AreEqual("rgba(255, 26, 128, 0.7)", color);
+        }
+
+        [Test]
+        public void ParseRgbWithSpacesAndNoneL4_Issue131()
+        {
+            var html = @"<p style='color: rgb(100% none 50% / 35%)'>Text</p>";
+            var dom = ParseDocument(html);
+            var p = dom.QuerySelector("p");
+            var s = p.GetStyle();
+            var color = s.GetColor();
+            Assert.AreEqual("rgba(255, 0, 128, 0.35)", color);
+        }
     }
 }
 

src/AngleSharp.Css/Parser/Micro/ColorParser.cs

@@ -1,6 +1,7 @@
 namespace AngleSharp.Css.Parser
 {
     using AngleSharp.Css.Values;
+    using AngleSharp.Io;
     using AngleSharp.Text;
     using System;
     using System.Collections.Generic;
@@ -92,6 +93,52 @@ static class ColorParser
         }
 
         private static Color? ParseRgba(StringSource source)
+        {
+            var pos = source.Index;
+            var color = ParseRgbaLegacy(source);
+
+            if (!color.HasValue)
+            {
+                source.BackTo(pos);
+                return ParseRgbaModern(source);
+            }
+
+            return color.Value;
+        }
+
+        private static Color? ParseRgbaModern(StringSource source)
+        {
+            var r = ParseRgbOrNoneComponent(source);
+            source.SkipSpacesAndComments();
+            var g = ParseRgbOrNoneComponent(source);
+            source.SkipSpacesAndComments();
+            var b = ParseRgbOrNoneComponent(source);
+            source.SkipSpacesAndComments();
+            var c = source.Current;
+            var a = new Nullable<Double>(1.0);
+
+            if (r != null && g != null && b != null)
+            {
+                source.SkipCurrentAndSpaces();
+
+                if (c == Symbols.Solidus)
+                {
+                    a = ParseAlpha(source);
+                    source.SkipSpacesAndComments();
+                    c = source.Current;
+                    source.SkipCurrentAndSpaces();
+                }
+
+                if (c == Symbols.RoundBracketClose)
+                {
+                    return Color.FromRgba(r.Value, g.Value, b.Value, a.Value);
+                }
+            }
+
+            return null;
+        }
+
+        private static Color? ParseRgbaLegacy(StringSource source)
         {
             var r = ParseRgbComponent(source);
             var c1 = source.SkipGetSkip();
@@ -205,6 +252,26 @@ static class ColorParser
             return null;
         }
 
+        private static Byte? ParseRgbOrNoneComponent(StringSource source)
+        {
+            var pos = source.Index;
+            var value = ParseRgbComponent(source);
+
+            if (value.HasValue)
+            {
+                return value;
+            }
+
+            source.BackTo(pos);
+
+            if (source.IsIdentifier(CssKeywords.None))
+            {
+                return 0;
+            }
+
+            return null;
+        }
+
         private static Byte? ParseRgbComponent(StringSource source)
         {
             var unit = source.ParseUnit();
@@ -214,7 +281,7 @@ static class ColorParser
             {
                 if (unit.Dimension == "%")
                 {
-                    return (Byte)((255f * value) / 100f);
+                    return (Byte)Math.Round((255.0 * value) / 100.0);
                 }
                 else if (unit.Dimension == String.Empty)
                 {