galaaz 2.1.10.pre.2 → 2.1.10.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3daf3e8ef8a905c19d570fd83de8218821a904f02f7ac8adda498cb5c42a6a6
-  data.tar.gz: 0d9071b1b04999a690cbb3d748a1e09d84a98b021f143d5fe950a9324a5daeb5
+  metadata.gz: c3ee446f657b5eac4bb8ef351c3a7adbe0246b8d750288bffab68c43e83e10bf
+  data.tar.gz: e00e643ae69cc1fae159706c6b06b8e9c291e4060814b5b3feafc4abb722454c
 SHA512:
-  metadata.gz: 6bbfb2c3bc020ef0768d7ba55754b8371ffd996f08c84d68396c5584449be24537550495bf3925c8ab3dc47aafd9a208de45a998f5ceee4e36f8d87d2bcaea4f
-  data.tar.gz: 5f7f357dc2e155e0934835d18aa5d6a2f8e61e985198ae39f6f4257d9073cb8cb91a3532ec3cccc9a687b3b4fa7f35696de2b51992cf3337ee0dc690469a8f00
+  metadata.gz: 7a6fac11ad1080ebb3d4161fb228f5c259dfe979562842d3284af368538fec452f2a3ee78074dcca444f9889f4f3808a86d4e4d9b616805ff4cc0281c9e7400c
+  data.tar.gz: 87e43043e7bc22a13e96a691c23e9b9410655ec3b4df22c99766177cf5c9b08961ade4b27e6894ee777c13113abeab23bbd27c719d785f7079091c5ff2b1f36c

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## 2.1.10.pre.4
+
+### Fixed
+
+- Omarchy brand icon moved from **U+E900 → U+E920**. E900–E90D belong to
+  Omarchy’s own private font (waybar `\ue900`); using E900 made the menu show
+  Omarchy’s mark whenever `iconFont: galaaz` failed to win.
+
+## 2.1.10.pre.3
+
+### Fixed
+
+- Omarchy brand icon: hand-drawn R + oversized ruby cutout (no PNG auto-trace);
+  build fails if gem hole is too small; preview PNGs at 16/24/48px.
+- Omarchy menu: brand icons use `\uE900` + `iconFont: galaaz`; remove separate
+  TeX menu row (Knit installs TinyTeX); remove Knit demo (oh_my).
+
 ## 2.1.10.pre.2
 
 ### Fixed

data/lib/galaaz/cli.rb

@@ -268,7 +268,7 @@ module Galaaz
       FileUtils.mkdir_p(fonts)
       dest = File.join(fonts, 'galaaz.ttf')
       FileUtils.cp(src, dest)
-      puts "galaaz omarchy: #{dest} (family #{OMARCHY_FONT_FAMILY}, U+E900)"
+      puts "galaaz omarchy: #{dest} (family #{OMARCHY_FONT_FAMILY}, U+E920)"
       if command_present?('fc-cache')
         system('fc-cache', '-r')
         system('fc-cache', '-f', fonts)

data/logos/icon-font/README.md

@@ -4,7 +4,10 @@ Private TrueType font (`family: galaaz`) with one private-use glyph:
 
 | Codepoint | Name | Role |
 |-----------|------|------|
-| `U+E900` | `galaaz` | Monochrome R + gem cutout for Install menu rows |
+| `U+E920` | `galaaz` | Monochrome R + gem cutout for Install menu rows |
+
+Do **not** reuse `U+E900` — Omarchy's private font already maps E900–E90D
+(waybar logo is `\ue900`).
 
 ## Sources
 
@@ -18,10 +21,13 @@ Rebuild after editing the SVG:
 
 ```bash
 python3 -m venv /tmp/galaaz-font-venv
-/tmp/galaaz-font-venv/bin/pip install fonttools
+/tmp/galaaz-font-venv/bin/pip install fonttools pillow
 /tmp/galaaz-font-venv/bin/python logos/icon-font/build_font.py
 ```
 
+The build writes `preview/glyph_{16,24,48}.png` and **fails** if the gem
+cutout is too small for menu size. Inspect those PNGs before shipping.
+
 `galaaz omarchy` installs the TTF to `~/.local/share/fonts/galaaz/` and the menu
 uses `"iconFont": "galaaz"`. Restart the Omarchy shell after install so Qt
 reloads fonts (`omarchy menu refresh` alone is not enough for a new family).

data/logos/icon-font/build_font.py

@@ -13,12 +13,16 @@ from fontTools.svgLib.path import SVGPath
 from fontTools.ttLib import TTFont
 from fontTools.ttLib.tables._g_l_y_f import Glyph as TTGlyph
 from fontTools.ttLib.tables._g_l_y_f import GlyphCoordinates
-from fontTools.ttLib.tables._g_l_y_f import flagOnCurve
 
 ROOT = Path(__file__).resolve().parents[2]
 SVG = ROOT / "logos" / "icon-font" / "galaaz-mark.svg"
 OUT = ROOT / "script" / "omarchy" / "fonts" / "galaaz.ttf"
-CODEPOINT = 0xE900
+PREVIEW_DIR = ROOT / "logos" / "icon-font" / "preview"
+# NOT U+E900: Omarchy's own brand font already owns E900–E90D (waybar logo).
+# Using that slot makes fallback look like Omarchy's mark, not Galaaz.
+CODEPOINT = 0xE920
+# Gem cutout must stay visible at menu size (~16px). Tiny holes collapse.
+MIN_HOLE_AREA_RATIO = 0.04
 
 
 def extract_path_d(svg_text: str) -> str:
@@ -69,6 +73,31 @@ def fix_hole_windings(glyph: TTGlyph) -> None:
     glyph.numberOfContours = len(new_ends)
 
 
+def write_previews(ttf_path: Path) -> None:
+    """Write menu-size PNG previews next to the SVG (requires Pillow)."""
+    try:
+        from PIL import Image, ImageDraw, ImageFont
+    except ImportError:
+        print("  preview: skipped (pip install pillow)")
+        return
+
+    PREVIEW_DIR.mkdir(parents=True, exist_ok=True)
+    for size in (16, 24, 48):
+        canvas = max(64, size * 2)
+        img = Image.new("RGBA", (canvas, canvas), (30, 30, 30, 255))
+        draw = ImageDraw.Draw(img)
+        font = ImageFont.truetype(str(ttf_path), size)
+        ch = chr(CODEPOINT)
+        bbox = draw.textbbox((0, 0), ch, font=font)
+        w, h = bbox[2] - bbox[0], bbox[3] - bbox[1]
+        x = (canvas - w) // 2 - bbox[0]
+        y = (canvas - h) // 2 - bbox[1]
+        draw.text((x, y), ch, font=font, fill=(230, 230, 230, 255))
+        out = PREVIEW_DIR / f"glyph_{size}.png"
+        img.save(out)
+        print(f"  preview: {out}")
+
+
 def main() -> int:
     d = extract_path_d(SVG.read_text(encoding="utf-8"))
     transform = Transform(1, 0, 0, -1, 0, 1000)
@@ -100,12 +129,12 @@ def main() -> int:
         {
             "familyName": "galaaz",
             "styleName": "Regular",
-            "uniqueFontIdentifier": "galaaz Regular",
+            "uniqueFontIdentifier": "galaaz Regular 1.002 U+E920",
             "fullName": "galaaz Regular",
             "psName": "galaaz-Regular",
-            "version": "Version 1.000",
+            "version": "Version 1.002",
             "manufacturer": "Galaaz",
-            "description": "Monochrome Galaaz mark for Omarchy menu rows (U+E900).",
+            "description": "Monochrome Galaaz mark for Omarchy menu rows (U+E920).",
         }
     )
     OUT.parent.mkdir(parents=True, exist_ok=True)
@@ -117,12 +146,26 @@ def main() -> int:
     coords = list(g.coordinates)
     ends = list(g.endPtsOfContours)
     start = 0
+    areas = []
     for i, end in enumerate(ends):
         pts = coords[start : end + 1]
         a = signed_area(pts)
+        areas.append(a)
         print(f"  contour {i}: {'CW' if a < 0 else 'CCW'} area={a:.0f}")
         start = end + 1
