monobiome 1.5.0__tar.gz → 1.5.3__tar.gz

{monobiome-1.5.0 → monobiome-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monobiome
-Version: 1.5.0
+Version: 1.5.3
 Summary: Monobiome color palette
 Author-email: Sam Griesemer <git@olog.io>
 License-Expression: MIT
@@ -70,13 +70,13 @@ both of which have fixed hue values and vary from 10% to 98% lightness.
 Monotone curves have fixed chroma, whereas the accent curves' chroma varies
 smoothly as a function of lightness within sRGB gamut bounds.
 
-| Chroma curves | Color trajectories |
-|---|---|
-| ![Chroma curves](images/curves/cstar-curves-v140.png) | ![Trajectories](images/trajectories.gif) |
+| Chroma curves                                            | Color trajectories                       |
+|----------------------------------------------------------|------------------------------------------|
+| ![Chroma curves](images/release/1.5.2/chroma-curves.png) | ![Trajectories](images/trajectories.gif) |
 
-| Palette |
-|---|
-| ![Palette](images/palette.png) |
+| Palette                                      |
+|----------------------------------------------|
+| ![Palette](images/release/1.5.2/palette.png) |
 
 Chroma curves are designed specifically to establish a distinct role for each
 accent and are non-intersecting over the lightness domain (hence the distinct
@@ -100,8 +100,8 @@ varying only in lightness from dark to light grey.
 
 ## Themes
 
-| Dark themes | Light themes |
-|---|---|
+| Dark themes                            | Light themes                             |
+|----------------------------------------|------------------------------------------|
 | ![Dark themes](images/dark_themes.png) | ![Light themes](images/light_themes.png) |
 
 Themes are derived from the `monobiome` palette by selecting a monotone base
@@ -118,10 +118,10 @@ to the background.
 The following plots show the intersection of the sphere centered at a fixed
 background color (`alpine` biome with a lightness of 20) under variable radii:
 
-| | `-l 20 -d 0.3` | `-l 20 -d 0.4` | `-l 20 -d 0.5` |
-|---|---|---|---|
-| Color visualization | ![](images/oklch/mb_b20_d30.gif) | ![](images/oklch/mb_b20_d40.gif) | ![](images/oklch/mb_b20_d50.gif) |
-| Editor preview | ![](images/render/v140-demo-alpine-dark-d0.3.png) | ![](images/render/v140-demo-alpine-dark-d0.4.png) | ![](images/render/v140-demo-alpine-dark-d0.5.png) |
+|                     | `-l 20 -d 0.3`                                    | `-l 20 -d 0.4`                                    | `-l 20 -d 0.5`                                    |
+|---------------------|---------------------------------------------------|---------------------------------------------------|---------------------------------------------------|
+| Color visualization | ![](images/oklch/mb_b20_d30.gif)                  | ![](images/oklch/mb_b20_d40.gif)                  | ![](images/oklch/mb_b20_d50.gif)                  |
+| Editor preview      | ![](images/render/v140-demo-alpine-dark-d0.3.png) | ![](images/render/v140-demo-alpine-dark-d0.4.png) | ![](images/render/v140-demo-alpine-dark-d0.5.png) |
 
 In short, the base lightness (`-l`) dictates the brightness of the background,
 and the contrast (`-d`) controls how perceptually distinct the accent colors
@@ -157,10 +157,10 @@ theme pipeline can be seen in detail below:
 ![Generation pipeline](images/theme_generation_pipeline.png)
 
 This figure demonstrates how `kitty` themes are generated, but the process is
-generic to any palette, scheme, and app. This implemented in two stages using
-the `monobiome` CLI:
+generic to any palette, scheme, and app. This is implemented in two stages
+using the `monobiome` CLI:
 
-- First generate the scheme file, the definitions that respect perceptual
+- First generate the scheme file, the lightness choices that achieve perceptual
   uniformity of accents with respect to the base monotone:
 
   ```sh
@@ -177,19 +177,21 @@ the `monobiome` CLI:
   monobiome fill scheme.toml templates/kitty/active.theme -o kitty.theme
   ```
 
-  This writes a concrete theme to `kitty.theme` that matches the user
-  preferences, i.e., the contrast (`-d`), background lightness (`-l`), mode
-  (`dark`), and biome (`grassland`). Every part of this process can be
-  customized: the scheme parameters, the scheme definitions/file, the app
-  template.
+  This writes a concrete `kitty` theme to `kitty.theme` that matches the user
+  preferences as captured in the previously generated scheme file, i.e., the
+  contrast (`-d`), background lightness (`-l`), mode (`dark`), and biome
+  (`grassland`). Every part of this process can be customized: the scheme
+  parameters, the scheme definitions/file, the app template.
 
-Running these commands in sequence from the repo root should work
-out-of-the-box, after having installed the CLI tool.
+The separation of duties here facilitates robustness: the palette colors can be
+tweaked (across versions, say) without changing how those colors get used in
+app themes. Scheme files don't hardcode color values, and app templates don't
+refer to palette variables at all. Scheme files bridge palette colors with
+*intended uses*, and templates need only align those uses under an app's
+expected config syntax.
 
-The `monobiome` CLI
-produces the scheme file for requested parameters, and the [`symconf`][3] CLI
-pushes palette colors through the scheme and into the app templates to yield a
-concrete theme.
+Running these commands in sequence from the repo root should work
+out-of-the-box after having installed the CLI tool.
 
 ## Applications
 This repo provides palette-agnostic theme templates for `kitty`,
@@ -218,7 +220,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`kitty` theme
-  template](templates/apps/kitty/templates/active.theme).
+  template](templates/kitty/active.theme).
 
 - `vim`/`neovim`
 
