restty 0.1.19 → 0.1.21

package/README.md

@@ -5,6 +5,7 @@
 [![CI](https://img.shields.io/github/actions/workflow/status/wiedymi/restty/ci.yml?branch=main&style=flat-square)](https://github.com/wiedymi/restty/actions/workflows/ci.yml)
 [![Publish](https://img.shields.io/github/actions/workflow/status/wiedymi/restty/publish.yml?style=flat-square&label=publish)](https://github.com/wiedymi/restty/actions/workflows/publish.yml)
 [![Demo](https://img.shields.io/badge/demo-restty.pages.dev-0ea5e9?style=flat-square)](https://restty.pages.dev/)
+
 [![GitHub](https://img.shields.io/badge/-GitHub-181717?style=flat-square&logo=github&logoColor=white)](https://github.com/wiedymi)
 [![Twitter](https://img.shields.io/badge/-Twitter-1DA1F2?style=flat-square&logo=twitter&logoColor=white)](https://x.com/wiedymi)
 [![Email](https://img.shields.io/badge/-Email-EA4335?style=flat-square&logo=gmail&logoColor=white)](mailto:contact@wiedymi.com)
@@ -101,7 +102,7 @@ restty.copySelectionToClipboard();
 
 ### Provide custom fonts
 
-By default, restty uses a CDN font preset. To fully control fonts, disable the preset and pass `fontSources`.
+By default, restty uses a local-first font preset with CDN fallback. To fully control fonts, disable the preset and pass `fontSources`.
 
 ```ts
 const restty = new Restty({

package/dist/app/font-sources.d.ts

@@ -1,5 +1,5 @@
 import type { ResttyFontPreset, ResttyFontSource } from "./types";
-/** Default font fallback chain with JetBrains Mono, Nerd Fonts symbols, Noto symbols, color emoji, black emoji, and CJK support. */
+/** Local-first default font fallback chain with CDN fallback for JetBrains Mono, Nerd symbols, emoji, and CJK support. */
 export declare const DEFAULT_FONT_SOURCES: ResttyFontSource[];
 /** Validates user-provided font sources or returns defaults based on preset (none returns empty array, otherwise default CDN fonts). */
 export declare function normalizeFontSources(sources: ResttyFontSource[] | undefined, preset: ResttyFontPreset | undefined): ResttyFontSource[];

package/dist/app/types.d.ts

@@ -154,6 +154,12 @@ export type ResttyAppOptions = {
     renderer?: "auto" | "webgpu" | "webgl2";
     /** Font size in CSS pixels. */
     fontSize?: number;
+    /**
+     * Font sizing mode used by text-shaper scale resolution.
+     * - em: interpret fontSize as EM size
+     * - height: interpret fontSize as full font height (ascender-descender-lineGap)
+     */
+    fontSizeMode?: "em" | "height";
     /**
      * Alpha blending strategy.
      * - native: GPU-native premultiplied alpha

package/dist/{chunk-53vdvhe3.js → chunk-ym658zhj.js}

@@ -9095,6 +9095,37 @@ function isLikelyEmojiCodepoint(cp) {
     return true;
   return false;
 }
+function isVariationSelectorCodepoint(cp) {
+  if (cp >= 65024 && cp <= 65039)
+    return true;
+  if (cp >= 917760 && cp <= 917999)
+    return true;
+  return false;
+}
+function isCombiningMarkCodepoint(cp) {
+  if (cp >= 768 && cp <= 879)
+    return true;
+  if (cp >= 6832 && cp <= 6911)
+    return true;
+  if (cp >= 7616 && cp <= 7679)
+    return true;
+  if (cp >= 8400 && cp <= 8447)
+    return true;
+  if (cp >= 65056 && cp <= 65071)
+    return true;
+  return false;
+}
+function isCoverageIgnorableCodepoint(cp) {
+  if (cp === 8204 || cp === 8205)
+    return true;
+  if (isVariationSelectorCodepoint(cp))
+    return true;
+  if (isCombiningMarkCodepoint(cp))
+    return true;
+  if (cp >= 917536 && cp <= 917631)
+    return true;
+  return false;
+}
 function resolvePresentationPreference(text, chars) {
   if (text.includes("️"))
     return "emoji";
@@ -9109,7 +9140,7 @@ function resolvePresentationPreference(text, chars) {
   }
   return "auto";
 }
-function pickFontIndexForText(state, text, expectedSpan, shapeClusterWithFont) {
+function pickFontIndexForText(state, text, expectedSpan) {
   if (!state.fonts.length)
     return 0;
   const cacheKey = `${expectedSpan}:${text}`;
@@ -9117,6 +9148,10 @@ function pickFontIndexForText(state, text, expectedSpan, shapeClusterWithFont) {
   if (cached !== undefined)
     return cached;
   const chars = Array.from(text);
+  const requiredChars = chars.filter((ch) => {
+    const cp = ch.codePointAt(0) ?? 0;
+    return !isCoverageIgnorableCodepoint(cp);
+  });
   const firstCp = text.codePointAt(0) ?? 0;
   const nerdSymbol = isNerdSymbolCodepoint(firstCp);
   const presentation = resolvePresentationPreference(text, chars);
@@ -9128,7 +9163,7 @@ function pickFontIndexForText(state, text, expectedSpan, shapeClusterWithFont) {
       if (predicate && !predicate(entry))
         continue;
       let ok = true;
-      for (const ch of chars) {
+      for (const ch of requiredChars) {
         if (!fontHasGlyph(entry.font, ch)) {
           ok = false;
           break;
@@ -26598,7 +26633,7 @@ function buildFontAtlasIfNeeded(params) {
   if (union.size === 0) {
     return { rebuilt: false, atlas: null, rgba: null, preferNearest: false };
   }
-  const useHinting = fontIndex === 0 && !isSymbol;
+  const useHinting = false;
   const atlasPadding = isSymbol ? Math.max(constants.atlasPadding, constants.symbolAtlasPadding) : constants.atlasPadding;
   const atlasMaxSize = isSymbol ? constants.symbolAtlasMaxSize : constants.defaultAtlasMaxSize;
   const glyphPixelMode = resolveGlyphPixelMode(entry);
@@ -26690,9 +26725,79 @@ function buildFontAtlasIfNeeded(params) {
 
 // src/app/font-sources.ts
 var DEFAULT_FONT_SOURCES = [
+  {
+    type: "local",
+    matchers: [
+      "jetbrainsmono nerd font",
+      "jetbrains mono nerd font",
+      "jetbrains mono nl nerd font mono",
+      "jetbrains mono",
+      "jetbrainsmono"
+    ],
+    label: "JetBrains Mono Nerd Font Regular (Local)"
+  },
+  {
+    type: "local",
+    matchers: [
+      "jetbrainsmono nerd font bold",
+      "jetbrains mono nerd font bold",
+      "jetbrains mono nl nerd font mono bold",
+      "jetbrains mono bold",
+      "jetbrainsmono bold"
+    ],
+    label: "JetBrains Mono Nerd Font Bold (Local)"
+  },
+  {
+    type: "local",
+    matchers: [
+      "jetbrainsmono nerd font italic",
+      "jetbrains mono nerd font italic",
+      "jetbrains mono nl nerd font mono italic",
+      "jetbrains mono italic",
+      "jetbrainsmono italic"
+    ],
+    label: "JetBrains Mono Nerd Font Italic (Local)"
+  },
+  {
+    type: "local",
+    matchers: [
+      "jetbrainsmono nerd font bold italic",
+      "jetbrains mono nerd font bold italic",
+      "jetbrains mono nl nerd font mono bold italic",
+      "jetbrains mono bold italic",
+      "jetbrainsmono bold italic"
+    ],
+    label: "JetBrains Mono Nerd Font Bold Italic (Local)"
+  },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/ryanoasis/nerd-fonts@v3.4.0/patched-fonts/JetBrainsMono/NoLigatures/Regular/JetBrainsMonoNLNerdFontMono-Regular.ttf",
+    label: "JetBrains Mono Nerd Font Regular"
+  },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/ryanoasis/nerd-fonts@v3.4.0/patched-fonts/JetBrainsMono/NoLigatures/Bold/JetBrainsMonoNLNerdFontMono-Bold.ttf",
+    label: "JetBrains Mono Nerd Font Bold"
+  },
   {
     type: "url",
-    url: "https://cdn.jsdelivr.net/gh/ryanoasis/nerd-fonts@v3.4.0/patched-fonts/JetBrainsMono/NoLigatures/Regular/JetBrainsMonoNLNerdFontMono-Regular.ttf"
+    url: "https://cdn.jsdelivr.net/gh/ryanoasis/nerd-fonts@v3.4.0/patched-fonts/JetBrainsMono/NoLigatures/Italic/JetBrainsMonoNLNerdFontMono-Italic.ttf",
+    label: "JetBrains Mono Nerd Font Italic"
+  },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/ryanoasis/nerd-fonts@v3.4.0/patched-fonts/JetBrainsMono/NoLigatures/BoldItalic/JetBrainsMonoNLNerdFontMono-BoldItalic.ttf",
+    label: "JetBrains Mono Nerd Font Bold Italic"
+  },
+  {
+    type: "local",
+    matchers: [
+      "symbols nerd font mono",
+      "symbols nerd font",
+      "nerd fonts symbols",
+      "nerdfontssymbolsonly"
+    ],
+    label: "Symbols Nerd Font (Local)"
   },
   {
     type: "url",
@@ -50195,6 +50300,12 @@ var DEFAULT_SYMBOL_CONSTRAINT = {
   align_vertical: "center",
   max_constraint_width: 1
 };
+var DEFAULT_APPLE_SYMBOLS_CONSTRAINT = {
+  size: "cover",
+  align_horizontal: "center",
+  align_vertical: "center",
+  max_constraint_width: 1
+};
 var DEFAULT_EMOJI_CONSTRAINT = {
   size: "cover",
   align_horizontal: "center",
@@ -50305,6 +50416,7 @@ function createResttyApp(options) {
   const OVERLAY_SCROLLBAR_MARGIN_CSS_PX = 4;
   const OVERLAY_SCROLLBAR_INSET_Y_CSS_PX = 2;
   const OVERLAY_SCROLLBAR_MIN_THUMB_CSS_PX = 28;
+  const OVERLAY_SCROLLBAR_CAP_SUPERSAMPLE = 8;
   let paused = false;
   let backend = "none";
   let preferredRenderer = options.renderer ?? "auto";
@@ -50627,24 +50739,63 @@ function createResttyApp(options) {
     const y02 = Math.round(y);
     const width = Math.max(1, Math.round(w));
     const height = Math.max(1, Math.round(h));
-    const radius = Math.min(Math.floor(width * 0.5), Math.floor(height * 0.5));
+    const radius = Math.min(width * 0.5, height * 0.5);
     if (radius <= 0) {
       pushRectBox(out, x02, y02, width, height, color);
       return;
     }
-    const middleH = height - radius * 2;
+    const capRows = Math.min(height, Math.max(1, Math.ceil(radius)));
+    const middleStart = capRows;
+    const middleEnd = Math.max(middleStart, height - capRows);
+    const middleH = middleEnd - middleStart;
     if (middleH > 0) {
-      pushRectBox(out, x02, y02 + radius, width, middleH, color);
+      pushRectBox(out, x02, y02 + middleStart, width, middleH, color);
     }
     const radiusSq = radius * radius;
-    for (let row = 0;row < radius; row += 1) {
-      const dy = radius - row - 0.5;
-      const inset = Math.max(0, Math.floor(radius - Math.sqrt(Math.max(0, radiusSq - dy * dy))));
-      const rowW = width - inset * 2;
-      if (rowW <= 0)
-        continue;
-      pushRectBox(out, x02 + inset, y02 + row, rowW, 1, color);
-      pushRectBox(out, x02 + inset, y02 + height - 1 - row, rowW, 1, color);
+    const centerX = width * 0.5;
+    const topCenterY = radius;
+    const bottomCenterY = height - radius;
+    const samplesPerAxis = Math.max(1, OVERLAY_SCROLLBAR_CAP_SUPERSAMPLE | 0);
+    const totalSamples = samplesPerAxis * samplesPerAxis;
+    const invSamples = 1 / totalSamples;
+    const alphaBase = color[3];
+    const alphaEpsilon = 1 / 255;
+    const sampleCapPixelCoverage = (localX, localY, centerY) => {
+      let hits = 0;
+      for (let sy = 0;sy < samplesPerAxis; sy += 1) {
+        const sampleY = localY + (sy + 0.5) / samplesPerAxis;
+        for (let sx = 0;sx < samplesPerAxis; sx += 1) {
+          const sampleX = localX + (sx + 0.5) / samplesPerAxis;
+          const dx = sampleX - centerX;
+          const dy = sampleY - centerY;
+          if (dx * dx + dy * dy <= radiusSq)
+            hits += 1;
+        }
+      }
+      return hits * invSamples;
+    };
+    for (let row = 0;row < capRows; row += 1) {
+      const topY = y02 + row;
+      const bottomY = y02 + height - 1 - row;
+      for (let col = 0;col < width; col += 1) {
+        const coverageTop = sampleCapPixelCoverage(col, row, topCenterY);
+        if (coverageTop > 0) {
+          const alpha = alphaBase * coverageTop;
+          if (alpha > alphaEpsilon) {
+            out.push(x02 + col, topY, 1, 1, color[0], color[1], color[2], alpha);
+          }
+        }
+        if (bottomY !== topY) {
+          const localBottomY = height - 1 - row;
+          const coverageBottom = sampleCapPixelCoverage(col, localBottomY, bottomCenterY);
+          if (coverageBottom > 0) {
+            const alpha = alphaBase * coverageBottom;
+            if (alpha > alphaEpsilon) {
+              out.push(x02 + col, bottomY, 1, 1, color[0], color[1], color[2], alpha);
+            }
+          }
+        }
+      }
     }
   }
   function appendOverlayScrollbar(overlayData, total, offset, len) {
@@ -51833,7 +51984,7 @@ function createResttyApp(options) {
     font: null,
     fonts: [],
     fontSizePx: 0,
-    sizeMode: "height",
+    sizeMode: options.fontSizeMode === "em" ? "em" : "height",
     fontPickCache: new Map
   };
   const fontConfig = {
@@ -53312,6 +53463,33 @@ function createResttyApp(options) {
     const normalizedMatchers = matchers.map((matcher) => matcher.toLowerCase()).filter(Boolean);
     if (!normalizedMatchers.length)
       return null;
+    const detectStyleHint = (value) => {
+      const text = value.toLowerCase();
+      let weight = 400;
+      if (/\b(thin|hairline)\b/.test(text))
+        weight = 100;
+      else if (/\b(extra[- ]?light|ultra[- ]?light)\b/.test(text))
+        weight = 200;
+      else if (/\blight\b/.test(text))
+        weight = 300;
+      else if (/\bmedium\b/.test(text))
+        weight = 500;
+      else if (/\b(semi[- ]?bold|demi[- ]?bold)\b/.test(text))
+        weight = 600;
+      else if (/\bbold\b/.test(text))
+        weight = 700;
+      else if (/\b(extra[- ]?bold|ultra[- ]?bold)\b/.test(text))
+        weight = 800;
+      else if (/\b(black|heavy)\b/.test(text))
+        weight = 900;
+      return {
+        bold: /\b(bold|semi[- ]?bold|demi[- ]?bold|extra[- ]?bold|black|heavy)\b/.test(text),
+        italic: /\b(italic|oblique)\b/.test(text),
+        regular: /\b(regular|book|roman|normal)\b/.test(text),
+        weight
+      };
+    };
+    const sourceHint = detectStyleHint(`${label} ${normalizedMatchers.join(" ")}`);
     const queryPermission = nav.permissions?.query;
     if (queryPermission) {
       try {
@@ -53323,13 +53501,49 @@ function createResttyApp(options) {
     }
     try {
       const fonts = await queryLocalFonts();
-      const match = fonts.find((font) => {
+      const matches = fonts.filter((font) => {
         const name = `${font.family ?? ""} ${font.fullName ?? ""} ${font.postscriptName ?? ""}`.toLowerCase();
         return normalizedMatchers.some((matcher) => name.includes(matcher));
       });
-      if (match) {
+      if (matches.length) {
+        const scoreMatch = (font) => {
+          const name = `${font.family ?? ""} ${font.fullName ?? ""} ${font.postscriptName ?? ""}`.toLowerCase();
+          const hint = detectStyleHint(name);
+          let score = 0;
+          for (let i3 = 0;i3 < normalizedMatchers.length; i3 += 1) {
+            if (name.includes(normalizedMatchers[i3]))
+              score += 8;
+          }
+          if (sourceHint.bold || sourceHint.italic) {
+            score += sourceHint.bold === hint.bold ? 40 : -40;
+            score += sourceHint.italic === hint.italic ? 40 : -40;
+          } else {
+            score += !hint.bold && !hint.italic ? 60 : -30;
+          }
+          const targetWeight = sourceHint.bold ? 700 : 400;
+          score -= Math.abs((hint.weight ?? 400) - targetWeight) * 0.25;
+          if (!sourceHint.bold && hint.weight === 400)
+            score += 12;
+          if (!sourceHint.bold && hint.weight < 350)
+            score -= 12;
+          if (!sourceHint.bold && hint.weight > 650)
+            score -= 8;
+          if (sourceHint.regular && !hint.bold && !hint.italic)
+            score += 20;
+          return score;
+        };
+        let match = matches[0];
+        let bestScore = Number.NEGATIVE_INFINITY;
+        for (let i3 = 0;i3 < matches.length; i3 += 1) {
+          const candidate = matches[i3];
+          const candidateScore = scoreMatch(candidate);
+          if (candidateScore > bestScore) {
+            bestScore = candidateScore;
+            match = candidate;
+          }
+        }
         const matchedName = `${match.family ?? ""} ${match.fullName ?? ""} ${match.postscriptName ?? ""}`.trim();
-        console.log(`[font] local matched (${label}): ${matchedName || "unnamed"}`);
+        console.log(`[font] local matched (${label}): ${matchedName || "unnamed"} score=${bestScore}`);
         const blob = await match.blob();
         return blob.arrayBuffer();
       }
@@ -53536,6 +53750,51 @@ function createResttyApp(options) {
       return true;
     return false;
   }
+  function isVariationSelectorCodepoint2(cp) {
+    if (cp >= 65024 && cp <= 65039)
+      return true;
+    if (cp >= 917760 && cp <= 917999)
+      return true;
+    return false;
+  }
+  function isCombiningMarkCodepoint2(cp) {
+    if (cp >= 768 && cp <= 879)
+      return true;
+    if (cp >= 6832 && cp <= 6911)
+      return true;
+    if (cp >= 7616 && cp <= 7679)
+      return true;
+    if (cp >= 8400 && cp <= 8447)
+      return true;
+    if (cp >= 65056 && cp <= 65071)
+      return true;
+    return false;
+  }
+  function isEmojiModifierCodepoint(cp) {
+    return cp >= 127995 && cp <= 127999;
+  }
+  function isCoverageIgnorableCodepoint2(cp) {
+    if (cp === 8204 || cp === 8205)
+      return true;
+    if (isVariationSelectorCodepoint2(cp))
+      return true;
+    if (isCombiningMarkCodepoint2(cp))
+      return true;
+    if (cp >= 917536 && cp <= 917631)
+      return true;
+    return false;
+  }
+  function shouldMergeTrailingClusterCodepoint(cp) {
+    if (cp === 8204 || cp === 8205)
+      return true;
+    if (isVariationSelectorCodepoint2(cp))
+      return true;
+    if (isCombiningMarkCodepoint2(cp))
+      return true;
+    if (isEmojiModifierCodepoint(cp))
+      return true;
+    return false;
+  }
   function resolvePresentationPreference2(text, chars) {
     if (text.includes("️"))
       return "emoji";
@@ -53550,18 +53809,33 @@ function createResttyApp(options) {
     }
     return "auto";
   }
-  function pickFontIndexForText2(text, expectedSpan = 1) {
+  function pickFontIndexForText2(text, expectedSpan = 1, stylePreference = "regular") {
     if (!fontState.fonts.length)
       return 0;
-    const cacheKey = `${expectedSpan}:${text}`;
+    const cacheKey = `${expectedSpan}:${stylePreference}:${text}`;
     const cached = fontState.fontPickCache.get(cacheKey);
     if (cached !== undefined)
       return cached;
     const chars = Array.from(text);
+    const requiredChars = chars.filter((ch) => {
+      const cp = ch.codePointAt(0) ?? 0;
+      return !isCoverageIgnorableCodepoint2(cp);
+    });
     const firstCp = text.codePointAt(0) ?? 0;
     const nerdSymbol = isNerdSymbolCodepoint(firstCp);
     const presentation = resolvePresentationPreference2(text, chars);
-    const pickFirstMatch = (predicate) => {
+    const styleHintsEnabled = stylePreference !== "regular" && presentation !== "emoji" && !nerdSymbol;
+    const hasBoldHint = (entry) => /\bbold\b/i.test(entry.label ?? "");
+    const hasItalicHint = (entry) => /\b(italic|oblique)\b/i.test(entry.label ?? "");
+    const stylePredicates = stylePreference === "bold_italic" ? [
+      (entry) => hasBoldHint(entry) && hasItalicHint(entry),
+      (entry) => hasBoldHint(entry),
+      (entry) => hasItalicHint(entry)
+    ] : stylePreference === "bold" ? [(entry) => hasBoldHint(entry) && !hasItalicHint(entry), (entry) => hasBoldHint(entry)] : stylePreference === "italic" ? [
+      (entry) => hasItalicHint(entry) && !hasBoldHint(entry),
+      (entry) => hasItalicHint(entry)
+    ] : [];
+    const pickFirstMatch = (predicate, allowSequenceShapingFallback = false) => {
       for (let i3 = 0;i3 < fontState.fonts.length; i3 += 1) {
         const entry = fontState.fonts[i3];
         if (!entry?.font)
@@ -53569,17 +53843,36 @@ function createResttyApp(options) {
         if (predicate && !predicate(entry))
           continue;
         let ok = true;
-        for (const ch of chars) {
+        for (const ch of requiredChars) {
           if (!fontHasGlyph2(entry.font, ch)) {
             ok = false;
             break;
           }
         }
+        if (!ok && allowSequenceShapingFallback) {
+          const shaped = shapeClusterWithFont(entry, text);
+          ok = shaped.glyphs.some((glyph) => (glyph.glyphId ?? 0) !== 0);
+        }
         if (ok)
           return i3;
       }
       return -1;
     };
+    const pickWithStyle = (predicate, allowSequenceShapingFallback = false) => {
+      if (styleHintsEnabled) {
+        for (let i3 = 0;i3 < stylePredicates.length; i3 += 1) {
+          const stylePredicate = stylePredicates[i3];
+          const styledIndex = pickFirstMatch((entry) => {
+            if (!stylePredicate(entry))
+              return false;
+            return predicate ? !!predicate(entry) : true;
+          }, allowSequenceShapingFallback);
+          if (styledIndex >= 0)
+            return styledIndex;
+        }
+      }
+      return pickFirstMatch(predicate, allowSequenceShapingFallback);
+    };
     const tryIndex = (index) => {
       if (index < 0)
         return null;
@@ -53587,13 +53880,13 @@ function createResttyApp(options) {
       return index;
     };
     if (nerdSymbol) {
-      const symbolIndex = pickFirstMatch((entry) => isNerdSymbolFont(entry) || isSymbolFont(entry));
+      const symbolIndex = pickWithStyle((entry) => isNerdSymbolFont(entry) || isSymbolFont(entry));
       const result = tryIndex(symbolIndex);
       if (result !== null)
         return result;
     }
     if (presentation === "emoji") {
-      const emojiIndex = pickFirstMatch((entry) => isColorEmojiFont(entry));
+      const emojiIndex = pickFirstMatch((entry) => isColorEmojiFont(entry), true);
       const result = tryIndex(emojiIndex);
       if (result !== null)
         return result;
@@ -53603,7 +53896,7 @@ function createResttyApp(options) {
       if (result !== null)
         return result;
     }
-    const firstIndex = pickFirstMatch();
+    const firstIndex = pickWithStyle();
     if (firstIndex >= 0) {
       setBoundedMap(fontState.fontPickCache, cacheKey, firstIndex, FONT_PICK_CACHE_LIMIT);
       return firstIndex;
@@ -53611,6 +53904,24 @@ function createResttyApp(options) {
     setBoundedMap(fontState.fontPickCache, cacheKey, 0, FONT_PICK_CACHE_LIMIT);
     return 0;
   }
+  function stylePreferenceFromFlags(bold, italic) {
+    if (bold && italic)
+      return "bold_italic";
+    if (bold)
+      return "bold";
+    if (italic)
+      return "italic";
+    return "regular";
+  }
+  function isAppleSymbolsFont(entry) {
+    return !!entry && /\bapple symbols\b/i.test(entry.label ?? "");
+  }
+  function fontEntryHasBoldStyle(entry) {
+    return !!entry && /\bbold\b/i.test(entry.label ?? "");
+  }
+  function fontEntryHasItalicStyle(entry) {
+    return !!entry && /\b(italic|oblique)\b/i.test(entry.label ?? "");
+  }
   function computeCellMetrics2() {
     const primary = fontState.fonts[0];
     if (!primary)
@@ -54285,10 +54596,13 @@ function createResttyApp(options) {
         }
         let nextSeqIdx = idx + baseSpan;
         let guard = 0;
-        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+        while (nextSeqIdx < rowEnd && guard < 12) {
           const next = readCellCluster(nextSeqIdx);
           if (!next || !next.cp || isSpaceCp(next.cp))
             break;
+          const shouldMerge = text.endsWith("‍") || shouldMergeTrailingClusterCodepoint(next.cp);
+          if (!shouldMerge)
+            break;
           text += next.text;
           baseSpan += next.span;
           mergedEmojiSkip[nextSeqIdx] = 1;
@@ -54319,7 +54633,7 @@ function createResttyApp(options) {
         }
         if (extra > 0 && text.trim() === "")
           continue;
-        const fontIndex = pickFontIndexForText2(text, baseSpan);
+        const fontIndex = pickFontIndexForText2(text, baseSpan, stylePreferenceFromFlags(bold, italic));
         const fontEntry = fontState.fonts[fontIndex] ?? fontState.fonts[0];
         const shaped = shapeClusterWithFont(fontEntry, text);
         if (!shaped.glyphs.length)
@@ -54588,7 +54902,8 @@ function createResttyApp(options) {
             let y = item.baseY + baselineAdjust - metrics.bearingY * bitmapScale - glyph.yOffset * itemScale;
             if (!glyphConstrained && symbolLike && item.cp) {
               const nerdConstraint = resolveSymbolConstraint(item.cp);
-              const constraint = nerdConstraint ?? (colorGlyph ? DEFAULT_EMOJI_CONSTRAINT : DEFAULT_SYMBOL_CONSTRAINT);
+              const defaultConstraint = isAppleSymbolsFont(entry) ? DEFAULT_APPLE_SYMBOLS_CONSTRAINT : DEFAULT_SYMBOL_CONSTRAINT;
+              const constraint = nerdConstraint ?? (colorGlyph ? DEFAULT_EMOJI_CONSTRAINT : defaultConstraint);
               const rowY = item.baseY - yPad - baselineOffset;
               const constraintWidth = Math.max(1, item.constraintWidth ?? Math.round(maxWidth / cellW));
               const adjusted = constrainGlyphBox({
@@ -54625,17 +54940,24 @@ function createResttyApp(options) {
             const glyphData = useNearest ? glyphDataNearest : glyphDataLinear;
             const italic = !!item.italic;
             const bold = !!item.bold;
-            const slant = italic && !colorGlyph ? gh * ITALIC_SLANT : 0;
-            const boldOffset = bold && !colorGlyph ? Math.max(1, Math.round(gw * BOLD_OFFSET)) : 0;
+            const syntheticItalic = italic && !fontEntryHasItalicStyle(entry);
+            const syntheticBold = bold && !fontEntryHasBoldStyle(entry);
+            const slant = syntheticItalic && !colorGlyph ? gh * ITALIC_SLANT : 0;
+            const boldOffset = syntheticBold && !colorGlyph ? Math.max(1, Math.round(gw * BOLD_OFFSET)) : 0;
             const renderMode = colorGlyph ? GLYPH_RENDER_MODE_COLOR : GLYPH_RENDER_MODE_MONO;
             const pushGlyph = (xPos) => {
               glyphData.push(xPos, py, gw, gh, u02, v02, u12, v12, item.fg[0], item.fg[1], item.fg[2], item.fg[3], bg[0], bg[1], bg[2], bg[3], slant, renderMode);
             };
             pushGlyph(px);
             if (boldOffset > 0) {
-              const maxX2 = item.x + maxWidth;
-              const bx = Math.min(px + boldOffset, Math.round(maxX2 - gw));
-              if (bx !== px)
+              const minGlyphX = Math.round(item.x);
+              const maxGlyphX = Math.round(item.x + maxWidth - gw);
+              let bx = clamp(px + boldOffset, minGlyphX, maxGlyphX);
+              if (bx === px)
+                bx = clamp(px - boldOffset, minGlyphX, maxGlyphX);
+              if (bx === px)
+                pushGlyph(px);
+              else
                 pushGlyph(bx);
             }
             penX += glyph.xAdvance;
@@ -55143,10 +55465,13 @@ function createResttyApp(options) {
         }
         let nextSeqIdx = idx + baseSpan;
         let guard = 0;
-        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+        while (nextSeqIdx < rowEnd && guard < 12) {
           const next = readCellCluster(nextSeqIdx);
           if (!next || !next.cp || isSpaceCp(next.cp))
             break;
+          const shouldMerge = text.endsWith("‍") || shouldMergeTrailingClusterCodepoint(next.cp);
+          if (!shouldMerge)
+            break;
           text += next.text;
           baseSpan += next.span;
           mergedEmojiSkip[nextSeqIdx] = 1;
@@ -55177,7 +55502,7 @@ function createResttyApp(options) {
         }
         if (extra > 0 && text.trim() === "")
           continue;
-        const fontIndex = pickFontIndexForText2(text, baseSpan);
+        const fontIndex = pickFontIndexForText2(text, baseSpan, stylePreferenceFromFlags(bold, italic));
         const fontEntry = fontState.fonts[fontIndex] ?? fontState.fonts[0];
         const shaped = shapeClusterWithFont(fontEntry, text);
         if (!shaped.glyphs.length)
@@ -55547,7 +55872,8 @@ function createResttyApp(options) {
             let y = item.baseY + baselineAdjust - metrics.bearingY * bitmapScale - glyph.yOffset * itemScale;
             if (!glyphConstrained && symbolLike && item.cp) {
               const nerdConstraint = resolveSymbolConstraint(item.cp);
-              const constraint = nerdConstraint ?? (colorGlyph ? DEFAULT_EMOJI_CONSTRAINT : DEFAULT_SYMBOL_CONSTRAINT);
+              const defaultConstraint = isAppleSymbolsFont(entry) ? DEFAULT_APPLE_SYMBOLS_CONSTRAINT : DEFAULT_SYMBOL_CONSTRAINT;
+              const constraint = nerdConstraint ?? (colorGlyph ? DEFAULT_EMOJI_CONSTRAINT : defaultConstraint);
               const rowY = item.baseY - yPad - baselineOffset;
               const constraintWidth = Math.max(1, item.constraintWidth ?? Math.round(maxWidth / cellW));
               const adjusted = constrainGlyphBox({
@@ -55576,17 +55902,24 @@ function createResttyApp(options) {
             const v12 = (metrics.atlasY + metrics.height - insetY) / atlasH;
             const italic = !!item.italic;
             const bold = !!item.bold;
-            const slant = italic && !colorGlyph ? gh * ITALIC_SLANT : 0;
-            const boldOffset = bold && !colorGlyph ? Math.max(1, Math.round(gw * BOLD_OFFSET)) : 0;
+            const syntheticItalic = italic && !fontEntryHasItalicStyle(entry);
+            const syntheticBold = bold && !fontEntryHasBoldStyle(entry);
+            const slant = syntheticItalic && !colorGlyph ? gh * ITALIC_SLANT : 0;
+            const boldOffset = syntheticBold && !colorGlyph ? Math.max(1, Math.round(gw * BOLD_OFFSET)) : 0;
             const renderMode = colorGlyph ? GLYPH_RENDER_MODE_COLOR : GLYPH_RENDER_MODE_MONO;
             const pushGlyph = (xPos) => {
               glyphData.push(xPos, py, gw, gh, u02, v02, u12, v12, item.fg[0], item.fg[1], item.fg[2], item.fg[3], bg[0], bg[1], bg[2], bg[3], slant, renderMode);
             };
             pushGlyph(px);
             if (boldOffset > 0) {
-              const maxX2 = item.x + maxWidth;
-              const bx = Math.min(px + boldOffset, Math.round(maxX2 - gw));
-              if (bx !== px)
+              const minGlyphX = Math.round(item.x);
+              const maxGlyphX = Math.round(item.x + maxWidth - gw);
+              let bx = clamp(px + boldOffset, minGlyphX, maxGlyphX);
+              if (bx === px)
+                bx = clamp(px - boldOffset, minGlyphX, maxGlyphX);
+              if (bx === px)
+                pushGlyph(px);
+              else
                 pushGlyph(bx);
             }
             penX += glyph.xAdvance;

package/dist/fonts/manager.d.ts

@@ -27,7 +27,7 @@ export declare function glyphWidthUnits(entry: FontEntry, glyphId: number | unde
  * Select the best font index from the manager's font list for rendering the
  * given text cluster, searching in fallback order similar to Ghostty.
  */
-export declare function pickFontIndexForText(state: FontManagerState, text: string, expectedSpan: number, shapeClusterWithFont: (entry: FontEntry, text: string) => ShapedCluster): number;
+export declare function pickFontIndexForText(state: FontManagerState, text: string, expectedSpan: number): number;
 /** Fetch a font file from a URL and return its ArrayBuffer, or null on failure. */
 export declare function tryFetchFontBuffer(url: string): Promise<ArrayBuffer | null>;
 /** Query locally installed fonts via the Local Font Access API and return the first match, or null. */

package/dist/internal.js

@@ -89,7 +89,7 @@ import {
   updateComposition,
   updateGridState,
   updateImePosition
-} from "./chunk-53vdvhe3.js";
+} from "./chunk-ym658zhj.js";
 // src/selection/selection.ts
 function createSelectionState() {
   return {

package/dist/restty.js

@@ -7,7 +7,7 @@ import {
   isBuiltinThemeName,
   listBuiltinThemeNames,
   parseGhosttyTheme
-} from "./chunk-53vdvhe3.js";
+} from "./chunk-ym658zhj.js";
 export {
   parseGhosttyTheme,
   listBuiltinThemeNames,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "restty",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Browser terminal rendering library powered by WASM, WebGPU/WebGL2, and TypeScript text shaping.",
   "keywords": [
     "terminal",