+    if len(areas) < 2:
+        raise SystemExit("expected outer + gem hole contours")
+    outer = abs(areas[0])
+    hole = abs(areas[1])
+    ratio = hole / outer if outer else 0.0
+    print(f"  hole/outer area ratio: {ratio:.3f} (min {MIN_HOLE_AREA_RATIO})")
+    if ratio < MIN_HOLE_AREA_RATIO:
+        raise SystemExit(
+            f"gem cutout too small for menu size ({ratio:.3f} < {MIN_HOLE_AREA_RATIO}); "
+            "enlarge the hole in galaaz-mark.svg"
+        )
     print(f"wrote {OUT}  glyph U+{CODEPOINT:04X} family=galaaz")
+    write_previews(OUT)
     return 0
 
 

data/logos/icon-font/galaaz-mark.svg

@@ -1,7 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- From logos/galaaz-minimum-size.png — solid R + ruby cutout (Omarchy menu glyph). -->
+<!--
+  Monochrome Galaaz mark for Omarchy menu (family galaaz, U+E900).
+  Hand-drawn for ~16–24px: bold R + oversized hexagonal ruby cutout.
+  Do NOT auto-trace the PNG — stair-step traces collapse into "COBOL" blobs.
+-->
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" fill="#000">
   <path fill-rule="evenodd" d="
-    M 457.1 672.3 L 390.1 672.1 L 390.1 654.5 L 381.1 654.2 L 381.1 614.2 L 390.1 613.8 L 390.1 587.3 L 483.9 587.2 L 504.1 606.9 L 618.9 494.0 L 567.2 401.3 L 441.0 401.3 L 424.6 430.4 L 390.3 430.4 L 390.1 354.4 L 582.5 354.2 L 582.9 363.2 L 609.4 363.2 L 609.7 372.2 L 627.3 372.2 L 627.5 380.9 L 636.2 381.1 L 636.4 389.9 L 645.2 390.1 L 645.4 398.8 L 654.3 399.2 L 654.3 416.8 L 663.3 417.1 L 663.3 443.6 L 672.3 444.0 L 672.3 492.9 L 663.3 493.3 L 663.3 519.8 L 654.3 520.2 L 654.3 537.7 L 645.6 537.9 L 645.4 546.7 L 636.6 546.8 L 636.4 555.6 L 627.5 556.0 L 627.5 578.0 L 636.2 578.2 L 636.4 587.0 L 645.4 587.3 L 645.4 604.9 L 654.2 605.1 L 654.3 613.8 L 663.1 614.0 L 663.3 622.8 L 672.3 623.2 L 672.3 640.7 L 681.0 640.9 L 681.2 649.7 L 690.2 650.1 L 690.2 663.1 L 587.3 663.3 L 587.2 654.5 L 578.4 654.3 L 578.2 645.6 L 569.4 645.4 L 569.1 636.4 L 466.4 636.4 L 466.2 663.1 L 457.4 663.3 L 457.1 672.3 Z M 470.1 573.7 L 390.3 573.7 L 390.1 515.7 L 411.2 515.5 L 470.1 573.7 Z
+    M 180 120
+    H 560
+    L 700 120
+    L 800 230
+    L 820 380
+    L 740 530
+    L 580 590
+    L 840 880
+    H 620
+    L 400 610
+    H 320
+    V 880
+    H 180
+    V 120
+    Z
+
+    M 340 250
+    L 580 250
+    L 660 360
+    L 460 530
+    L 260 360
+    Z
   "/>
 </svg>

data/script/omarchy/README.md

@@ -31,7 +31,7 @@ Then Super+Space → Install → Development → **Galaaz**.
 | `debug-galaaz.sh` | Snapshot doctor/PATH/gem/bridge |
 | `remove-galaaz.sh` | Uninstall gem + marked blogs; leave R |
 | `omarchy-menu.jsonc` | Menu overlay submenu under Install → Development |
-| `fonts/galaaz.ttf` | Monochrome brand mark (`iconFont: galaaz`, U+E900) |
+| `fonts/galaaz.ttf` | Monochrome brand mark (`iconFont: galaaz`, U+E920; not E900) |
 
 Menu rows use the Galaaz icon font (not the Ruby-on-Rails Nerd Font gem). Source SVG
 and rebuild script live under `logos/icon-font/`.

data/script/omarchy/omarchy-menu.jsonc

@@ -5,17 +5,20 @@
   // Use ~/.local/bin/galaaz (installer wrapper). Do not quote the whole
   // "galaaz add …" as one word — omarchy-launch-tui then does nothing useful.
   //
