summaryrefslogtreecommitdiff
path: root/library/src/text
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2023-03-17 11:32:15 +0100
committerLaurenz <laurmaedje@gmail.com>2023-03-17 11:45:57 +0100
commit312197b276748e1a17258ad21837850f582a467c (patch)
tree3fd0c078a2673a98b74bc12b4d654a4c143b4e1f /library/src/text
parente8435df5ec718e8ecc8a2ad48e4eb3ddd1f92a72 (diff)
Counters
Diffstat (limited to 'library/src/text')
-rw-r--r--library/src/text/shaping.rs8
-rw-r--r--library/src/text/shift.rs2
2 files changed, 5 insertions, 5 deletions
diff --git a/library/src/text/shaping.rs b/library/src/text/shaping.rs
index 53e90bc5..244e7afe 100644
--- a/library/src/text/shaping.rs
+++ b/library/src/text/shaping.rs
@@ -136,7 +136,7 @@ impl<'a> ShapedText<'a> {
}
// Apply metadata.
- frame.meta(self.styles);
+ frame.meta(self.styles, false);
frame
}
@@ -159,7 +159,7 @@ impl<'a> ShapedText<'a> {
if self.glyphs.is_empty() {
// When there are no glyphs, we just use the vertical metrics of the
// first available font.
- let world = vt.world();
+ let world = vt.world;
for family in families(self.styles) {
if let Some(font) = world
.book()
@@ -228,7 +228,7 @@ impl<'a> ShapedText<'a> {
/// Push a hyphen to end of the text.
pub fn push_hyphen(&mut self, vt: &Vt) {
families(self.styles).find_map(|family| {
- let world = vt.world();
+ let world = vt.world;
let font = world
.book()
.select(family.as_str(), self.variant)
@@ -389,7 +389,7 @@ fn shape_segment<'a>(
}
// Find the next available family.
- let world = ctx.vt.world();
+ let world = ctx.vt.world;
let book = world.book();
let mut selection = families.find_map(|family| {
book.select(family.as_str(), ctx.variant)
diff --git a/library/src/text/shift.rs b/library/src/text/shift.rs
index 20cfaa49..74bb70c7 100644
--- a/library/src/text/shift.rs
+++ b/library/src/text/shift.rs
@@ -151,7 +151,7 @@ fn search_text(content: &Content, sub: bool) -> Option<EcoString> {
/// Checks whether the first retrievable family contains all code points of the
/// given string.
fn is_shapable(vt: &Vt, text: &str, styles: StyleChain) -> bool {
- let world = vt.world();
+ let world = vt.world;
for family in TextNode::font_in(styles) {
if let Some(font) = world
.book()