diff --git a/src/library/structure/heading.rs b/src/library/structure/heading.rs index 017384960..c967c6d7b 100644 --- a/src/library/structure/heading.rs +++ b/src/library/structure/heading.rs @@ -121,12 +121,7 @@ impl Show for HeadingNode { realized = realized.underlined(); } - let role = Role::Heading { - level: self.level, - outlined: styles.get(Self::OUTLINED), - }; - - realized = realized.styled_with_map(map).role(role); + realized = realized.styled_with_map(map); realized = realized.spaced( resolve!(Self::ABOVE).resolve(styles), resolve!(Self::BELOW).resolve(styles), diff --git a/src/library/structure/list.rs b/src/library/structure/list.rs index 4ccdbc544..082c98c32 100644 --- a/src/library/structure/list.rs +++ b/src/library/structure/list.rs @@ -128,11 +128,7 @@ impl Show for ListNode { cells.push(LayoutNode::default()); let label = if L == LIST || L == ENUM { - label - .resolve(world, L, number)? - .styled_with_map(map.clone()) - .role(Role::ListLabel) - .pack() + label.resolve(world, L, number)?.styled_with_map(map.clone()).pack() } else { LayoutNode::default() }; @@ -188,7 +184,7 @@ impl Show for ListNode { } } - Ok(realized.role(Role::List { ordered: L == ENUM }).spaced(above, below)) + Ok(realized.spaced(above, below)) } } diff --git a/src/library/structure/table.rs b/src/library/structure/table.rs index 7994f196d..a2f583f7e 100644 --- a/src/library/structure/table.rs +++ b/src/library/structure/table.rs @@ -52,11 +52,7 @@ impl Show for TableNode { Self { tracks: self.tracks.clone(), gutter: self.gutter.clone(), - cells: self - .cells - .iter() - .map(|cell| cell.unguard(sel).role(Role::TableCell)) - .collect(), + cells: self.cells.iter().map(|cell| cell.unguard(sel)).collect(), } .pack() } @@ -108,8 +104,7 @@ impl Show for TableNode { tracks: self.tracks.clone(), gutter: self.gutter.clone(), cells, - }) - .role(Role::Table)) + })) } fn finalize( diff --git a/src/library/text/raw.rs b/src/library/text/raw.rs index 351600736..d237aa92c 100644 --- a/src/library/text/raw.rs +++ b/src/library/text/raw.rs @@ -127,7 +127,7 @@ impl Show for RawNode { realized = realized.spaced(styles.get(Self::ABOVE), styles.get(Self::BELOW)); } - Ok(realized.styled_with_map(map).role(Role::Code)) + Ok(realized.styled_with_map(map)) } } diff --git a/src/model/content.rs b/src/model/content.rs index 81c3c729b..530862a2d 100644 --- a/src/model/content.rs +++ b/src/model/content.rs @@ -11,7 +11,7 @@ use super::{ ShowNode, StyleChain, StyleEntry, StyleMap, }; use crate::diag::{SourceResult, StrResult}; -use crate::frame::{Frame, Role}; +use crate::frame::Frame; use crate::geom::Abs; use crate::library::layout::{PageNode, Spacing}; use crate::library::structure::ListItem; @@ -160,11 +160,6 @@ impl Content { Self::Styled(Arc::new((self, styles))) } - /// Assign a semantic role to this content. - pub fn role(self, role: Role) -> Self { - self.styled_with_entry(StyleEntry::Role(role)) - } - /// Reenable the show rule identified by the selector. pub fn unguard(&self, sel: Selector) -> Self { self.clone().styled_with_entry(StyleEntry::Unguard(sel)) diff --git a/src/model/layout.rs b/src/model/layout.rs index ea9d076c4..5f21765dd 100644 --- a/src/model/layout.rs +++ b/src/model/layout.rs @@ -202,15 +202,7 @@ impl Layout for LayoutNode { ) -> SourceResult> { let barrier = StyleEntry::Barrier(Barrier::new(self.id())); let styles = barrier.chain(&styles); - - let mut frames = self.0.layout(world, regions, styles)?; - if let Some(role) = styles.role() { - for frame in &mut frames { - frame.apply_role(role); - } - } - - Ok(frames) + self.0.layout(world, regions, styles) } fn pack(self) -> LayoutNode { diff --git a/src/model/styles.rs b/src/model/styles.rs index d21f3a9f7..ddeeaa530 100644 --- a/src/model/styles.rs +++ b/src/model/styles.rs @@ -7,7 +7,6 @@ use comemo::Tracked; use super::{Barrier, Content, Key, Property, Recipe, Selector, Show, Target}; use crate::diag::SourceResult; -use crate::frame::Role; use crate::util::ReadableTypeId; use crate::World; @@ -161,8 +160,6 @@ pub enum StyleEntry { Property(Property), /// A show rule recipe. Recipe(Recipe), - /// A semantic role. - Role(Role), /// A barrier for scoped styles. Barrier(Barrier), /// Guards against recursive show rules. @@ -222,7 +219,6 @@ impl Debug for StyleEntry { match self { Self::Property(property) => property.fmt(f)?, Self::Recipe(recipe) => recipe.fmt(f)?, - Self::Role(role) => role.fmt(f)?, Self::Barrier(barrier) => barrier.fmt(f)?, Self::Guard(sel) => write!(f, "Guard against {sel:?}")?, Self::Unguard(sel) => write!(f, "Unguard against {sel:?}")?, @@ -324,21 +320,6 @@ impl<'a> StyleChain<'a> { Ok(realized) } - /// Retrieve the current role. - pub fn role(self) -> Option { - let mut depth = 0; - - for entry in self.entries() { - match *entry { - StyleEntry::Role(role) => return Some(role), - StyleEntry::Barrier(_) if depth == 1 => return None, - StyleEntry::Barrier(_) => depth += 1, - _ => {} - } - } - None - } - /// Whether the recipe identified by the selector is guarded. fn guarded(self, sel: Selector) -> bool { for entry in self.entries() {