diff options
| author | Laurenz <laurmaedje@gmail.com> | 2022-10-31 09:05:50 +0100 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2022-10-31 09:05:50 +0100 |
| commit | 237feda063a3a556658f1e3e34f7f8867e800f60 (patch) | |
| tree | de5d0fc18ab8407949f05503686121dd43a93c91 /src/model | |
| parent | 66ad023519e5250f88f9066a2607efe5442a7b76 (diff) | |
Remove semantic role handling
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/content.rs | 7 | ||||
| -rw-r--r-- | src/model/layout.rs | 10 | ||||
| -rw-r--r-- | src/model/styles.rs | 19 |
3 files changed, 2 insertions, 34 deletions
diff --git a/src/model/content.rs b/src/model/content.rs index 81c3c729..530862a2 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 ea9d076c..5f21765d 100644 --- a/src/model/layout.rs +++ b/src/model/layout.rs @@ -202,15 +202,7 @@ impl Layout for LayoutNode { ) -> SourceResult<Vec<Frame>> { 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 d21f3a9f..ddeeaa53 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<Role> { - 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() { |
