revert the references
This commit is contained in:
parent
fb852d3ab5
commit
71b0680e6f
2 changed files with 27 additions and 35 deletions
24
src/shape.rs
24
src/shape.rs
|
|
@ -141,25 +141,23 @@ fn shape_fallback(
|
|||
assert_eq!(rtl, span_rtl);
|
||||
|
||||
let attrs = attrs_list.get_span(start_run);
|
||||
let mut rb_features = Vec::new();
|
||||
let mut rb_font_features = Vec::new();
|
||||
|
||||
// Convert attrs::Feature to rustybuzz::Feature
|
||||
if let Some(font_features) = attrs.font_features {
|
||||
for feature in font_features.features {
|
||||
rb_features.push(rustybuzz::Feature::new(
|
||||
rustybuzz::ttf_parser::Tag::from_bytes(&feature.tag.as_bytes()),
|
||||
feature.value,
|
||||
0..usize::MAX,
|
||||
));
|
||||
}
|
||||
};
|
||||
for feature in attrs.font_features.features {
|
||||
rb_font_features.push(rustybuzz::Feature::new(
|
||||
rustybuzz::ttf_parser::Tag::from_bytes(&feature.tag.as_bytes()),
|
||||
feature.value,
|
||||
0..usize::MAX,
|
||||
));
|
||||
}
|
||||
|
||||
let shape_plan = rustybuzz::ShapePlan::new(
|
||||
font.rustybuzz(),
|
||||
buffer.direction(),
|
||||
Some(buffer.script()),
|
||||
buffer.language().as_ref(),
|
||||
&rb_features,
|
||||
&rb_font_features,
|
||||
);
|
||||
let glyph_buffer = rustybuzz::shape_with_plan(font.rustybuzz(), &shape_plan, buffer);
|
||||
let glyph_infos = glyph_buffer.glyph_infos();
|
||||
|
|
@ -262,7 +260,7 @@ fn shape_run(
|
|||
|
||||
let attrs = attrs_list.get_span(start_run);
|
||||
|
||||
let fonts = font_system.get_font_matches(&attrs);
|
||||
let fonts = font_system.get_font_matches(attrs);
|
||||
|
||||
let default_families = [&attrs.family];
|
||||
let mut font_iter = FontFallbackIter::new(
|
||||
|
|
@ -445,7 +443,7 @@ fn shape_skip(
|
|||
end_run: usize,
|
||||
) {
|
||||
let attrs = attrs_list.get_span(start_run);
|
||||
let fonts = font_system.get_font_matches(&attrs);
|
||||
let fonts = font_system.get_font_matches(attrs);
|
||||
|
||||
let default_families = [&attrs.family];
|
||||
let mut font_iter = FontFallbackIter::new(font_system, &fonts, &default_families, &[], "");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue