Draw an emoji-presentation character from the color face #31

Merged

natsukium merged 1 commit from fix/emoji-presentation-face into main 2026-10-06 13:48:59 +09:00

Conversation 1 Commits 1 Files changed 9 +375 -42

natsukium commented 2026-10-06 11:42:36 +09:00

Owner

Copy link

Closes #14.

A character whose default presentation is emoji (Emoji_Presentation=Yes, such as ⭐ ⚡ ☕ ⌚ 🀄) now takes the first color face covering it, the primary included, instead of the first face of any kind. Before, the symbol faces that precede the emoji face in the fallback chain drew these characters small and monochrome in their two-cell footprint. kitty's font_for_cell makes the same choice.

• crates/felis-shaping/src/presentation.rs: the Emoji_Presentation table (Unicode 17.0.0 emoji-data.txt), tested against unicode-width and against representative inclusions and exclusions.
• FontStack::resolve / resolve_styled_index consult the property, so the char path and the cluster path agree. An explicit font.fallback list keeps its declared order for every other character.
• Shaper::shape_cluster: a VS15 directly after the base (⭐︎, 🀄︎) keeps the base on the first covering face. Otherwise the existing rules apply: the ZWJ/modifier anchor first, then VS16.
• Text-presentation characters (⏸ ✳ ❤ ☺) and VS16/ZWJ sequences are unchanged.

Before / after (offscreen render with Moralerspace Neon HW):

Closes #14. A character whose default presentation is emoji (`Emoji_Presentation=Yes`, such as ⭐ ⚡ ☕ ⌚ 🀄) now takes the first color face covering it, the primary included, instead of the first face of any kind. Before, the symbol faces that precede the emoji face in the fallback chain drew these characters small and monochrome in their two-cell footprint. kitty's `font_for_cell` makes the same choice. - `crates/felis-shaping/src/presentation.rs`: the `Emoji_Presentation` table (Unicode 17.0.0 `emoji-data.txt`), tested against unicode-width and against representative inclusions and exclusions. - `FontStack::resolve` / `resolve_styled_index` consult the property, so the char path and the cluster path agree. An explicit `font.fallback` list keeps its declared order for every other character. - `Shaper::shape_cluster`: a VS15 directly after the base (`⭐︎`, `🀄︎`) keeps the base on the first covering face. Otherwise the existing rules apply: the ZWJ/modifier anchor first, then VS16. - Text-presentation characters (⏸ ✳ ❤ ☺) and VS16/ZWJ sequences are unchanged. Before / after (offscreen render with Moralerspace Neon HW): 

compare14.png

41 KiB

natsukium added 1 commit 2026-10-06 11:42:36 +09:00

shaping: draw an emoji-presentation character from the color face ... 05486a1249

The fallback chain puts the symbol faces before the emoji face so that a
text-presentation symbol such as ⏸ or ✳ resolves mono. A character whose
default presentation is emoji (⭐, ⚡, ☕, ⌚, 🀄) went through the same
first-coverage walk, so wherever a symbol face also covered it, it was
drawn as a small monochrome glyph in its two cells instead of the emoji
the application printed.

Such a character now takes the first color face that covers it, the
primary and any explicit `font.fallback` order notwithstanding, and
falls back to first coverage only when no color face covers it. This is
what kitty's font_for_cell does. A VS15 after it asks for text, so the
cluster path resolves that base by first coverage again.

The default presentation is a property of the scalar alone, so it is
decided in single-codepoint resolution, from an Emoji_Presentation table
generated from Unicode 17.0.0 emoji-data.txt, the version unicode-width
encodes; a test checks that every scalar in it but a lone regional
indicator is wide.

Rejected: keep first coverage and center the glyph. It fixes the
alignment but leaves the emoji monochrome, and makes color depend on
which symbol fonts a host has installed.

Assisted-by: Claude Code

natsukium force-pushed fix/emoji-presentation-face from 05486a1249 to c3ed6b0e4d 2026-10-06 13:10:59 +09:00 Compare