-  // Brand mark: private-use U+E900 in family "galaaz"
-  // (script/omarchy/fonts/galaaz.ttf → ~/.local/share/fonts/galaaz/).
+  // Brand mark: U+E920 (\uE920) + iconFont "galaaz".
+  // Do NOT use U+E900 — that slot is Omarchy's own logo (waybar \ue900,
+  // private font family "omarchy", range E900–E90D). Fallback without our
+  // font then shows Omarchy's mark, not Galaaz.
+  // TTF: script/omarchy/fonts/galaaz.ttf → ~/.local/share/fonts/galaaz/
 
   "install.development.galaaz": {
-    "icon": "",
+    "icon": "\uE920",
     "iconFont": "galaaz",
     "label": "Galaaz",
     "description": "R on Rails"
   },
   "install.development.galaaz.core": {
-    "icon": "",
+    "icon": "\uE920",
     "iconFont": "galaaz",
     "label": "Galaaz (core)",
     "description": "gem + setup + blogs (not just gem install)",
@@ -44,7 +47,7 @@
     "when": "test -f ~/.config/galaaz/profiles/core"
   },
   "install.development.galaaz.knit": {
-    "icon": "",
+    "icon": "\uE920",
     "iconFont": "galaaz",
     "label": "Knit (HTML + PDF blogs)",
     "description": "pandoc + knitr/rmarkdown + TinyTeX",
@@ -52,35 +55,28 @@
     "disabled": "test -f ~/.config/galaaz/profiles/knit"
   },
   "install.development.galaaz.arrow": {
-    "icon": "",
+    "icon": "\uE920",
     "iconFont": "galaaz",
     "label": "Arrow",
     "action": "omarchy-launch-tui omarchy-galaaz-add arrow",
     "disabled": "test -f ~/.config/galaaz/profiles/arrow"
   },
-  "install.development.galaaz.tex": {
-    "icon": "",
-    "iconFont": "galaaz",
-    "label": "TeX (PDF blogs)",
-    "action": "omarchy-launch-tui omarchy-galaaz-add tex",
-    "disabled": "test -f ~/.config/galaaz/profiles/tex"
-  },
   "install.development.galaaz.bio": {
-    "icon": "",
+    "icon": "\uE920",
     "iconFont": "galaaz",
     "label": "Bioconductor (DESeq2)",
     "action": "omarchy-launch-tui omarchy-galaaz-add bio",
     "disabled": "test -f ~/.config/galaaz/profiles/bio"
   },
   "install.development.galaaz.examples": {
-    "icon": "",
+    "icon": "\uE920",
     "iconFont": "galaaz",
     "label": "Examples",
     "action": "omarchy-launch-tui omarchy-galaaz-add examples",
     "disabled": "test -f ~/.config/galaaz/profiles/examples"
   },
   "install.development.galaaz.ledger": {
-    "icon": "",
+    "icon": "\uE920",
     "iconFont": "galaaz",
     "label": "Ledger (R-on-Rails demo)",
     "description": "Clone app, seed, bin/dev",
@@ -88,7 +84,7 @@
     "disabled": "test -f ~/.config/galaaz/profiles/ledger"
   },
   "remove.development.galaaz": {
-    "icon": "",
+    "icon": "\uE920",
     "iconFont": "galaaz",
     "label": "Galaaz",
     "description": "Core gem (add-on R packages stay)",

data/version.rb

@@ -1,2 +1,2 @@
 $gem_name = "galaaz"
-$version="2.1.10.pre.2"
+$version="2.1.10.pre.4"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: galaaz
 version: !ruby/object:Gem::Version
-  version: 2.1.10.pre.2
+  version: 2.1.10.pre.4
 platform: ruby
 authors:
 - Rodrigo Botafogo
@@ -405,6 +405,9 @@ files:
 - logos/icon-font/README.md
 - logos/icon-font/build_font.py
 - logos/icon-font/galaaz-mark.svg
+- logos/icon-font/preview/glyph_16.png
+- logos/icon-font/preview/glyph_24.png
+- logos/icon-font/preview/glyph_48.png
 - new_bridge_specs/arrow_ipc_async_spec.rb
 - new_bridge_specs/arrow_ipc_export_async_spec.rb
 - new_bridge_specs/benchmark_phase5_5_unboxing_spec.rb