@@ -233,7 +235,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`vim` theme
-  template](templates/apps/nvim/templates/theme.vim).
+  template](templates/nvim/theme.vim).
 
 - `fzf`
 
@@ -246,7 +248,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`fzf` theme
-  template](templates/apps/fzf/templates/active.theme).
+  template](templates/fzf/active.theme).
 
 - Firefox
 
@@ -254,13 +256,11 @@ One can set these themes for the provided applications as follows:
   add-ons][2], and switch between light/dark schemes based on system settings.
   You can also download raw XPI files for each theme in `app-config/firefox/`,
   each of which is generated using the [Firefox `manifest.json`
-  template](templates/apps/firefox/templates/none-dark.manifest.json).
+  template](templates/firefox/auto-manifest.json).
 
   Static [light][4] and [dark][5] themes are additionally available (i.e., that
   don't change with system settings).
 
-  ![Firefox theme previews](images/firefox/themes.png)
-
 ## CLI installation
 A brief theme generation guide was provided in the [Generation
 section](#generation), making use of the `monobiome` CLI. This tool can be
@@ -272,7 +272,7 @@ uv tool install monobiome
 pipx install monobiome
 ```
 
-The `monobiome` has provides three subcommands:
+`monobiome` provides three subcommands:
 
 - `monobiome palette`: generate palette files from raw parameterized curves
 
@@ -335,6 +335,14 @@ The `monobiome` has provides three subcommands:
                           output file to write filled template
   ```
 
+## Config management
+The `monobiome` CLI tool attempts to provide the minimal functionality needed
+to produce customized themes for individual applications. If seeking a more
+holistic, system-wide approach, you might consider using [`symconf`][3], a
+general-purpose application config manager. `symconf` provides the templating
+subsystem used for `monobiome` internals, and can be configured to apply live
+theme updates to many apps with a single command line invocation.
+
 
 [1]: https://github.com/isa/TextMate-Themes/blob/master/monoindustrial.tmTheme
 [2]: https://addons.mozilla.org/en-US/firefox/collections/18495484/monobiome/

{monobiome-1.5.0 → monobiome-1.5.3}/README.md

@@ -30,13 +30,13 @@ both of which have fixed hue values and vary from 10% to 98% lightness.
 Monotone curves have fixed chroma, whereas the accent curves' chroma varies
 smoothly as a function of lightness within sRGB gamut bounds.
 
-| Chroma curves | Color trajectories |
-|---|---|
-| ![Chroma curves](images/curves/cstar-curves-v140.png) | ![Trajectories](images/trajectories.gif) |
+| Chroma curves                                            | Color trajectories                       |
+|----------------------------------------------------------|------------------------------------------|
+| ![Chroma curves](images/release/1.5.2/chroma-curves.png) | ![Trajectories](images/trajectories.gif) |
 
-| Palette |
-|---|
-| ![Palette](images/palette.png) |
+| Palette                                      |
+|----------------------------------------------|
+| ![Palette](images/release/1.5.2/palette.png) |
 
 Chroma curves are designed specifically to establish a distinct role for each
 accent and are non-intersecting over the lightness domain (hence the distinct
@@ -60,8 +60,8 @@ varying only in lightness from dark to light grey.
 
 ## Themes
 
-| Dark themes | Light themes |
-|---|---|
+| Dark themes                            | Light themes                             |
+|----------------------------------------|------------------------------------------|
 | ![Dark themes](images/dark_themes.png) | ![Light themes](images/light_themes.png) |
 
 Themes are derived from the `monobiome` palette by selecting a monotone base
@@ -78,10 +78,10 @@ to the background.
 The following plots show the intersection of the sphere centered at a fixed
 background color (`alpine` biome with a lightness of 20) under variable radii:
 
-| | `-l 20 -d 0.3` | `-l 20 -d 0.4` | `-l 20 -d 0.5` |
-|---|---|---|---|
-| Color visualization | ![](images/oklch/mb_b20_d30.gif) | ![](images/oklch/mb_b20_d40.gif) | ![](images/oklch/mb_b20_d50.gif) |
-| Editor preview | ![](images/render/v140-demo-alpine-dark-d0.3.png) | ![](images/render/v140-demo-alpine-dark-d0.4.png) | ![](images/render/v140-demo-alpine-dark-d0.5.png) |
+|                     | `-l 20 -d 0.3`                                    | `-l 20 -d 0.4`                                    | `-l 20 -d 0.5`                                    |
+|---------------------|---------------------------------------------------|---------------------------------------------------|---------------------------------------------------|
+| Color visualization | ![](images/oklch/mb_b20_d30.gif)                  | ![](images/oklch/mb_b20_d40.gif)                  | ![](images/oklch/mb_b20_d50.gif)                  |
+| Editor preview      | ![](images/render/v140-demo-alpine-dark-d0.3.png) | ![](images/render/v140-demo-alpine-dark-d0.4.png) | ![](images/render/v140-demo-alpine-dark-d0.5.png) |
 
 In short, the base lightness (`-l`) dictates the brightness of the background,
 and the contrast (`-d`) controls how perceptually distinct the accent colors
@@ -117,10 +117,10 @@ theme pipeline can be seen in detail below:
 ![Generation pipeline](images/theme_generation_pipeline.png)
 
 This figure demonstrates how `kitty` themes are generated, but the process is
-generic to any palette, scheme, and app. This implemented in two stages using
-the `monobiome` CLI:
+generic to any palette, scheme, and app. This is implemented in two stages
+using the `monobiome` CLI:
 
-- First generate the scheme file, the definitions that respect perceptual
+- First generate the scheme file, the lightness choices that achieve perceptual
   uniformity of accents with respect to the base monotone:
 
   ```sh
@@ -137,19 +137,21 @@ the `monobiome` CLI:
   monobiome fill scheme.toml templates/kitty/active.theme -o kitty.theme
   ```
 
-  This writes a concrete theme to `kitty.theme` that matches the user
-  preferences, i.e., the contrast (`-d`), background lightness (`-l`), mode
-  (`dark`), and biome (`grassland`). Every part of this process can be
-  customized: the scheme parameters, the scheme definitions/file, the app
-  template.
+  This writes a concrete `kitty` theme to `kitty.theme` that matches the user
+  preferences as captured in the previously generated scheme file, i.e., the
+  contrast (`-d`), background lightness (`-l`), mode (`dark`), and biome
+  (`grassland`). Every part of this process can be customized: the scheme
+  parameters, the scheme definitions/file, the app template.
 
-Running these commands in sequence from the repo root should work
-out-of-the-box, after having installed the CLI tool.
+The separation of duties here facilitates robustness: the palette colors can be
+tweaked (across versions, say) without changing how those colors get used in
+app themes. Scheme files don't hardcode color values, and app templates don't
+refer to palette variables at all. Scheme files bridge palette colors with
+*intended uses*, and templates need only align those uses under an app's
+expected config syntax.
 
-The `monobiome` CLI
-produces the scheme file for requested parameters, and the [`symconf`][3] CLI
-pushes palette colors through the scheme and into the app templates to yield a
-concrete theme.
+Running these commands in sequence from the repo root should work
+out-of-the-box after having installed the CLI tool.
 
 ## Applications
 This repo provides palette-agnostic theme templates for `kitty`,
@@ -178,7 +180,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`kitty` theme
-  template](templates/apps/kitty/templates/active.theme).
+  template](templates/kitty/active.theme).
 
 - `vim`/`neovim`
 
@@ -193,7 +195,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`vim` theme
-  template](templates/apps/nvim/templates/theme.vim).
+  template](templates/nvim/theme.vim).
 
 - `fzf`
 