natsukium commented 2026-10-06 13:48:59 +09:00

Author

Owner

Copy link

The Criterion gate failure is unrelated to this change: the benched crate (felis-client-core) does not depend on felis-shaping, the only crate the change touches besides felis-render-wgpu tests. The two runs flagged different benches (daemon_side/shell_prompt +64%, then multi_cycle_end_to_end/plaintext_scroll_individual +15.3%), both while the shared runner host was loaded. All other checks pass.

The Criterion gate failure is unrelated to this change: the benched crate (felis-client-core) does not depend on felis-shaping, the only crate the change touches besides felis-render-wgpu tests. The two runs flagged different benches (daemon_side/shell_prompt +64%, then multi_cycle_end_to_end/plaintext_scroll_individual +15.3%), both while the shared runner host was loaded. All other checks pass.

natsukium merged commit e4a4241efc into main 2026-10-06 13:48:59 +09:00

natsukium deleted branch fix/emoji-presentation-face 2026-10-06 13:48:59 +09:00

natsukium referenced this pull request from a commit 2026-10-06 13:49:01 +09:00

Merge pull request 'Draw an emoji-presentation character from the color face' (#31) from fix/emoji-presentation-face into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Area/ci

CI workflows (.forgejo/workflows/)

  

Area/cli

felis-cli crate, the felis front-door binary

  

Area/client

felis-client crate, the winit GUI frontend

  

Area/client-core

felis-client-core crate, shadow screen, config, connect_or_spawn_daemon

  

Area/daemon

felis-daemon crate, session pool, IPC server

  

Area/deps

Dependency bumps

  

Area/docs

Documentation tree when no narrower area fits

  

Area/grid

felis-grid crate, cells, scrollback, image store

  

Area/manual

User-facing docs: tutorials, how-to, user-facing reference pages

  

Area/nix

Nix flake, home-manager module, package definitions

  

Area/protocol

felis-protocol crate, felis.proto, frame layout, version constants

  

Area/pty

felis-pty crate, PTY backends

  

Area/render

felis-render-wgpu crate, GPU pipeline, atlas

  

Area/shaping

felis-shaping crate, swash shaper, font fallback

  

Area/skills

Agent skills (skills/felis, .agents/skills/)

  

Area/transport

felis-transport crate, framing, socket/pipe, SSH carrier

  

Area/vt

felis-vt crate, VT parser, dispatch

  

Compat/Breaking

Breaking change that won't be backward compatible

  

Kind/Bug

Something is not working

  

Kind/Documentation

Documentation changes

  

Kind/Enhancement

Improve existing functionality

  

Kind/Feature

New functionality

  

Kind/Performance

Throughput, latency, or memory cost

  

Kind/Security

This is security issue

  

Kind/Testing

Issue or pull request related to testing

  

perf-regression-accepted

Passes the instruction-count bench gate for an intended cost; state why in a PR comment

  

Reviewed

Confirmed

Issue has been confirmed

  

Reviewed

Duplicate

This issue or pull request already exists

  

Reviewed

Invalid

Invalid issue

  

Reviewed

Won't Fix

This issue won't be fixed

  

Status

Blocked

Something is blocking this issue or pull request

  

Status

Need More Info

Feedback is required to reproduce issue or to continue work

  

Status

Upstream

Waiting on a change in an upstream project

No labels

Area/ci

Area/cli

Area/client

Area/client-core

Area/daemon

Area/deps

Area/docs

Area/grid

Area/manual

Area/nix

Area/protocol

Area/pty

Area/render

Area/shaping

Area/skills

Area/transport

Area/vt

Compat/Breaking

Kind/Bug

Kind/Documentation

Kind/Enhancement

Kind/Feature

Kind/Performance

Kind/Security

Kind/Testing

perf-regression-accepted

Reviewed

Confirmed

Reviewed

Duplicate

Reviewed

Invalid

Reviewed

Won't Fix

Status

Blocked

Status

Need More Info

Status

Upstream

Milestone

Clear milestone

No items

No milestone

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

felis-terminal/felis!31

No description provided.