Couple more fixes

Author: facelessuser

coloraide/__meta__.py

@@ -204,5 +204,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(8, 0, 1, "final")
+__version_info__ = Version(8, 0, 2, "final")
 __version__ = __version_info__._get_canonical()

coloraide/gamut/fit_minde_chroma.py

@@ -64,7 +64,7 @@ def fit(
         polar = color.CS_MAP[pspace].is_polar()
         orig = color.space()
         mapcolor = color.convert(pspace, norm=False) if orig != pspace else color.clone().normalize(nans=False)
-        gamutcolor = color.convert(space, norm=False) if orig != space else color.clone().normalize(nans=False)
+        gamutcolor = mapcolor.convert(space, norm=False)
         if polar:
             l, c, h = mapcolor._space.indexes()
         else:
@@ -103,7 +103,7 @@ def fit(
         clip_channels(gamutcolor)
 
         # Adjust chroma if we are not under the JND yet.
-        if not jnd or mapcolor.delta_e(gamutcolor, **de_options) >= jnd:
+        if not jnd or mapcolor.delta_e(gamutcolor, **de_options) > jnd:
             # Perform "in gamut" checks until we know our lower bound is no longer in gamut.
             lower_in_gamut = True
 

coloraide/gamut/fit_raytrace.py

@@ -176,7 +176,7 @@ def raytrace_box(
         bx = bmax[i]
 
         # Non parallel case
-        if abs(d) > 1e-15:
+        if abs(d) > 1e-14:
             inv_d = 1.0 / d
             t1 = (bn - a) * inv_d
             t2 = (bx - a) * inv_d

docs/src/markdown/about/changelog.md

@@ -3,6 +3,11 @@ icon: lucide/scroll-text
 ---
 # Changelog
 
+## 8.0.2
+
+-   **FIX**: Restrict `raytrace` ray size a little more.
+-   **FIX**: Fix a case where `minde-chroma` could process an already in gamut color.
+
 ## 8.0.1
 
 -   **FIX**: `raytrace` should match the same flow as `minde-chroma` in respect to checking lightness and then checking

docs/src/markdown/examples/3d_models.html

@@ -962,7 +962,7 @@ <h1>ColorAide Color Space Models</h1>
 let colorSpaces = null
 let colorGamuts = null
 let lastModel = null
-let package = 'coloraide-8.0.1-py3-none-any.whl'
+let package = 'coloraide-8.0.2-py3-none-any.whl'
 const defaultSpace = 'lab'
 const defaultGamut = 'srgb'
 const exceptions = new Set(['hwb', 'ryb', 'ryb-biased'])

docs/src/markdown/examples/colorpicker.html

@@ -421,7 +421,7 @@ <h1>ColorAide Color Picker</h1>
     let pyodide = null
     let webspace = ''
     let initial = 'oklab(0.69 0.13 -0.1 / 0.85)'
-    let package = 'coloraide-8.0.1-py3-none-any.whl'
+    let package = 'coloraide-8.0.2-py3-none-any.whl'
 
     const base = `${window.location.origin}/${window.location.pathname.split('/')[1]}/playground/`
     package = base + package

docs/src/markdown/gamut.md

@@ -551,8 +551,8 @@ variant uses CIELCh D65 and uses ∆E~2000~ with a JND of 2. We can manually per
 perceptual space with `psapce`, the ∆E configuration via `de_options`, and the JND with `jnd`.
 
 ``` py play
-gma_lch = {'pspace': 'lch-d65', 'de_options': {'method': '2000'}, 'jnd': 2}
-gma_oklch = {'pspace': 'oklch', 'de_options': {'method': 'ok'}, 'jnd': 0.02}
+gma_lch = {'method': 'minde-chroma', 'pspace': 'lch-d65', 'de_options': {'method': '2000'}, 'jnd': 2}
+gma_oklch = {'method': 'minde-chroma', 'pspace': 'oklch', 'de_options': {'method': 'ok'}, 'jnd': 0.02}
 
 Steps([c.fit('srgb', **gma_lch) for c in Color.steps(['oklch(90% 0.4 0)', 'oklch(90% 0.4 360)'], steps=100, space='oklch', hue='longer')])
 Steps([c.fit('srgb', **gma_oklch) for c in Color.steps(['oklch(90% 0.4 0)', 'oklch(90% 0.4 360)'], steps=100, space='oklch', hue='longer')])

docs/src/zensical.yml

@@ -354,7 +354,7 @@ extra_javascript:
   - assets/pymdownx-extras/extra-loader-Ccztcqfq.js
   - https://cdn.jsdelivr.net/npm/ace-builds@1.43.0/src-min-noconflict/ace.js
   - https://cdn.jsdelivr.net/npm/mermaid@11.12.1/dist/mermaid.min.js
-  - playground-config-ec067f74.js
+  - playground-config-5fdf0c34.js
   - https://cdn.jsdelivr.net/pyodide/v0.29.0/full/pyodide.js
   - assets/coloraide-extras/extra-notebook.js
   - https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js

docs/theme/playground-config-ec067f74.js docs/theme/playground-config-5fdf0c34.jsdocs/theme/playground-config-ec067f74.js renamed to docs/theme/playground-config-5fdf0c34.js

@@ -1,5 +1,5 @@
 var colorNotebook = {
-    "playgroundWheels": ['micropip', 'pygments-2.19.2-py3-none-any.whl', 'coloraide-8.0.1-py3-none-any.whl'],
-    "notebookWheels": ['pyyaml', 'markdown-3.10.1-py3-none-any.whl', 'pymdown_extensions-10.20-py3-none-any.whl', 'micropip', 'pygments-2.19.2-py3-none-any.whl', 'coloraide-8.0.1-py3-none-any.whl'],
+    "playgroundWheels": ['micropip', 'pygments-2.19.2-py3-none-any.whl', 'coloraide-8.0.2-py3-none-any.whl'],
+    "notebookWheels": ['pyyaml', 'markdown-3.10.1-py3-none-any.whl', 'pymdown_extensions-10.20-py3-none-any.whl', 'micropip', 'pygments-2.19.2-py3-none-any.whl', 'coloraide-8.0.2-py3-none-any.whl'],
     "defaultPlayground": "import coloraide\ncoloraide.__version__\nColor('red')"
 }

zensical.yml

@@ -354,7 +354,7 @@ extra_javascript:
   - assets/pymdownx-extras/extra-loader-Ccztcqfq.js
   - https://cdn.jsdelivr.net/npm/ace-builds@1.43.0/src-min-noconflict/ace.js
   - https://cdn.jsdelivr.net/npm/mermaid@11.12.1/dist/mermaid.min.js
-  - playground-config-ec067f74.js
+  - playground-config-5fdf0c34.js
   - https://cdn.jsdelivr.net/pyodide/v0.29.0/full/pyodide.js
   - assets/coloraide-extras/extra-notebook-BVE52itK.js
   - https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js