@@ -206,7 +208,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`fzf` theme
-  template](templates/apps/fzf/templates/active.theme).
+  template](templates/fzf/active.theme).
 
 - Firefox
 
@@ -214,13 +216,11 @@ One can set these themes for the provided applications as follows:
   add-ons][2], and switch between light/dark schemes based on system settings.
   You can also download raw XPI files for each theme in `app-config/firefox/`,
   each of which is generated using the [Firefox `manifest.json`
-  template](templates/apps/firefox/templates/none-dark.manifest.json).
+  template](templates/firefox/auto-manifest.json).
 
   Static [light][4] and [dark][5] themes are additionally available (i.e., that
   don't change with system settings).
 
-  ![Firefox theme previews](images/firefox/themes.png)
-
 ## CLI installation
 A brief theme generation guide was provided in the [Generation
 section](#generation), making use of the `monobiome` CLI. This tool can be
@@ -232,7 +232,7 @@ uv tool install monobiome
 pipx install monobiome
 ```
 
-The `monobiome` has provides three subcommands:
+`monobiome` provides three subcommands:
 
 - `monobiome palette`: generate palette files from raw parameterized curves
 
@@ -295,6 +295,14 @@ The `monobiome` has provides three subcommands:
                           output file to write filled template
   ```
 
+## Config management
+The `monobiome` CLI tool attempts to provide the minimal functionality needed
+to produce customized themes for individual applications. If seeking a more
+holistic, system-wide approach, you might consider using [`symconf`][3], a
+general-purpose application config manager. `symconf` provides the templating
+subsystem used for `monobiome` internals, and can be configured to apply live
+theme updates to many apps with a single command line invocation.
+
 
 [1]: https://github.com/isa/TextMate-Themes/blob/master/monoindustrial.tmTheme
 [2]: https://addons.mozilla.org/en-US/firefox/collections/18495484/monobiome/

{monobiome-1.5.0 → monobiome-1.5.3}/monobiome/cli/palette.py

@@ -17,7 +17,7 @@ def register_parser(subparsers: _SubparserType) -> None:
         type=str,
         default="hex",
         choices=["hex", "oklch"],
-        help="Color notation to export (either hex or oklch)",
+        help="color notation to export (either hex or oklch)",
     )
     parser.add_argument(
         "-f",
@@ -25,13 +25,13 @@ def register_parser(subparsers: _SubparserType) -> None:
         type=str,
         default="toml",
         choices=["json", "toml"],
-        help="Format of palette file (either JSON or TOML)",
+        help="format of palette file (either JSON or TOML)",
     )
     parser.add_argument(
         "-o",
         "--output",
         type=str,
-        help="Output file to write palette content",
+        help="output file to write palette content",
     )
 
     parser.set_defaults(func=handle_palette)

{monobiome-1.5.0 → monobiome-1.5.3}/monobiome/cli/scheme.py

@@ -16,13 +16,13 @@ def register_parser(subparsers: _SubparserType) -> None:
         "mode",
         type=str,
         choices=["dark", "light"],
-        help="Scheme mode (light or dark)"
+        help="scheme mode (light or dark)"
     )
     parser.add_argument(
         "biome",
         type=str,
         choices=list(monotone_h_map.keys()),
-        help="Biome setting for scheme."
+        help="biome setting for scheme"
     )
     parser.add_argument(
         "-m",
@@ -30,7 +30,7 @@ def register_parser(subparsers: _SubparserType) -> None:
         type=str,
         default="oklch",
         choices=["wcag", "oklch", "lightness"],
-        help="Metric to use for measuring swatch distances."
+        help="metric to use for measuring swatch distances"
     )
 
     # e.g., wcag=4.5; oklch=0.40; lightness=40
