caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-15 17:45:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix shaping debug assertions

Browse Source
This commit is contained in:
Laurenz 2023-06-26 18:07:03 +02:00
parent 9eb350d7de
commit f4b764e122
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
library/src/text/shaping.rs
View File

@ -396,11 +396,8 @@ impl<'a> ShapedText<'a> {
) -> ShapedText<'a> { ) -> ShapedText<'a> {
let text = &self.text[text_range.start - self.base..text_range.end - self.base]; let text = &self.text[text_range.start - self.base..text_range.end - self.base];
if let Some(glyphs) = self.slice_safe_to_break(text_range.clone()) { if let Some(glyphs) = self.slice_safe_to_break(text_range.clone()) {
debug_assert!( #[cfg(debug_assertions)]
all_glyphs_in_range(glyphs, &text_range), assert_all_glyphs_in_range(glyphs, text, text_range.clone());
"one or more glyphs in {:?} fell out of range",
text
);
Self { Self {
base: text_range.start, base: text_range.start,
text, text,
@ -572,11 +569,8 @@ pub fn shape<'a>(
track_and_space(&mut ctx); track_and_space(&mut ctx);
calculate_adjustability(&mut ctx, lang, region); calculate_adjustability(&mut ctx, lang, region);
debug_assert!( #[cfg(debug_assertions)]
all_glyphs_in_range(&ctx.glyphs, &(base..(base + text.len()))), assert_all_glyphs_in_range(&ctx.glyphs, text, base..(base + text.len()));
"one or more glyphs in {:?} fell out of range",
text
);
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
assert_glyph_ranges_in_order(&ctx.glyphs, dir); assert_glyph_ranges_in_order(&ctx.glyphs, dir);
@ -945,18 +939,25 @@ fn language(styles: StyleChain) -> rustybuzz::Language {
/// Returns true if all glyphs in `glyphs` have ranges within the range `range`. /// Returns true if all glyphs in `glyphs` have ranges within the range `range`.
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
fn all_glyphs_in_range(glyphs: &[ShapedGlyph], range: &Range<usize>) -> bool { fn assert_all_glyphs_in_range(glyphs: &[ShapedGlyph], text: &str, range: Range<usize>) {
glyphs if glyphs
.iter() .iter()
.all(|g| g.range.start >= range.start && g.range.end <= range.end) .any(|g| g.range.start < range.start || g.range.end > range.end)
{
panic!("one or more glyphs in {text:?} fell out of range");
}
} }
/// Asserts that the ranges of `glyphs` is in the proper order according to `dir`. /// Asserts that the ranges of `glyphs` is in the proper order according to `dir`.
/// ///
/// This asserts instead of returning a bool in order to provide a more informative message when the invariant is violated. /// This asserts instead of returning a bool in order to provide a more informative message when the invariant is violated.
#[cfg(debug_assertions)]
fn assert_glyph_ranges_in_order(glyphs: &[ShapedGlyph], dir: Dir) { fn assert_glyph_ranges_in_order(glyphs: &[ShapedGlyph], dir: Dir) {
if glyphs.is_empty() {
return;
}
// Iterator::is_sorted and friends are unstable as of Rust 1.70.0 // Iterator::is_sorted and friends are unstable as of Rust 1.70.0
if !glyphs.is_empty() {
for i in 0..(glyphs.len() - 1) { for i in 0..(glyphs.len() - 1) {
let a = &glyphs[i]; let a = &glyphs[i];
let b = &glyphs[i + 1]; let b = &glyphs[i + 1];
@ -964,10 +965,11 @@ fn assert_glyph_ranges_in_order(glyphs: &[ShapedGlyph], dir: Dir) {
let ord = if dir.is_positive() { ord } else { ord.reverse() }; let ord = if dir.is_positive() { ord } else { ord.reverse() };
if ord == Ordering::Greater { if ord == Ordering::Greater {
panic!( panic!(
"glyph ranges should be monotonically {}, but found glyphs out of order:\n\nfirst: {a:#?}\nsecond: {b:#?}", "glyph ranges should be monotonically {}, \
if dir.is_positive() { "increasing" } else { "decreasing" } but found glyphs out of order:\n\n\
first: {a:#?}\nsecond: {b:#?}",
if dir.is_positive() { "increasing" } else { "decreasing" },
); );
} }
} }
}
} }