Skip to content

Collapse white space across style span and inline box boundaries #25

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

Open
nicoburns wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Collapse white space across style span and inline box boundaries #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
765d5c7
Collapse whitespace across span and inline box boundaries
nicoburns Sep 4, 2026
20b9d46
Apply phase-I whitespace rules around preserved segment breaks
nicoburns Sep 4, 2026
fcbdd1b
Avoid a temporary string when collapsing whitespace
nicoburns Sep 4, 2026
61a1049
Rename push_uncommitted_text to commit_uncommitted_text
nicoburns Sep 8, 2026
acad914
Document TreeStyleBuilder methods
nicoburns Sep 8, 2026
7c98a36
Rename pending whitespace and text length methods
nicoburns Sep 8, 2026
e9eafc7
Remove dead code from TreeStyleBuilder
nicoburns Sep 8, 2026
8985384
Attribute collapsed whitespace to the span it started in
nicoburns Sep 8, 2026
ba6037d
Allow wrapping after a collapsed space from a wrappable span
nicoburns Sep 8, 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
12 changes: 5 additions & 7 deletions parley/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use parley_engine::break_overrides::LineBreakOverrideFn;

use crate::InlineBoxKind;
use crate::inline_box::InlineBox;
use crate::resolve::{ResolvedStyle, StyleRun, tree::ItemKind};
use crate::resolve::{ResolvedStyle, StyleRun};

#[derive(Clone, Copy)]
pub(crate) struct BuilderOptions<'a> {
Expand Down Expand Up @@ -256,15 +256,13 @@ impl<'b, B: Brush> TreeBuilder<'b, B> {

pub fn push_inline_box(&mut self, mut inline_box: InlineBox) {
if inline_box.kind == InlineBoxKind::InFlow {
self.lcx.tree_style_builder.push_uncommitted_text(false);
self.lcx.tree_style_builder.set_is_span_first(false);
self.lcx
.tree_style_builder
.set_last_item_kind(ItemKind::InlineBox);
self.lcx.tree_style_builder.commit_uncommitted_text();
self.lcx.tree_style_builder.flush_pending_whitespace();
self.lcx.tree_style_builder.set_last_item_is_inline_box();
}

// TODO: arrange type better here to factor out the index
inline_box.index = self.lcx.tree_style_builder.current_text_len();
inline_box.index = self.lcx.tree_style_builder.committed_text_len();
self.lcx.inline_boxes.push(inline_box);
}

Expand Down
Loading
Loading