@@ -39,13 +39,13 @@ def register_parser(subparsers: _SubparserType) -> None:
         "--distance",
         type=float,
         default=0.40,
-        help="Distance threshold for specified metric",
+        help="distance threshold for specified metric",
     )
     parser.add_argument(
         "-o",
         "--output",
         type=str,
-        help="Output file to write scheme content",
+        help="output file to write scheme content",
     )
 
     # these params remain rooted in lightness; no need to accommodate metric
@@ -58,13 +58,13 @@ def register_parser(subparsers: _SubparserType) -> None:
         "--l-base",
         type=int,
         default=20,
-        help="Minimum lightness level (default: 20)",
+        help="minimum lightness level (default: 20)",
     )
     parser.add_argument(
         "--l-step",
         type=int,
         default=5,
-        help="Lightness step size (default: 5)",
+        help="lightness step size (default: 5)",
     )
 
     # gaps
@@ -72,19 +72,19 @@ def register_parser(subparsers: _SubparserType) -> None:
         "--fg-gap",
         type=int,
         default=50,
-        help="Foreground lightness gap (default: 50)",
+        help="foreground lightness gap (default: 50)",
     )
     parser.add_argument(
         "--grey-gap",
         type=int,
         default=30,
-        help="Grey lightness gap (default: 30)",
+        help="grey lightness gap (default: 30)",
     )
     parser.add_argument(
         "--term-fg-gap",
         type=int,
         default=65,
-        help="Terminal foreground lightness gap (default: 60)",
+        help="terminal foreground lightness gap (default: 60)",
     )
 
     parser.set_defaults(func=handle_scheme)

