From 85678118086b29b3820813411cf382fa283b39f0 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Wed, 15 Mar 2023 10:09:17 +0100 Subject: Simplify stable id handling --- src/doc.rs | 4 ++-- src/export/pdf/page.rs | 2 +- src/export/render.rs | 2 +- src/model/realize.rs | 4 ++-- src/model/typeset.rs | 40 +++++++++++++++++++--------------------- 5 files changed, 25 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/doc.rs b/src/doc.rs index 11f079d8..ffa056cd 100644 --- a/src/doc.rs +++ b/src/doc.rs @@ -14,7 +14,7 @@ use crate::geom::{ Numeric, Paint, Point, Rel, RgbaColor, Shape, Sides, Size, Stroke, Transform, }; use crate::image::Image; -use crate::model::{node, Content, Fold, StableId, StyleChain}; +use crate::model::{node, Content, Fold, StyleChain}; use crate::syntax::Span; /// A finished document with metadata and page frames. @@ -597,7 +597,7 @@ pub enum Meta { Link(Destination), /// An identifiable piece of content that produces something within the /// area this metadata is attached to. - Node(StableId, Content), + Node(Content), /// Indicates that the content is hidden. Hidden, } diff --git a/src/export/pdf/page.rs b/src/export/pdf/page.rs index 35cb6441..94af6c70 100644 --- a/src/export/pdf/page.rs +++ b/src/export/pdf/page.rs @@ -288,7 +288,7 @@ fn write_frame(ctx: &mut PageContext, frame: &Frame) { Element::Image(image, size) => write_image(ctx, x, y, image, *size), Element::Meta(meta, size) => match meta { Meta::Link(dest) => write_link(ctx, pos, dest, *size), - Meta::Node(_, _) => {} + Meta::Node(_) => {} Meta::Hidden => {} }, } diff --git a/src/export/render.rs b/src/export/render.rs index 03160d97..2fca8827 100644 --- a/src/export/render.rs +++ b/src/export/render.rs @@ -60,7 +60,7 @@ fn render_frame( } Element::Meta(meta, _) => match meta { Meta::Link(_) => {} - Meta::Node(_, _) => {} + Meta::Node(_) => {} Meta::Hidden => {} }, } diff --git a/src/model/realize.rs b/src/model/realize.rs index 3ead8f7d..7a171cfc 100644 --- a/src/model/realize.rs +++ b/src/model/realize.rs @@ -46,8 +46,8 @@ pub fn realize( node.mark_prepared(); - if let Some(id) = node.stable_id() { - let meta = Meta::Node(id, node.clone()); + if node.stable_id().is_some() { + let meta = Meta::Node(node.clone()); return Ok(Some(node.styled(MetaNode::set_data(vec![meta])))); } diff --git a/src/model/typeset.rs b/src/model/typeset.rs index fe433288..8120f58f 100644 --- a/src/model/typeset.rs +++ b/src/model/typeset.rs @@ -40,6 +40,8 @@ pub fn typeset(world: Tracked, content: &Content) -> SourceResult Vt<'a> { } /// Locate all metadata matches for the given selector. - pub fn locate( - &self, - selector: Selector, - ) -> impl Iterator { + pub fn locate(&self, selector: Selector) -> impl Iterator { self.introspector.locate(selector).into_iter() } /// Locate all metadata matches for the given node. - pub fn locate_node(&self) -> impl Iterator { + pub fn locate_node(&self) -> impl Iterator { self.locate(Selector::node::()) - .map(|(id, content)| (id, content.to::().unwrap())) + .map(|content| content.to::().unwrap()) } } @@ -102,7 +101,6 @@ pub struct StableId(u128, u64); /// Provides stable identities to nodes. #[derive(Clone)] -#[doc(hidden)] pub struct StabilityProvider(HashMap); impl StabilityProvider { @@ -126,7 +124,7 @@ impl StabilityProvider { /// Provides access to information about the document. pub struct Introspector { init: bool, - nodes: Vec<(StableId, Content)>, + nodes: Vec, queries: RefCell>, } @@ -169,26 +167,30 @@ impl Introspector { /// Iterate over all nodes. pub fn iter(&self) -> impl Iterator { - self.nodes.iter().map(|(_, node)| node) + self.nodes.iter() } /// Extract metadata from a frame. fn extract(&mut self, frame: &Frame, page: NonZeroUsize, ts: Transform) { for (pos, element) in frame.elements() { - match *element { - Element::Group(ref group) => { + match element { + Element::Group(group) => { let ts = ts .pre_concat(Transform::translate(pos.x, pos.y)) .pre_concat(group.transform); self.extract(&group.frame, page, ts); } - Element::Meta(Meta::Node(id, ref content), _) => { - if !self.nodes.iter().any(|&(prev, _)| prev == id) { + Element::Meta(Meta::Node(content), _) => { + if !self + .nodes + .iter() + .any(|prev| prev.stable_id() == content.stable_id()) + { let pos = pos.transform(ts); let mut node = content.clone(); let loc = Location { page, pos }; node.push_field("location", loc); - self.nodes.push((id, node)); + self.nodes.push(node); } } _ => {} @@ -205,7 +207,7 @@ impl Introspector { } /// Locate all metadata matches for the given selector. - pub fn locate(&self, selector: Selector) -> Vec<(StableId, &Content)> { + pub fn locate(&self, selector: Selector) -> Vec<&Content> { let nodes = self.locate_impl(&selector); let mut queries = self.queries.borrow_mut(); if !queries.iter().any(|(prev, _)| prev == &selector) { @@ -216,11 +218,7 @@ impl Introspector { } impl Introspector { - fn locate_impl(&self, selector: &Selector) -> Vec<(StableId, &Content)> { - self.nodes - .iter() - .map(|(id, node)| (*id, node)) - .filter(|(_, target)| selector.matches(target)) - .collect() + fn locate_impl(&self, selector: &Selector) -> Vec<&Content> { + self.nodes.iter().filter(|target| selector.matches(target)).collect() } } -- cgit v1.2.3