konevsa/typst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix underline bug. (#1567)

Browse Source
This commit is contained in:
Andy Barcia Rodríguez 2023-06-26 13:41:51 +02:00 committed by GitHub
parent 33803b1614
commit 5ee41e57e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/src/text/deco.rs
View File

@ -292,7 +292,7 @@ pub(super) fn decorate(
let gap_padding = 0.08 * text.size;
let min_width = 0.162 * text.size;
let mut start = pos.x - deco.extent;
let start = pos.x - deco.extent;
let end = pos.x + (width + 2.0 * deco.extent);
let mut push_segment = |from: Abs, to: Abs| {
@ -346,29 +346,23 @@ pub(super) fn decorate(
}
}
// Add start and end points, taking padding into account.
intersections.push(start - gap_padding);
intersections.push(end + gap_padding);
// When emitting the decorative line segments, we move from left to
// right. The intersections are not necessarily in this order, yet.
intersections.sort();
for gap in intersections.chunks_exact(2) {
let l = gap[0] - gap_padding;
let r = gap[1] + gap_padding;
for edge in intersections.windows(2) {
let l = edge[0];
let r = edge[1];
if start >= end {
break;
}
if start >= l {
start = r;
// If we are too close, don't draw the segment
if r - l < gap_padding {
continue;
} else {
push_segment(l + gap_padding, r - gap_padding);
}
push_segment(start, l);
start = r;
}
if start < end {
push_segment(start, end);
}
}