{monobiome-1.5.0 → monobiome-1.5.3}/monobiome/constants.py

@@ -121,3 +121,21 @@ for h_str, L_points_C in Lpoints_Cqbr_Hmap.items():
         max(0, min(_C, l_maxC_h(_L, _h)))
         for _L, _C in zip(L_points, L_points_C, strict=True)
     ]
+
+
+# strictly enforce curve bounds s.t. there are no intersections
+# order is determined by the max attained chromap
+max_Cstar_Horder = [
+    (h_str, max(Lpoints_Cstar))
+    for h_str, Lpoints_Cstar in Lpoints_Cstar_Hmap.items()
+]
+max_Cstar_Horder = sorted(max_Cstar_Horder, key=lambda t: t[1], reverse=True)
+
+for i in range(len(max_Cstar_Horder)-1):
+    outer_h, _ = max_Cstar_Horder[i]
+    inner_h, _ = max_Cstar_Horder[i+1]
+
+    Lpoints_Cstar_Hmap[inner_h] = [
+        min(inner_c, Lpoints_Cstar_Hmap[outer_h][ci])
+        for ci, inner_c in enumerate(Lpoints_Cstar_Hmap[inner_h])
+    ]

{monobiome-1.5.0 → monobiome-1.5.3}/monobiome/palette.py

@@ -5,6 +5,10 @@ from importlib.metadata import version
 
 from coloraide import Color
 
