Skip to content

Fix font breaks and h-tabs #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhardy merged 2 commits into from
Feb 15, 2026
Merged

Fix font breaks and h-tabs #127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
401c60c
Fix: break text when font changes
dhardy Feb 15, 2026
dbc18f3
Fix: break after h_tab
dhardy Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions src/display/text_runs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,12 @@ impl TextDisplay {
if !last_is_control {
non_control_end = index;
}
let is_control = c.is_control();
let is_htab = c == '\t';
let mut require_break = is_htab;
if is_htab {
eprintln!("\\t at {index}");
}
let mut require_break = last_is_htab;
let is_control = c.is_control();

// Is wrapping allowed at this position?
let is_break = next_break == Some(index);
Expand Down Expand Up @@ -294,15 +297,7 @@ impl TextDisplay {
if let Some(fmt) = next_fmt.as_ref()
&& to_usize(fmt.start) == index
{
font = fmt.font;
dpem = fmt.dpem;
next_fmt = font_tokens.next();
debug_assert!(
next_fmt
.as_ref()
.map(|fmt| to_usize(fmt.start) > index)
.unwrap_or(true)
);
require_break = true;
}

let mut new_script = None;
Expand Down Expand Up @@ -345,15 +340,26 @@ impl TextDisplay {
input.script = script;
breaks = Default::default();
} else if is_break && !is_control {
// We do break runs when hitting control chars, but only when
// encountering the next non-control character.
breaks.push(shaper::GlyphBreak::new(to_u32(index)));
}

if let Some(fmt) = next_fmt.as_ref()
&& to_usize(fmt.start) == index
{
font = fmt.font;
input.dpem = fmt.dpem;
next_fmt = font_tokens.next();
debug_assert!(
next_fmt
.as_ref()
.map(|fmt| to_usize(fmt.start) > index)
.unwrap_or(true)
);
}

last_is_control = is_control;
last_is_htab = is_htab;
emoji_start = new_emoji_start;
input.dpem = dpem;
if let Some(script) = new_script {
input.script = script;
}
Expand Down
Loading