caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-08-24 19:54:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename text field to item

Browse Source
This commit is contained in:
mkorje 2025-06-10 20:47:04 +10:00
parent 804e8e209f
commit 69392173eb
No known key found for this signature in database
3 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/typst-layout/src/math/accent.rs
View File

@ -47,7 +47,7 @@ pub fn layout_accent(
// Forcing the accent to be at least as large as the base makes it too wide // Forcing the accent to be at least as large as the base makes it too wide
// in many cases. // in many cases.
let width = elem.size(styles).relative_to(base.width()); let width = elem.size(styles).relative_to(base.width());
let short_fall = ACCENT_SHORT_FALL.at(glyph.text.size); let short_fall = ACCENT_SHORT_FALL.at(glyph.item.size);
glyph.stretch_horizontal(ctx, width - short_fall); glyph.stretch_horizontal(ctx, width - short_fall);
let accent_attach = glyph.accent_attach.0; let accent_attach = glyph.accent_attach.0;
let accent = glyph.into_frame(); let accent = glyph.into_frame();

104
crates/typst-layout/src/math/fragment.rs
View File

@ -109,7 +109,7 @@ impl MathFragment {
pub fn font_size(&self) -> Option<Abs> { pub fn font_size(&self) -> Option<Abs> {
match self { match self {
Self::Glyph(glyph) => Some(glyph.text.size), Self::Glyph(glyph) => Some(glyph.item.size),
Self::Frame(fragment) => Some(fragment.font_size), Self::Frame(fragment) => Some(fragment.font_size),
_ => None, _ => None,
} }
@ -199,25 +199,25 @@ impl MathFragment {
// For glyph assemblies we pick either the start or end glyph // For glyph assemblies we pick either the start or end glyph
// depending on the corner. // depending on the corner.
let is_vertical = let is_vertical =
glyph.text.glyphs.iter().any(|glyph| glyph.y_advance != Em::zero()); glyph.item.glyphs.iter().any(|glyph| glyph.y_advance != Em::zero());
let glyph_index = match (is_vertical, corner) { let glyph_index = match (is_vertical, corner) {
(true, Corner::TopLeft | Corner::TopRight) => { (true, Corner::TopLeft | Corner::TopRight) => {
glyph.text.glyphs.len() - 1 glyph.item.glyphs.len() - 1
} }
(false, Corner::TopRight | Corner::BottomRight) => { (false, Corner::TopRight | Corner::BottomRight) => {
glyph.text.glyphs.len() - 1 glyph.item.glyphs.len() - 1
} }
_ => 0, _ => 0,
}; };
kern_at_height( kern_at_height(
&glyph.text.font, &glyph.item.font,
GlyphId(glyph.text.glyphs[glyph_index].id), GlyphId(glyph.item.glyphs[glyph_index].id),
corner, corner,
Em::from_length(height, glyph.text.size), Em::from_length(height, glyph.item.size),
) )
.unwrap_or_default() .unwrap_or_default()
.at(glyph.text.size) .at(glyph.item.size)
} }
_ => Abs::zero(), _ => Abs::zero(),
} }
@ -239,7 +239,7 @@ impl From<FrameFragment> for MathFragment {
#[derive(Clone)] #[derive(Clone)]
pub struct GlyphFragment { pub struct GlyphFragment {
// Text stuff. // Text stuff.
pub text: TextItem, pub item: TextItem,
pub base_id: GlyphId, pub base_id: GlyphId,
// Math stuff. // Math stuff.
pub size: Size, pub size: Size,
@ -313,7 +313,7 @@ impl GlyphFragment {
.or_else(|| default_math_class(c)) .or_else(|| default_math_class(c))
.unwrap_or(MathClass::Normal); .unwrap_or(MathClass::Normal);
let text = TextItem { let item = TextItem {
font: font.clone(), font: font.clone(),
size: TextElem::size_in(styles), size: TextElem::size_in(styles),
fill: TextElem::fill_in(styles).as_decoration(), fill: TextElem::fill_in(styles).as_decoration(),
@ -333,7 +333,7 @@ impl GlyphFragment {
}; };
let mut fragment = Self { let mut fragment = Self {
text, item,
base_id: GlyphId(info.glyph_id as u16), base_id: GlyphId(info.glyph_id as u16),
// Math // Math
math_size: EquationElem::size_in(styles), math_size: EquationElem::size_in(styles),
@ -358,32 +358,32 @@ impl GlyphFragment {
/// Sets element id and boxes in appropriate way without changing other /// Sets element id and boxes in appropriate way without changing other
/// styles. This is used to replace the glyph with a stretch variant. /// styles. This is used to replace the glyph with a stretch variant.
pub fn update_glyph(&mut self) { pub fn update_glyph(&mut self) {
let id = GlyphId(self.text.glyphs[0].id); let id = GlyphId(self.item.glyphs[0].id);
let extended_shape = is_extended_shape(&self.text.font, id); let extended_shape = is_extended_shape(&self.item.font, id);
let italics = italics_correction(&self.text.font, id).unwrap_or_default(); let italics = italics_correction(&self.item.font, id).unwrap_or_default();
let width = self.text.width(); let width = self.item.width();
if !extended_shape { if !extended_shape {
self.text.glyphs[0].x_advance += italics; self.item.glyphs[0].x_advance += italics;
} }
let italics = italics.at(self.text.size); let italics = italics.at(self.item.size);
let (ascent, descent) = let (ascent, descent) =
ascent_descent(&self.text.font, id).unwrap_or((Em::zero(), Em::zero())); ascent_descent(&self.item.font, id).unwrap_or((Em::zero(), Em::zero()));
// The fallback for accents is half the width plus or minus the italics // The fallback for accents is half the width plus or minus the italics
// correction. This is similar to how top and bottom attachments are // correction. This is similar to how top and bottom attachments are
// shifted. For bottom accents we do not use the accent attach of the // shifted. For bottom accents we do not use the accent attach of the
// base as it is meant for top acccents. // base as it is meant for top acccents.
let top_accent_attach = accent_attach(&self.text.font, id) let top_accent_attach = accent_attach(&self.item.font, id)
.map(|x| x.at(self.text.size)) .map(|x| x.at(self.item.size))
.unwrap_or((width + italics) / 2.0); .unwrap_or((width + italics) / 2.0);
let bottom_accent_attach = (width - italics) / 2.0; let bottom_accent_attach = (width - italics) / 2.0;
self.baseline = Some(ascent.at(self.text.size)); self.baseline = Some(ascent.at(self.item.size));
self.size = Size::new( self.size = Size::new(
self.text.width(), self.item.width(),
ascent.at(self.text.size) + descent.at(self.text.size), ascent.at(self.item.size) + descent.at(self.item.size),
); );
self.italics_correction = italics; self.italics_correction = italics;
self.accent_attach = (top_accent_attach, bottom_accent_attach); self.accent_attach = (top_accent_attach, bottom_accent_attach);
@ -394,10 +394,10 @@ impl GlyphFragment {
// base_id's. This is used to return a glyph to its unstretched state. // base_id's. This is used to return a glyph to its unstretched state.
pub fn reset_glyph(&mut self) { pub fn reset_glyph(&mut self) {
self.align = Abs::zero(); self.align = Abs::zero();
self.text.glyphs = vec![Glyph { self.item.glyphs = vec![Glyph {
id: self.base_id.0, id: self.base_id.0,
x_advance: self.text.font.advance(self.base_id.0).unwrap_or_default(), x_advance: self.item.font.advance(self.base_id.0).unwrap_or_default(),
..self.text.glyphs[0].clone() ..self.item.glyphs[0].clone()
}]; }];
self.update_glyph(); self.update_glyph();
} }
@ -421,7 +421,7 @@ impl GlyphFragment {
frame.set_baseline(self.baseline()); frame.set_baseline(self.baseline());
frame.push( frame.push(
Point::with_y(self.ascent() + self.shift + self.align), Point::with_y(self.ascent() + self.shift + self.align),
FrameItem::Text(self.text), FrameItem::Text(self.item),
); );
frame.modify(&self.modifiers); frame.modify(&self.modifiers);
frame frame
@ -454,8 +454,8 @@ impl GlyphFragment {
return; return;
} }
let id = GlyphId(self.text.glyphs[0].id); let id = GlyphId(self.item.glyphs[0].id);
let font = self.text.font.clone(); let font = self.item.font.clone();
let Some(construction) = glyph_construction(&font, id, axis) else { return }; let Some(construction) = glyph_construction(&font, id, axis) else { return };
// Search for a pre-made variant with a good advance. // Search for a pre-made variant with a good advance.
@ -464,7 +464,7 @@ impl GlyphFragment {
for variant in construction.variants { for variant in construction.variants {
best_id = variant.variant_glyph; best_id = variant.variant_glyph;
best_advance = best_advance =
self.text.font.to_em(variant.advance_measurement).at(self.text.size); self.item.font.to_em(variant.advance_measurement).at(self.item.size);
if target <= best_advance { if target <= best_advance {
break; break;
} }
@ -472,18 +472,18 @@ impl GlyphFragment {
// This is either good or the best we've got. // This is either good or the best we've got.
if target <= best_advance || construction.assembly.is_none() { if target <= best_advance || construction.assembly.is_none() {
self.text.glyphs[0].id = best_id.0; self.item.glyphs[0].id = best_id.0;
self.text.glyphs[0].x_advance = self.item.glyphs[0].x_advance =
self.text.font.advance(best_id.0).unwrap_or_default(); self.item.font.advance(best_id.0).unwrap_or_default();
self.update_glyph(); self.update_glyph();
return; return;
} }
// Assemble from parts. // Assemble from parts.
let assembly = construction.assembly.unwrap(); let assembly = construction.assembly.unwrap();
let min_overlap = min_connector_overlap(&self.text.font) let min_overlap = min_connector_overlap(&self.item.font)
.unwrap_or_default() .unwrap_or_default()
.at(self.text.size); .at(self.item.size);
assemble(ctx, self, assembly, min_overlap, target, axis); assemble(ctx, self, assembly, min_overlap, target, axis);
} }
@ -497,7 +497,7 @@ impl GlyphFragment {
/// to the given alignment on the axis. /// to the given alignment on the axis.
pub fn align_on_axis(&mut self, align: VAlignment) { pub fn align_on_axis(&mut self, align: VAlignment) {
let h = self.size.y; let h = self.size.y;
let axis = axis_height(&self.text.font).unwrap().at(self.text.size); let axis = axis_height(&self.item.font).unwrap().at(self.item.size);
self.align += self.baseline(); self.align += self.baseline();
self.baseline = Some(align.inv().position(h + axis * 2.0)); self.baseline = Some(align.inv().position(h + axis * 2.0));
self.align -= self.baseline(); self.align -= self.baseline();
@ -506,7 +506,7 @@ impl GlyphFragment {
impl Debug for GlyphFragment { impl Debug for GlyphFragment {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
write!(f, "GlyphFragment({:?})", self.text.text) write!(f, "GlyphFragment({:?})", self.item.text)
} }
} }
@ -706,18 +706,18 @@ fn assemble(
let mut growable = Abs::zero(); let mut growable = Abs::zero();
while let Some(part) = parts.next() { while let Some(part) = parts.next() {
let mut advance = base.text.font.to_em(part.full_advance).at(base.text.size); let mut advance = base.item.font.to_em(part.full_advance).at(base.item.size);
if let Some(next) = parts.peek() { if let Some(next) = parts.peek() {
let max_overlap = base let max_overlap = base
.text .item
.font .font
.to_em(part.end_connector_length.min(next.start_connector_length)) .to_em(part.end_connector_length.min(next.start_connector_length))
.at(base.text.size); .at(base.item.size);
if max_overlap < min_overlap { if max_overlap < min_overlap {
// This condition happening is indicative of a bug in the // This condition happening is indicative of a bug in the
// font. // font.
ctx.engine.sink.warn(warning!( ctx.engine.sink.warn(warning!(
base.text.glyphs[0].span.0, base.item.glyphs[0].span.0,
"glyph has assembly parts with overlap less than minConnectorOverlap"; "glyph has assembly parts with overlap less than minConnectorOverlap";
hint: "its rendering may appear broken - this is probably a font bug"; hint: "its rendering may appear broken - this is probably a font bug";
hint: "please file an issue at https://github.com/typst/typst/issues" hint: "please file an issue at https://github.com/typst/typst/issues"
@ -747,19 +747,19 @@ fn assemble(
let mut glyphs = vec![]; let mut glyphs = vec![];
let mut parts = parts(assembly, repeat).peekable(); let mut parts = parts(assembly, repeat).peekable();
while let Some(part) = parts.next() { while let Some(part) = parts.next() {
let mut advance = base.text.font.to_em(part.full_advance).at(base.text.size); let mut advance = base.item.font.to_em(part.full_advance).at(base.item.size);
if let Some(next) = parts.peek() { if let Some(next) = parts.peek() {
let max_overlap = base let max_overlap = base
.text .item
.font .font
.to_em(part.end_connector_length.min(next.start_connector_length)) .to_em(part.end_connector_length.min(next.start_connector_length))
.at(base.text.size); .at(base.item.size);
advance -= max_overlap; advance -= max_overlap;
advance += ratio * (max_overlap - min_overlap); advance += ratio * (max_overlap - min_overlap);
} }
let (x, y) = match axis { let (x, y) = match axis {
Axis::X => (Em::from_length(advance, base.text.size), Em::zero()), Axis::X => (Em::from_length(advance, base.item.size), Em::zero()),
Axis::Y => (Em::zero(), Em::from_length(advance, base.text.size)), Axis::Y => (Em::zero(), Em::from_length(advance, base.item.size)),
}; };
glyphs.push(Glyph { glyphs.push(Glyph {
id: part.glyph_id.0, id: part.glyph_id.0,
@ -767,7 +767,7 @@ fn assemble(
x_offset: Em::zero(), x_offset: Em::zero(),
y_advance: y, y_advance: y,
y_offset: Em::zero(), y_offset: Em::zero(),
..base.text.glyphs[0].clone() ..base.item.glyphs[0].clone()
}); });
} }
@ -778,19 +778,19 @@ fn assemble(
base.size.y = full; base.size.y = full;
base.size.x = glyphs base.size.x = glyphs
.iter() .iter()
.map(|glyph| base.text.font.advance(glyph.id).unwrap_or_default()) .map(|glyph| base.item.font.advance(glyph.id).unwrap_or_default())
.max() .max()
.unwrap_or_default() .unwrap_or_default()
.at(base.text.size); .at(base.item.size);
} }
} }
base.text.glyphs = glyphs; base.item.glyphs = glyphs;
base.italics_correction = base base.italics_correction = base
.text .item
.font .font
.to_em(assembly.italics_correction.value) .to_em(assembly.italics_correction.value)
.at(base.text.size); .at(base.item.size);
if axis == Axis::X { if axis == Axis::X {
base.accent_attach = (full / 2.0, full / 2.0); base.accent_attach = (full / 2.0, full / 2.0);
} }

4
crates/typst-layout/src/math/stretch.rs
View File

@ -34,7 +34,7 @@ pub fn stretch_fragment(
// Return if we attempt to stretch along an axis which isn't stretchable, // Return if we attempt to stretch along an axis which isn't stretchable,
// so that the original fragment isn't modified. // so that the original fragment isn't modified.
let axes = stretch_axes(&glyph.text.font, glyph.base_id); let axes = stretch_axes(&glyph.item.font, glyph.base_id);
let stretch_axis = if let Some(axis) = axis { let stretch_axis = if let Some(axis) = axis {
if !axes.get(axis) { if !axes.get(axis) {
return; return;
@ -50,7 +50,7 @@ pub fn stretch_fragment(
// vertical and horizontal constructions. So for the time being, we // vertical and horizontal constructions. So for the time being, we
// will assume that a glyph cannot have both. // will assume that a glyph cannot have both.
ctx.engine.sink.warn(warning!( ctx.engine.sink.warn(warning!(
glyph.text.glyphs[0].span.0, glyph.item.glyphs[0].span.0,
"glyph has both vertical and horizontal constructions"; "glyph has both vertical and horizontal constructions";
hint: "this is probably a font bug"; hint: "this is probably a font bug";
hint: "please file an issue at https://github.com/typst/typst/issues" hint: "please file an issue at https://github.com/typst/typst/issues"