+from monobiome.util import (
+    hex_from_rgb8,
+    srgb8_from_color,
+)
 from monobiome.constants import (
     h_map,
     L_points,
@@ -24,8 +28,8 @@ def compute_hlc_map(notation: str) -> dict[str, Any]:
             oklch = Color('oklch', [_l/100, _c, _h])
 
             if notation == "hex":
-                srgb = oklch.convert('srgb')
-                c_str = srgb.to_string(hex=True)
+                rgb8 = srgb8_from_color(oklch)
+                c_str = hex_from_rgb8(rgb8)
             elif notation == "oklch":
                 ol, oc, oh = oklch.convert('oklch').coords()
                 c_str = f"oklch({ol*100:.1f}% {oc:.4f} {oh:.1f})"

{monobiome-1.5.0 → monobiome-1.5.3}/monobiome/plotting.py

@@ -1,7 +1,11 @@
+from importlib.metadata import version
+
 import numpy as np
 import matplotlib.pyplot as plt
 from coloraide import Color
+from matplotlib.collections import LineCollection
 
+from monobiome.util import srgb8_from_color
 from monobiome.palette import compute_hlc_map
 from monobiome.constants import (
     h_map,
@@ -10,11 +14,13 @@ from monobiome.constants import (
     accent_h_map,
     monotone_h_map,
     Lspace_Cmax_Hmap,
+    max_Cstar_Horder,
     Lpoints_Cstar_Hmap,
 )
 
+VERSION = version("monobiome")
 
-def plot_hue_chroma_bounds() -> None:
+def plot_hue_chroma_bounds() -> tuple[plt.Figure, plt.Axes]:
     name_h_map = {}
     ax_h_map = {}
     fig, axes = plt.subplots(
@@ -63,43 +69,56 @@ def plot_hue_chroma_bounds() -> None:
         ncol=3
     )
 
-    plt.suptitle("$C^*$ curves for hue groups")
-    plt.show()
+    plt.suptitle(f"$C^*$ curves for hue groups (v{VERSION})")
 
+    return fig, axes
 
-def plot_hue_chroma_star() -> None:
+def plot_hue_chroma_star() -> tuple[plt.Figure, plt.Axes]:
     fig, ax = plt.subplots(1, 1, figsize=(8, 6))
 
-    # uncomment to preview 5 core term colors
     colors = accent_h_map.keys()
-    #colors = set(["red", "orange", "yellow", "green", "blue"])
+    # uncomment to preview just the 5 core term colors
+    # colors = set(["red", "orange", "yellow", "green", "blue"])
+
+    for h_str, _ in max_Cstar_Horder:
+        Lpoints_Cstar = Lpoints_Cstar_Hmap[h_str]
 
-    for h_str in Lpoints_Cstar_Hmap:
         if h_str not in accent_h_map or h_str not in colors:
             continue
-        ax.fill_between(
-            L_points,
-            Lpoints_Cstar_Hmap[h_str],
-            alpha=0.2,
-            color='grey',
-            label=h_str
-        )
-
-        x, y = L_points, Lpoints_Cstar_Hmap[h_str]
-        n = int(0.45*len(x))
-        ax.text(x[n], y[n]-0.01, h_str, rotation=10, va='center', ha='left')
+
+        _h = h_map[h_str]
+        h_colors = [
+            Color(
+                'oklch', [_l/100, _c, _h]
+            ).convert("srgb").fit(method="oklch-chroma")
+            for _l, _c in zip(L_points, Lpoints_Cstar, strict=True)
+        ]
+        
+        x = np.asarray(L_points)
+        y = np.asarray(Lpoints_Cstar)
+        pts = np.column_stack([x, y]).reshape(-1, 1, 2)
+        segs = np.concatenate([pts[:-1], pts[1:]], axis=1)
+        rgb = np.asarray(h_colors)
+        seg_colors = (rgb[:-1] + rgb[1:]) / 2
+        lc = LineCollection(segs, colors=seg_colors, linewidth=3,
+                            capstyle="round", joinstyle="round",
+                            label=h_str)
+
+        ax.add_collection(lc)
+        ax.autoscale_view()
         
     ax.set_xlabel("Lightness (%)")
     ax.set_xticks([L_points[0], 45, 50, 55, 60, 65, 70, L_points[-1]])
-    plt.suptitle("$C^*$ curves (v1.4.0)")
-    fig.show()
 
+    plt.suptitle(f"$C^*$ curves (v{VERSION})")
+
+    return fig, ax
 
 def palette_image(
     palette: dict[str, dict[int, str]],
     cell_size: int = 40,
     keys: list[str] | None = None
-) -> tuple[np.ndarray, list[str], list[list[int]], int, int]:
+) -> tuple[np.ndarray, list[str], list[list[int]]]:
     names = list(palette.keys()) if keys is None else keys
         
     row_count = len(names)
@@ -108,7 +127,7 @@ def palette_image(
 
     h = row_count * cell_size
     w = max_cols * cell_size
-    img = np.ones((h, w, 3), float)
+    img = np.ones((h, w, 3), int)
 
     lightness_keys_per_row = []
 
@@ -117,14 +136,12 @@ def palette_image(
         lkeys = sorted(shades.keys())
         lightness_keys_per_row.append(lkeys)
         for c, k in enumerate(lkeys):
-            col = Color(shades[k]).convert("srgb").fit(method="clip")
-            rgb = [col["r"], col["g"], col["b"]]
+            rgb = srgb8_from_color(shades[k])
             r0, r1 = r * cell_size, (r + 1) * cell_size
             c0, c1 = c * cell_size, (c + 1) * cell_size
             img[r0:r1, c0:c1, :] = rgb
 
-    return img, names, lightness_keys_per_row, cell_size, max_cols
-
+    return img, names, lightness_keys_per_row
 
 def show_palette(
     palette: dict[str, dict[int, str]],
@@ -133,9 +150,7 @@ def show_palette(
     show_labels: bool = True,
     dpi: int = 100,
 ) -> tuple[plt.Figure, plt.Axes]:
-    img, names, keys, cell_size, max_cols = palette_image(
-        palette, cell_size, keys=keys
-    )
+    img, names, _ = palette_image(palette, cell_size, keys=keys)
 
     fig_w = img.shape[1] / 100
     fig_h = img.shape[0] / 100
@@ -143,7 +158,7 @@ def show_palette(
     if show_labels:
         fig, ax = plt.subplots(figsize=(fig_w, fig_h), dpi=dpi)
 
-        ax.imshow(img, interpolation="none", origin="upper")
+        ax.imshow(img, interpolation="nearest", origin="upper")
         ax.set_xticks([])
 
         ytick_pos = [(i + 0.5) * cell_size for i in range(len(names))]

{monobiome-1.5.0 → monobiome-1.5.3}/monobiome/util.py

@@ -2,6 +2,7 @@ import math
 from types import GenericAlias
 from argparse import ArgumentParser, _SubParsersAction
 
+import numpy as np
 from coloraide import Color
 
 _SubParsersAction.__class_getitem__ = classmethod(GenericAlias)
@@ -33,3 +34,13 @@ def oklch_distance(xc: Color, yc: Color) -> float:
     dz = l1 - l2
     
     return (dx**2 + dy**2 + dz**2)**0.5
+
+def srgb8_from_color(c: str | Color) -> np.ndarray:
+    c = Color(c).convert("srgb").fit(method="oklch-chroma")
+    rgb = np.array([c["r"], c["g"], c["b"]], dtype=float)
+    rgb8 = np.clip(np.round(rgb * 255), 0, 255).astype(np.uint8)
+
+    return rgb8
+
+def hex_from_rgb8(rgb8: np.ndarray) -> str:
+    return f"#{int(rgb8[0]):02x}{int(rgb8[1]):02x}{int(rgb8[2]):02x}"

{monobiome-1.5.0 → monobiome-1.5.3}/monobiome.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monobiome
-Version: 1.5.0
+Version: 1.5.3
 Summary: Monobiome color palette
 Author-email: Sam Griesemer <git@olog.io>
 License-Expression: MIT
@@ -70,13 +70,13 @@ both of which have fixed hue values and vary from 10% to 98% lightness.
 Monotone curves have fixed chroma, whereas the accent curves' chroma varies
 smoothly as a function of lightness within sRGB gamut bounds.
 
-| Chroma curves | Color trajectories |
-|---|---|
-| ![Chroma curves](images/curves/cstar-curves-v140.png) | ![Trajectories](images/trajectories.gif) |
+| Chroma curves                                            | Color trajectories                       |
+|----------------------------------------------------------|------------------------------------------|
+| ![Chroma curves](images/release/1.5.2/chroma-curves.png) | ![Trajectories](images/trajectories.gif) |
 
-| Palette |
-|---|
-| ![Palette](images/palette.png) |
+| Palette                                      |
+|----------------------------------------------|
+| ![Palette](images/release/1.5.2/palette.png) |
 
 Chroma curves are designed specifically to establish a distinct role for each
 accent and are non-intersecting over the lightness domain (hence the distinct
@@ -100,8 +100,8 @@ varying only in lightness from dark to light grey.
 
 ## Themes
 
-| Dark themes | Light themes |
-|---|---|
+| Dark themes                            | Light themes                             |
+|----------------------------------------|------------------------------------------|
 | ![Dark themes](images/dark_themes.png) | ![Light themes](images/light_themes.png) |
 
 Themes are derived from the `monobiome` palette by selecting a monotone base
@@ -118,10 +118,10 @@ to the background.
 The following plots show the intersection of the sphere centered at a fixed
 background color (`alpine` biome with a lightness of 20) under variable radii:
 
-| | `-l 20 -d 0.3` | `-l 20 -d 0.4` | `-l 20 -d 0.5` |
-|---|---|---|---|
-| Color visualization | ![](images/oklch/mb_b20_d30.gif) | ![](images/oklch/mb_b20_d40.gif) | ![](images/oklch/mb_b20_d50.gif) |
-| Editor preview | ![](images/render/v140-demo-alpine-dark-d0.3.png) | ![](images/render/v140-demo-alpine-dark-d0.4.png) | ![](images/render/v140-demo-alpine-dark-d0.5.png) |
+|                     | `-l 20 -d 0.3`                                    | `-l 20 -d 0.4`                                    | `-l 20 -d 0.5`                                    |
+|---------------------|---------------------------------------------------|---------------------------------------------------|---------------------------------------------------|
+| Color visualization | ![](images/oklch/mb_b20_d30.gif)                  | ![](images/oklch/mb_b20_d40.gif)                  | ![](images/oklch/mb_b20_d50.gif)                  |
+| Editor preview      | ![](images/render/v140-demo-alpine-dark-d0.3.png) | ![](images/render/v140-demo-alpine-dark-d0.4.png) | ![](images/render/v140-demo-alpine-dark-d0.5.png) |
 
 In short, the base lightness (`-l`) dictates the brightness of the background,
 and the contrast (`-d`) controls how perceptually distinct the accent colors
@@ -157,10 +157,10 @@ theme pipeline can be seen in detail below:
 ![Generation pipeline](images/theme_generation_pipeline.png)
 
 This figure demonstrates how `kitty` themes are generated, but the process is
-generic to any palette, scheme, and app. This implemented in two stages using
-the `monobiome` CLI:
+generic to any palette, scheme, and app. This is implemented in two stages
+using the `monobiome` CLI:
 
-- First generate the scheme file, the definitions that respect perceptual
+- First generate the scheme file, the lightness choices that achieve perceptual
   uniformity of accents with respect to the base monotone:
 
   ```sh
@@ -177,19 +177,21 @@ the `monobiome` CLI:
   monobiome fill scheme.toml templates/kitty/active.theme -o kitty.theme
   ```
 
-  This writes a concrete theme to `kitty.theme` that matches the user
-  preferences, i.e., the contrast (`-d`), background lightness (`-l`), mode
-  (`dark`), and biome (`grassland`). Every part of this process can be
-  customized: the scheme parameters, the scheme definitions/file, the app
-  template.
+  This writes a concrete `kitty` theme to `kitty.theme` that matches the user
+  preferences as captured in the previously generated scheme file, i.e., the
+  contrast (`-d`), background lightness (`-l`), mode (`dark`), and biome
+  (`grassland`). Every part of this process can be customized: the scheme
+  parameters, the scheme definitions/file, the app template.
 
-Running these commands in sequence from the repo root should work
-out-of-the-box, after having installed the CLI tool.
+The separation of duties here facilitates robustness: the palette colors can be
+tweaked (across versions, say) without changing how those colors get used in
+app themes. Scheme files don't hardcode color values, and app templates don't
+refer to palette variables at all. Scheme files bridge palette colors with
+*intended uses*, and templates need only align those uses under an app's
+expected config syntax.
 
-The `monobiome` CLI
-produces the scheme file for requested parameters, and the [`symconf`][3] CLI
-pushes palette colors through the scheme and into the app templates to yield a
-concrete theme.
+Running these commands in sequence from the repo root should work
+out-of-the-box after having installed the CLI tool.
 
 ## Applications
 This repo provides palette-agnostic theme templates for `kitty`,
@@ -218,7 +220,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`kitty` theme
-  template](templates/apps/kitty/templates/active.theme).
+  template](templates/kitty/active.theme).
 
 - `vim`/`neovim`
 
@@ -233,7 +235,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`vim` theme
-  template](templates/apps/nvim/templates/theme.vim).
+  template](templates/nvim/theme.vim).
 
 - `fzf`
 
@@ -246,7 +248,7 @@ One can set these themes for the provided applications as follows:
   ```
 
   Themes are generated using the [`fzf` theme
-  template](templates/apps/fzf/templates/active.theme).
+  template](templates/fzf/active.theme).
 
 - Firefox
 
@@ -254,13 +256,11 @@ One can set these themes for the provided applications as follows:
   add-ons][2], and switch between light/dark schemes based on system settings.
   You can also download raw XPI files for each theme in `app-config/firefox/`,
   each of which is generated using the [Firefox `manifest.json`
-  template](templates/apps/firefox/templates/none-dark.manifest.json).
+  template](templates/firefox/auto-manifest.json).
 
   Static [light][4] and [dark][5] themes are additionally available (i.e., that
   don't change with system settings).
 
-  ![Firefox theme previews](images/firefox/themes.png)
-
 ## CLI installation
 A brief theme generation guide was provided in the [Generation
 section](#generation), making use of the `monobiome` CLI. This tool can be
@@ -272,7 +272,7 @@ uv tool install monobiome
 pipx install monobiome
 ```
 
-The `monobiome` has provides three subcommands:
+`monobiome` provides three subcommands:
 
 - `monobiome palette`: generate palette files from raw parameterized curves
 
@@ -335,6 +335,14 @@ The `monobiome` has provides three subcommands:
                           output file to write filled template
   ```
 
+## Config management
+The `monobiome` CLI tool attempts to provide the minimal functionality needed
+to produce customized themes for individual applications. If seeking a more
+holistic, system-wide approach, you might consider using [`symconf`][3], a
+general-purpose application config manager. `symconf` provides the templating
+subsystem used for `monobiome` internals, and can be configured to apply live
+theme updates to many apps with a single command line invocation.
+
 
 [1]: https://github.com/isa/TextMate-Themes/blob/master/monoindustrial.tmTheme
 [2]: https://addons.mozilla.org/en-US/firefox/collections/18495484/monobiome/

{monobiome-1.5.0 → monobiome-1.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "monobiome"
-version = "1.5.0"
+version = "1.5.3"
 description = "Monobiome color palette"
 requires-python = ">=3.12"
 authors = [