jfcherng · December 7, 2023 07:27 · Oct 21, 2023 · Oct 21, 2023 · Oct 21, 2023 · Oct 20, 2023
diff --git a/srgb_norm.py b/srgb_norm.py
@@ -36,10 +36,13 @@ def handle_coord(val: float):
             return int(val) if val.is_integer() else val
 
         coords = parent.clone().coords(nans=False)
-        return "{r} {g} {b}".format(
-            r=handle_coord(coords[0]),
-            g=handle_coord(coords[1]),
-            b=handle_coord(coords[2]),
+        return "{r} {g} {b}".format_map(
+            dict(
+                zip(
+                    ("r", "g", "b"),
+                    map(handle_coord, coords),
+                )
+            )
         )
 
 

diff --git a/color_helper.sublime-settings b/color_helper.sublime-settings
@@ -5,9 +5,9 @@
             "class": "ColorHelper.custom.srgb_norm.ColorSrgbNorm",
             "filters": ["srgb"],
             "output": [
-                {"space": "srgb", "format": {"precision": 6}}
-            ]
-        }
+                {"space": "srgb", "format": {"precision": 6}},
+            ],
+        },
     },
     "user_color_rules": [
         {

diff --git a/srgb_norm.py b/srgb_norm.py
@@ -23,13 +23,9 @@ def match(cls, string: str, start: int = 0, fullmatch: bool = True):
         m = MATCH.match(string, start)
         if not m or (fullmatch and m.end(0) != len(string)):
             return None
-        return (
-            (
-                (float(m.group("r")), float(m.group("g")), float(m.group("b"))),
-                1.0,  # alpha
-            ),
-            m.end(0),
-        )
+
+        r, g, b, a = map(float, m.groups()), 1.0
+        return ((r, g, b), a), m.end(0)
 
     @classmethod
     def to_string(cls, parent, *, precision=6):

diff --git a/srgb_norm.py b/srgb_norm.py
@@ -34,11 +34,16 @@ def match(cls, string: str, start: int = 0, fullmatch: bool = True):
     @classmethod
     def to_string(cls, parent, *, precision=6):
         """Output color in `R G B` form."""
+
+        def handle_coord(val: float):
+            val = round(val, precision)
+            return int(val) if val.is_integer() else val
+
         coords = parent.clone().coords(nans=False)
         return "{r} {g} {b}".format(
-            r=round(coords[0], precision),
-            g=round(coords[1], precision),
-            b=round(coords[2], precision),
+            r=handle_coord(coords[0]),
+            g=handle_coord(coords[1]),
+            b=handle_coord(coords[2]),
         )
 
 

diff --git a/color_helper.sublime-settings b/color_helper.sublime-settings
@@ -11,7 +11,7 @@
     },
     "user_color_rules": [
         {
-            "name": "XML",
+            "name": "XML", // overwrites the built-in "XML" color rule
             "base_scopes": ["text.xml"],
             "color_class": "srgb_norm",
             "scanning": [

diff --git a/README.md b/README.md
@@ -1 +1,7 @@
-Original request: https://discord.com/channels/280102180189634562/280157083356233728/1164923362829676626
+## Original Request
+
+https://discord.com/channels/280102180189634562/280157083356233728/1164923362829676626
+
+## Screenshot
+
+![image](https://user-images.githubusercontent.com/6594915/277018291-94f82aec-1841-44a8-b788-6d48ddce2146.png)
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+Original request: https://discord.com/channels/280102180189634562/280157083356233728/1164923362829676626
diff --git a/color_helper.sublime-settings b/color_helper.sublime-settings
@@ -0,0 +1,23 @@
+// file: Packages/User/color_helper.sublime-settings
+{
+    "user_color_classes": {
+        "srgb_norm": {
+            "class": "ColorHelper.custom.srgb_norm.ColorSrgbNorm",
+            "filters": ["srgb"],
+            "output": [
+                {"space": "srgb", "format": {"precision": 6}}
+            ]
+        }
+    },
+    "user_color_rules": [
+        {
+            "name": "XML",
+            "base_scopes": ["text.xml"],
+            "color_class": "srgb_norm",
+            "scanning": [
+                "text.xml meta.tag",
+            ],
+            "color_trigger": "(?<=value=\")(?=[\\d.]+\\s+[\\d.]+\\s+[\\d.]+)",
+        },
+    ],
+}
diff --git a/srgb_norm.py b/srgb_norm.py
@@ -0,0 +1,49 @@
+# file: Packages/ColorHelper/custom/srgb_norm.py
+
+import re
+
+from ColorHelper.ch_util import get_base_color
+
+from ..lib.coloraide.spaces.srgb.css import sRGB
+
+MATCH = re.compile(
+    r"""
+        (?P<r>\d+(?:\.\d+)?)\s+
+        (?P<g>\d+(?:\.\d+)?)\s+
+        (?P<b>\d+(?:\.\d+)?)
+    """,
+    re.VERBOSE,
+)
+
+
+class SrgbNorm(sRGB):
+    @classmethod
+    def match(cls, string: str, start: int = 0, fullmatch: bool = True):
+        """Match and parse a color string."""
+        m = MATCH.match(string, start)
+        if not m or (fullmatch and m.end(0) != len(string)):
+            return None
+        return (
+            (
+                (float(m.group("r")), float(m.group("g")), float(m.group("b"))),
+                1.0,  # alpha
+            ),
+            m.end(0),
+        )
+
+    @classmethod
+    def to_string(cls, parent, *, precision=6):
+        """Output color in `R G B` form."""
+        coords = parent.clone().coords(nans=False)
+        return "{r} {g} {b}".format(
+            r=round(coords[0], precision),
+            g=round(coords[1], precision),
+            b=round(coords[2], precision),
+        )
+
+
+class ColorSrgbNorm(get_base_color()):
+    pass
+
+
+ColorSrgbNorm.register(SrgbNorm(), overwrite=True)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Original request: https://discord.com/channels/280102180189634562/280157083356233728/1164923362829676626
No results found