From 980f898d553bec35bd94171d47fd86cb13e39b23 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 17 Feb 2022 18:56:50 +0100
Subject: [PATCH] Automatic list numbering

---
 src/eval/mod.rs            |  10 +-
 src/eval/template.rs       | 228 ++++++++++++++++++++++++++-----------
 src/library/list.rs        |  77 +++++++++----
 tests/ref/markup/enums.png | Bin 6075 -> 7427 bytes
 tests/ref/markup/lists.png | Bin 21378 -> 21396 bytes
 tests/typ/markup/enums.typ |  14 ++-
 6 files changed, 236 insertions(+), 93 deletions(-)

diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index 98f840821..32ffb0c9b 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -37,7 +37,7 @@ use unicode_segmentation::UnicodeSegmentation;
 use crate::diag::{At, Error, StrResult, Trace, Tracepoint, TypResult};
 use crate::geom::{Angle, Fractional, Length, Relative};
 use crate::layout::Layout;
-use crate::library::{self, ORDERED, UNORDERED};
+use crate::library;
 use crate::syntax::ast::*;
 use crate::syntax::{Span, Spanned};
 use crate::util::EcoString;
@@ -180,9 +180,9 @@ impl Eval for ListNode {
     type Output = Template;
 
     fn eval(&self, vm: &mut Vm) -> TypResult<Self::Output> {
-        Ok(Template::show(library::ListNode::<UNORDERED> {
+        Ok(Template::List(library::ListItem {
             number: None,
-            child: self.body().eval(vm)?.pack(),
+            body: self.body().eval(vm)?.pack(),
         }))
     }
 }
@@ -191,9 +191,9 @@ impl Eval for EnumNode {
     type Output = Template;
 
     fn eval(&self, vm: &mut Vm) -> TypResult<Self::Output> {
-        Ok(Template::show(library::ListNode::<ORDERED> {
+        Ok(Template::Enum(library::ListItem {
             number: self.number(),
-            child: self.body().eval(vm)?.pack(),
+            body: self.body().eval(vm)?.pack(),
         }))
     }
 }
diff --git a/src/eval/template.rs b/src/eval/template.rs
index b1fe07fe9..0db63535f 100644
--- a/src/eval/template.rs
+++ b/src/eval/template.rs
@@ -13,8 +13,8 @@ use crate::diag::StrResult;
 use crate::layout::{Layout, LayoutNode};
 use crate::library::prelude::*;
 use crate::library::{
-    DecoNode, FlowChild, FlowNode, PageNode, ParChild, ParNode, PlaceNode, SpacingKind,
-    TextNode, UNDERLINE,
+    DecoNode, FlowChild, FlowNode, Labelling, ListItem, ListNode, PageNode, ParChild,
+    ParNode, PlaceNode, SpacingKind, TextNode, ORDERED, UNDERLINE, UNORDERED,
 };
 use crate::util::EcoString;
 
@@ -63,6 +63,10 @@ pub enum Template {
     Vertical(SpacingKind),
     /// A block-level node.
     Block(LayoutNode),
+    /// An item in an unordered list.
+    List(ListItem),
+    /// An item in an ordered list.
+    Enum(ListItem),
     /// A page break.
     Pagebreak,
     /// A page node.
@@ -166,13 +170,13 @@ impl Template {
 
     /// Layout this template into a collection of pages.
     pub fn layout(&self, vm: &mut Vm) -> TypResult<Vec<Arc<Frame>>> {
-        let style_arena = Arena::new();
-        let template_arena = Arena::new();
+        let sya = Arena::new();
+        let tpa = Arena::new();
 
-        let mut builder = Builder::new(&style_arena, &template_arena, true);
-        let chain = StyleChain::new(vm.styles);
-        builder.process(self, vm, chain)?;
-        builder.finish_page(true, false, chain);
+        let mut builder = Builder::new(&sya, &tpa, true);
+        let styles = StyleChain::new(vm.styles);
+        builder.process(vm, self, styles)?;
+        builder.finish(vm, styles)?;
 
         let mut frames = vec![];
         let (pages, shared) = builder.pages.unwrap().finish();
@@ -190,43 +194,6 @@ impl Default for Template {
     }
 }
 
-impl Debug for Template {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        match self {
-            Self::Space => f.pad("Space"),
-            Self::Linebreak => f.pad("Linebreak"),
-            Self::Horizontal(kind) => write!(f, "Horizontal({kind:?})"),
-            Self::Text(text) => write!(f, "Text({text:?})"),
-            Self::Inline(node) => {
-                f.write_str("Inline(")?;
-                node.fmt(f)?;
-                f.write_str(")")
-            }
-            Self::Parbreak => f.pad("Parbreak"),
-            Self::Colbreak => f.pad("Colbreak"),
-            Self::Vertical(kind) => write!(f, "Vertical({kind:?})"),
-            Self::Block(node) => {
-                f.write_str("Block(")?;
-                node.fmt(f)?;
-                f.write_str(")")
-            }
-            Self::Pagebreak => f.pad("Pagebreak"),
-            Self::Page(page) => page.fmt(f),
-            Self::Show(node) => {
-                f.write_str("Show(")?;
-                node.fmt(f)?;
-                f.write_str(")")
-            }
-            Self::Styled(styled) => {
-                let (sub, map) = styled.as_ref();
-                map.fmt(f)?;
-                sub.fmt(f)
-            }
-            Self::Sequence(seq) => f.debug_list().entries(seq.iter()).finish(),
-        }
-    }
-}
-
 impl Add for Template {
     type Output = Self;
 
@@ -272,12 +239,12 @@ impl Layout for Template {
         regions: &Regions,
         styles: StyleChain,
     ) -> TypResult<Vec<Constrained<Arc<Frame>>>> {
-        let style_arena = Arena::new();
-        let template_arena = Arena::new();
+        let sya = Arena::new();
+        let tpa = Arena::new();
 
-        let mut builder = Builder::new(&style_arena, &template_arena, false);
-        builder.process(self, vm, styles)?;
-        builder.finish_par(styles);
+        let mut builder = Builder::new(&sya, &tpa, false);
+        builder.process(vm, self, styles)?;
+        builder.finish(vm, styles)?;
 
         let (flow, shared) = builder.flow.finish();
         FlowNode(flow).layout(vm, regions, shared)
@@ -294,11 +261,13 @@ impl Layout for Template {
 /// Builds a flow or page nodes from a template.
 struct Builder<'a> {
     /// An arena where intermediate style chains are stored.
-    style_arena: &'a Arena<StyleChain<'a>>,
+    sya: &'a Arena<StyleChain<'a>>,
     /// An arena where intermediate templates are stored.
-    template_arena: &'a Arena<Template>,
+    tpa: &'a Arena<Template>,
     /// The already built page runs.
     pages: Option<StyleVecBuilder<'a, PageNode>>,
+    /// The currently built list.
+    list: Option<ListBuilder<'a>>,
     /// The currently built flow.
     flow: CollapsingBuilder<'a, FlowChild>,
     /// The currently built paragraph.
@@ -309,16 +278,13 @@ struct Builder<'a> {
 
 impl<'a> Builder<'a> {
     /// Prepare the builder.
-    fn new(
-        style_arena: &'a Arena<StyleChain<'a>>,
-        template_arena: &'a Arena<Template>,
-        top: bool,
-    ) -> Self {
+    fn new(sya: &'a Arena<StyleChain<'a>>, tpa: &'a Arena<Template>, top: bool) -> Self {
         Self {
-            style_arena,
-            template_arena,
+            sya,
+            tpa,
             pages: top.then(|| StyleVecBuilder::new()),
             flow: CollapsingBuilder::new(),
+            list: None,
             par: CollapsingBuilder::new(),
             keep_next: true,
         }
@@ -327,10 +293,38 @@ impl<'a> Builder<'a> {
     /// Process a template.
     fn process(
         &mut self,
-        template: &'a Template,
         vm: &mut Vm,
+        template: &'a Template,
         styles: StyleChain<'a>,
     ) -> TypResult<()> {
+        if let Some(builder) = &mut self.list {
+            match template {
+                Template::Space => {
+                    builder.staged.push((template, styles));
+                    return Ok(());
+                }
+                Template::Parbreak => {
+                    builder.staged.push((template, styles));
+                    return Ok(());
+                }
+                Template::List(item) if builder.labelling == UNORDERED => {
+                    builder.wide |=
+                        builder.staged.iter().any(|&(t, _)| *t == Template::Parbreak);
+                    builder.staged.clear();
+                    builder.items.push(item.clone());
+                    return Ok(());
+                }
+                Template::Enum(item) if builder.labelling == ORDERED => {
+                    builder.wide |=
+                        builder.staged.iter().any(|&(t, _)| *t == Template::Parbreak);
+                    builder.staged.clear();
+                    builder.items.push(item.clone());
+                    return Ok(());
+                }
+                _ => self.finish_list(vm)?,
+            }
+        }
+
         match template {
             Template::Space => {
                 self.par.weak(ParChild::Text(' '.into()), 0, styles);
@@ -379,6 +373,24 @@ impl<'a> Builder<'a> {
                 }
                 self.finish_par(styles);
             }
+            Template::List(item) => {
+                self.list = Some(ListBuilder {
+                    styles,
+                    labelling: UNORDERED,
+                    items: vec![item.clone()],
+                    wide: false,
+                    staged: vec![],
+                });
+            }
+            Template::Enum(item) => {
+                self.list = Some(ListBuilder {
+                    styles,
+                    labelling: ORDERED,
+                    items: vec![item.clone()],
+                    wide: false,
+                    staged: vec![],
+                });
+            }
             Template::Pagebreak => {
                 self.finish_page(true, true, styles);
             }
@@ -390,12 +402,12 @@ impl<'a> Builder<'a> {
             }
             Template::Show(node) => {
                 let template = node.show(vm, styles)?;
-                let stored = self.template_arena.alloc(template);
-                self.process(stored, vm, styles.unscoped(node.id()))?;
+                let stored = self.tpa.alloc(template);
+                self.process(vm, stored, styles.unscoped(node.id()))?;
             }
             Template::Styled(styled) => {
                 let (sub, map) = styled.as_ref();
-                let stored = self.style_arena.alloc(styles);
+                let stored = self.sya.alloc(styles);
                 let styles = map.chain(stored);
 
                 let interruption = map.interruption();
@@ -405,7 +417,7 @@ impl<'a> Builder<'a> {
                     None => {}
                 }
 
-                self.process(sub, vm, styles)?;
+                self.process(vm, sub, styles)?;
 
                 match interruption {
                     Some(Interruption::Page) => self.finish_page(true, false, styles),
@@ -415,7 +427,7 @@ impl<'a> Builder<'a> {
             }
             Template::Sequence(seq) => {
                 for sub in seq.iter() {
-                    self.process(sub, vm, styles)?;
+                    self.process(vm, sub, styles)?;
                 }
             }
         }
@@ -433,6 +445,28 @@ impl<'a> Builder<'a> {
         self.flow.weak(FlowChild::Leading, 0, styles);
     }
 
+    /// Finish the currently built list.
+    fn finish_list(&mut self, vm: &mut Vm) -> TypResult<()> {
+        let ListBuilder { styles, labelling, items, wide, staged } =
+            match self.list.take() {
+                Some(list) => list,
+                None => return Ok(()),
+            };
+
+        let template = match labelling {
+            UNORDERED => Template::show(ListNode::<UNORDERED> { items, wide, start: 1 }),
+            ORDERED | _ => Template::show(ListNode::<ORDERED> { items, wide, start: 1 }),
+        };
+
+        let stored = self.tpa.alloc(template);
+        self.process(vm, stored, styles)?;
+        for (template, styles) in staged {
+            self.process(vm, template, styles)?;
+        }
+
+        Ok(())
+    }
+
     /// Finish the currently built page run.
     fn finish_page(&mut self, keep_last: bool, keep_next: bool, styles: StyleChain<'a>) {
         self.finish_par(styles);
@@ -446,4 +480,68 @@ impl<'a> Builder<'a> {
         }
         self.keep_next = keep_next;
     }
+
+    /// Finish everything.
+    fn finish(&mut self, vm: &mut Vm, styles: StyleChain<'a>) -> TypResult<()> {
+        self.finish_list(vm)?;
+        self.finish_page(true, false, styles);
+        Ok(())
+    }
+}
+
+/// Builds an unordered or ordered list from items.
+struct ListBuilder<'a> {
+    styles: StyleChain<'a>,
+    labelling: Labelling,
+    items: Vec<ListItem>,
+    wide: bool,
+    staged: Vec<(&'a Template, StyleChain<'a>)>,
+}
+
+impl Debug for Template {
+    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
+        match self {
+            Self::Space => f.pad("Space"),
+            Self::Linebreak => f.pad("Linebreak"),
+            Self::Horizontal(kind) => write!(f, "Horizontal({kind:?})"),
+            Self::Text(text) => write!(f, "Text({text:?})"),
+            Self::Inline(node) => {
+                f.write_str("Inline(")?;
+                node.fmt(f)?;
+                f.write_str(")")
+            }
+            Self::Parbreak => f.pad("Parbreak"),
+            Self::Colbreak => f.pad("Colbreak"),
+            Self::Vertical(kind) => write!(f, "Vertical({kind:?})"),
+            Self::Block(node) => {
+                f.write_str("Block(")?;
+                node.fmt(f)?;
+                f.write_str(")")
+            }
+            Self::List(item) => {
+                f.write_str("- ")?;
+                item.body.fmt(f)
+            }
+            Self::Enum(item) => {
+                if let Some(number) = item.number {
+                    write!(f, "{}", number)?;
+                }
+                f.write_str(". ")?;
+                item.body.fmt(f)
+            }
+            Self::Pagebreak => f.pad("Pagebreak"),
+            Self::Page(page) => page.fmt(f),
+            Self::Show(node) => {
+                f.write_str("Show(")?;
+                node.fmt(f)?;
+                f.write_str(")")
+            }
+            Self::Styled(styled) => {
+                let (sub, map) = styled.as_ref();
+                map.fmt(f)?;
+                sub.fmt(f)
+            }
+            Self::Sequence(seq) => f.debug_list().entries(seq.iter()).finish(),
+        }
+    }
 }
diff --git a/src/library/list.rs b/src/library/list.rs
index 08ccfc180..1ec89da2f 100644
--- a/src/library/list.rs
+++ b/src/library/list.rs
@@ -1,15 +1,27 @@
 //! Unordered (bulleted) and ordered (numbered) lists.
 
 use super::prelude::*;
-use super::{GridNode, TextNode, TrackSizing};
+use super::{GridNode, ParNode, TextNode, TrackSizing};
 
 /// An unordered or ordered list.
 #[derive(Debug, Hash)]
 pub struct ListNode<const L: Labelling> {
+    /// The individual bulleted or numbered items.
+    pub items: Vec<ListItem>,
+    /// If true, there is paragraph spacing between the items, if false
+    /// there is list spacing between the items.
+    pub wide: bool,
+    /// Where the list starts.
+    pub start: usize,
+}
+
+/// An item in a list.
+#[derive(Debug, Clone, PartialEq, Hash)]
+pub struct ListItem {
     /// The number of the item.
     pub number: Option<usize>,
     /// The node that produces the item's body.
-    pub child: LayoutNode,
+    pub body: LayoutNode,
 }
 
 #[class]
@@ -18,28 +30,54 @@ impl<const L: Labelling> ListNode<L> {
     pub const LABEL_INDENT: Linear = Relative::new(0.0).into();
     /// The space between the label and the body of each item.
     pub const BODY_INDENT: Linear = Relative::new(0.5).into();
+    /// The spacing between the list items of a non-wide list.
+    pub const SPACING: Linear = Linear::zero();
 
     fn construct(_: &mut Vm, args: &mut Args) -> TypResult<Template> {
-        Ok(args
-            .all()?
-            .into_iter()
-            .enumerate()
-            .map(|(i, child)| Template::show(Self { number: Some(1 + i), child }))
-            .sum())
+        Ok(Template::show(Self {
+            items: args
+                .all()?
+                .into_iter()
+                .map(|body| ListItem { number: None, body })
+                .collect(),
+            wide: args.named("wide")?.unwrap_or(false),
+            start: args.named("start")?.unwrap_or(0),
+        }))
     }
 }
 
 impl<const L: Labelling> Show for ListNode<L> {
     fn show(&self, _: &mut Vm, styles: StyleChain) -> TypResult<Template> {
+        let mut children = vec![];
+        let mut number = self.start;
+
+        for item in &self.items {
+            number = item.number.unwrap_or(number);
+
+            let label = match L {
+                UNORDERED => '•'.into(),
+                ORDERED | _ => format_eco!("{}.", number),
+            };
+
+            children.push(LayoutNode::default());
+            children.push(Template::Text(label).pack());
+            children.push(LayoutNode::default());
+            children.push(item.body.clone());
+
+            number += 1;
+        }
+
         let em = styles.get(TextNode::SIZE).abs;
         let label_indent = styles.get(Self::LABEL_INDENT).resolve(em);
         let body_indent = styles.get(Self::BODY_INDENT).resolve(em);
-
-        let label = match L {
-            UNORDERED => '•'.into(),
-            ORDERED | _ => format_eco!("{}.", self.number.unwrap_or(1)),
+        let leading = styles.get(ParNode::LEADING);
+        let spacing = if self.wide {
+            styles.get(ParNode::SPACING)
+        } else {
+            styles.get(Self::SPACING)
         };
 
+        let gutter = (leading + spacing).resolve(em);
         Ok(Template::block(GridNode {
             tracks: Spec::with_x(vec![
                 TrackSizing::Linear(label_indent.into()),
@@ -47,17 +85,18 @@ impl<const L: Labelling> Show for ListNode<L> {
                 TrackSizing::Linear(body_indent.into()),
                 TrackSizing::Auto,
             ]),
-            gutter: Spec::default(),
-            children: vec![
-                LayoutNode::default(),
-                Template::Text(label).pack(),
-                LayoutNode::default(),
-                self.child.clone(),
-            ],
+            gutter: Spec::with_y(vec![TrackSizing::Linear(gutter.into())]),
+            children,
         }))
     }
 }
 
+impl<const L: Labelling> From<ListItem> for ListNode<L> {
+    fn from(item: ListItem) -> Self {
+        Self { items: vec![item], wide: false, start: 1 }
+    }
+}
+
 /// How to label a list.
 pub type Labelling = usize;
 
diff --git a/tests/ref/markup/enums.png b/tests/ref/markup/enums.png
index 3878f32c52966d5236644745e10dd8aa4a4cd7a9..04d6ee4d4f71d851cff1121efb6c38d45b427222 100644
GIT binary patch
literal 7427
zcmai(cQjmYx5v+n!RRAev@p6LN<^=tgy<5TQ9=+kBYGQ*9->4^5E2pjMUUP`C!$C1
zy+`lFmG`duuJ``lcisE>?>uWg=j^l2v-ke)?}^mbd`Ln_M+g7_iK>dCE&zZa003r%
z-YfuE7Kt_hVEC@8DF4K3Vtd;AC57H~$DXfqjVLc4Or!~&k1G$O^iq7I0sA5+@A{Xc
z)df0&QV|;wY)na+txX=Mr_H4nuOttXr}mZ`j}Ly6!`pU?kdHk_WAbF@^~>H5;;JT>
zAK2EfF5}f#CC8DRZnhHls|}!3|3lKPFkR}<EEr`lLK{jb59fmX{bGtLsL8C30G^!z
z+tcKk$0c*z$R8^ytYij~sn6vLVSZLm|IoPafg!T|P`hXbKdto%;8$2PJ%Y8t0edwq
zvnc<~4hEq`Wq*$xV1AU$$`fpT?<xeR`@Y5X(x|MoO(3={^eM*<?%ZIr=t69*Xmj=B
zHxSE4ze?jC)WQpg=tp|iN2PKdH5A}i0Vr!3wn+PsP?aSj+9}1IYbrTJgchH<INj;J
zvaM{rtIxIGErtk8`@=3K4yM>}J(NJd&h-R|GbwpDv#Ri&nr9D_*_T=z3$Hjk!CgUG
z=F1b>C82IX{`b4+Sp$!sU|eab|8UH=mGT&!w@-k6NCz+~?1N0E!{MrRj@Jt~yfkT+
ziWYa{>Pf@&>p)9%lfHKmRriGcfFjyTaRa_T1P=N09=sChlzq)6sNoBBq}uCOp8Pu4
z+8{X~`IARKTpS34qE+g{0KtX2Fzj!T22c1K@;&XGjAJabQQYQC6i|1s&>q@|TaG+k
z9MQ6t`e~mhU5v`TI$rW&M>qjKp;_=({W%~L8>yFq&&eDogME`4!!0iM5US)^*}r&Q
zCAf4IEaHA~?7n>!K8_-C{cG9d*_sDfG;?C97rLs>@z`Zx(%Ofq;Z_V0>uIVwM`D-o
z5I5q;c0r`)3-y~X@M86_qG^hY{A=v=l8mAA#EKRjE>p+Ir>$_=!0~p^JW1BA5t>hQ
z`3bLSz8>*$l?R8M;{qqLWV<N#ER)0~YKieR(Ydl2VytA4P;rOe<51PO-&V!2o<Lk7
zmXJ`dHBL`+#xl7_Ga2<il6XR|du86{Xe4;<e-m+E_*Pp<FhlqEQ~2v{^O5vJw{+@n
z1;<l0Ln&Iq_l|inKY!~&uYUS<oE2)eys&Zbc)=g2*y>G*IL;1oaY7Cl`~4zr>TncE
z>setBUEzqZc2PKe^aIEFN#O=@)4F{X)l3**U%C(YMDZxWKlO}TH%`74xggk^PfwKF
zs3YIG2FD4mx^7(P3>AS~-3A<1DBg!@$2r&JvosR;Uy=d--`N@Cbycci6$X5x_tce_
z5ecb3%L?U3)IkYpQQwb_G9PIvR_PZi4df{p$KaQ~<!=O8DG9|{uEpUIEz!iWZ88Oq
zqs00p1waXsUTn=oLQS;6!gMjp*)IflOZ(DtzmqB|%;97b0gQPH2@GV~mE!4xF}PzJ
zk$EkOf<MN$Tr=1HffKOkPxrI$CoF3fM?Y`)IU_qSTbDgB&C^0xGDAVHj3%@GG{l-8
zT0vTIzK<^qvCEg<bfH6FKr$4PQk0f&ydGpOz)ssni=x8-De7dqzJf_|>WJ+-k#QFZ
zuiW=|D_Kno24s-E{V)qx?*f!$vq%ZdqA?t9eY9(mrD0p7iVBtUYKuN3k|=~1EA@g<
zEseaGIK86*DT}Y+aCP#Yr&fQUZgCvw|6o~`^0~=Y2vm6cPDK-opvdv9!#)4)TBGgd
zK?KwfZsK3QU*2%1A~O9MS0_(#Z|>s{6VbRioMJjpAy~qej<|t_Z}Xm=X@+_c?F3jO
z1qN(Z7;x}BB96R+_&~bA@+Wxo*Os2{V0zCL&ki#1{F*7)Q|WJY4O1HmFid(eciY2T
ztX`Koln%Yq;OnAaKOWo;ys}AMc@LeWBZL!|rYEImhSk=|5UCu~n<j{&%s+H|j!<=u
zES|g$V)soEO~}iDpY~=*dj6WK&LiyM6C?4=R&-g?kL6_kbSOh|$?YSl;Oawnui?v(
zYc~B`)1)aXc_K)~y<6~}OGYf!L0|H^Q>)~PZ0Cb(aP^9Lp=MON7b&p$<3si{(Fmh<
z+5=j28&6r<r5-ENYZJpb|BV}^8|BM#$<a=IrQy}&$=}Z^eD-C=9J1cne)lQ%F48|=
z$IR$AG)^}UaUC&-r*G&Ydj=cPtc~oyTHRy5B2*z?d?#yYqW=gb3K60>=_?wSsJFu$
zPLPzQvK!dr8xz5-WBiM|_!%O21IbA*QW?nS0<A=>Nel_N7lN{jb!pa}q4_k3!|s<g
z?s3OYUmXOQH575;JzPXH<Kal@&{kcmqVXrhS+J-Qa|eo6F7&gbX_BCyM|q!rLM1ne
zKg`)3+(Uc1m($ydvqaoR8(80y8pO-;F?a}3*>|YlKi?*K+9>2a&SA=R^74gAcpYBz
zZ;Cq)A-Ca<yM?nHhRlsG6@dmp6{G8dv^W;d4_B!6X&5^9(y5KvaR689?G9lRUNwLB
z2HvzQ13BQlojUMXxrzt8G=7pQd2UM+vuiM1=&;;T2y=8@$=NgKyP&X0OU3DzQz+(a
z7VR)2M@`5&;ArAi;^nJdyN1f8d=K2y#abFb`|GnS)|AHatCn)%47cM+THkbe8bCO@
zIGBFWG165rrLu2`3%}C&2Rltq&ZIx-IV6y%wL*uyZ-VDdb6-FI5jYC!>!hI$xU}XY
zu`Ds~UQd%D^cgoZz_)N$V=`)36-38?qzRM4#`vEIddw?MmjDhiL-0~xzD1BT?QBZ`
z4n<7$Zte$-G!Z_Y$jYX{QFGym**&AI#Zv4__$OYPr=d@>X)T^8cq#yCN@?GIPmhKq
z+IWDMDujSB2F*1izRSsK8hpJU`@%qxev{e03oBM++`D_eWpd`2-prUBXs};r#kdTu
zpXJbk_W7ti&n{00o2EbhXK8R5NdDxXL`6<G>HlZ-@ZY*({ynq$#_~ObqU-z6wipiH
zR*O@uISpI2t?DhtKMM@>^tB+Nj6h@iV?s=$<U0Z23>mE5Jb(!_vTszKEXFVFi=w@j
zF7~L4Fs<nsB7Y?D&Q*Rkn>?(3xz!>zEZIp%Qz}Kt432@GM1_@ng2Hq@cc;i+sh(a@
z?=MUu=SM(-J@2-+p}5%uvx6|d#~`}HpVTUpGXosjQ+Cbq@$uqx!65W%@H5kUe9+zr
z2yn0R*0*O%@q;lyW1pY6ut3QhR^XZ<v5ul?*shrrn#lk-Z&*Em+;jfsErN*8CXiIB
z8vL@g<kWb0C`)YM@B7vhabK{zlst+-LrgJk;q0QEzG|k!Ai~%IK#~ooWrdjjTF(nf
zPKf0ow!YN)vRYiH_I`%L%i-@b?6eYw(%M1|d)}h)_?`S)ban=P?L`O{m}SOnc}*Ct
zhvSFBK=B5@M<zF)A5uaLxtLzhO3f5~Sk!T!Gq_eJ^0<N(<k{|_F!|rfRso9E%2+Bd
z!CiiI5&q0B3KB4ZTdYyHY=~YVDdT45pDz&X-ZD=~KNU64c#2zGz#u9jgKu##ntw;e
zxz>MNdMC!n_J9rID-un{Xe-|b6y%_P9yjz%LPTVV(w*QAdQ|RxEukYd_!}F>?{Qg(
z-4JxAo$J8PCYUZvX3-uhFet<JeBSXyu+Fo1t|n&n?sn+nup}rWZ!0tt{675N@JW;W
zB8430dWqrpR~kRufTa4tu8aKqT=*8$Zq@NPSpbf}-vY<3KLfW$UY8gIfQs)YnjOOx
z7u%jiK)-?9TB+9_%P?kzhQlw7{@V9mO$vD|aj_|bR<bG@eqQcO;g-rrN=Yf3#0m6v
zpOlCEoNQzHGTJ*tr;KjB;9+{97jnSockAsJ>1#+kfm465<sjH12}c+sZ3Ty5eCfcu
zX&*)+KW@;s`hAY>IeroP_$`YjH6=$xH$b~^gn%a1c+-I|pB%$!vQeMLixwxilD}y>
z4y?4RIiccDspjHR^`P_d%D~HgN{EG?obPrc4yjAkReI}iO+g`8Do?Vj=eZWnkFB(x
z^8N;ZzoC6N4g_5DCF(-wajJ1u@+=^|Y*Q#t2=fr9MU_7~oY-->t$otLrSoF;>e&hf
zO1M~Ybbgacr@<d6-8$N?a}~s0u->uhzUW@3M09?+<7mt{no~_~$MUR35*+t|MA-3^
zhz_#F|3ux6FQ>3~N(vnl^YUYG7hZ9Gp{D*Bv4y*TMt&`WQ>tZvs2`E(+ES74smk>V
zc1R{q+Ill9bc(n`e5BO4Xw`M`qem0Zx-k!;W~eFB#a;n6yFS)-Lf3RZ`#%?te;G37
zXB9h33{mOSLcG+`Z3`O@k#b>{sK}Y#pFUyZ>d)iX3!!ln`D>bNm+!8ZHf#pl(n5dt
zn(Z74|CT?S9rHgVQ*qb7+-t2@1`_C>++HVa`qPTtX8u|T{Dgt7AFJJGC{^47?Pmm%
z6My!N0XTmZd9Wd=&ldZ)tqcjsd3(vJqofOGxG+-=kgRSTRmzY!?pp8`!%=fpa9&Dp
zDn5yMQW1RW(l6fscq^s#U`0c&ca$}}Z&Y(|IW?0e`^U4=apFsBj^)krxbt}|-0hpC
z_p3EWWIz$QF24>#vynJ)Dmza_5xfJGf7jr%O@tT6Xl&fUlegyE-Lp(w;6whF>g0wP
zrhS(u#ouh#a1^tUMJE(;Wv6ER&Em)g-BF)!JvI~gYO?+pH_;cun5X)lmm6Ob^9O?S
z%X3$rZstmorW~0KbzNxtsnvKT)-`}8l4y^IcKVka6kNakW(_q6x06J?b|FK~<=nL|
zF7mx=xKxj1j8cfxeZ=jsgVza+aim}&(@JQw<6+A$F5pmdk8WIGbII5i+66dG+L68R
zgj|eR{_1#*8)zWVQeoaMUr9FsUSH5iOby0qUfsVf_ceWu7=$jV5xj7dhBVD^EIlYl
z#rO3Y-A&YOm(Lb(3VOLG_cn?T#Rx+taswh~bv%%7=bMV!;Y?DvAd9NY5QQeE(aQkq
zq*oyw8xBODqUSPGB2O4#99`Bxp5HJP*wucxRRWcl%M2(i8_gu!2DJ#0;z5={OA0j+
zLAIA<RLX`Nl^}-1`=;<Qw<g=vS~xJ06DX#jl4nHG-pw}0LyJ$}W;%xoSw7ZSYKwbT
zfq>E`u>v2zBRxW~7Y;$`LN0dDbR)kjBpk^7`0=Aem!^(Rwng$6gWFA<ckkZasQxaK
zXOU94oHDEBRcMv6lU2LpFsq(V<M+kF*1oXc7#m%4=ks>4%Bc5DGjjhXjH#`ygYT6N
zwHMo=>2V$EdGiEk$Mp!{n3iY|B7%3w^@QH)M(4Ln^j$)VPi1HacQ)#Z3E~`t9+^$n
zyS9koW*KBW#(jO;Wb`(^W58HnWn{%NhN>M03(5AtsSt!CPUd{jee}0y(Ok1iCtmLT
z!R4JB?%OEMIUhkrCmWM!Up_T`Rr7Om<=w)6Nw$9<?_Dcl|Lo#VqN4x5Htx)dEnv+(
zFnhD#yQTI!&1L@On3a}1x(qI(8z#1`E_t!NkBA7{3*6+J+MG|`fi#Vb1pf4le%H;<
zNQBj<t$u#+;~e$1l9e~16n*$;n32d;PZ@0L>+@G7>nA@e94}?0dw#Lmj|TrHC6^z(
zr{hc2-r2L2*UX2_!J^OD!BeI_hv&K3&&Dq#`j8I-j%l?JTq<N4i+uyks&!c!&F4`z
zOa&{VR2HhVv&ItQv=RKP=A50^6wF3-lV6R+jV^>-tIN4eSWk(x6qs4d-rlFBZK$v)
z&Le87zu(Ek8HibI@E<BUOu0}w^u3pn{$jybCE49GUQ~e;A9-j3$(8V;11n%k?@0@V
zT@Ynnt2Yu56RG0wZ<K|0#t}0g;IEmt5$<*>#PL1_=!8QLWQryXILH)IS@6X9O)q>@
z+;vuorKUjW02{bEeKg}!1HkH~sA_TvAkBk4u}aE)@CwM>IIr2zAxtgUB(Sl$F;{LQ
zwX1TXA<X&=gRt{(ER9uOE*x;_f>$d^8(nBu?Q~rokA3-BZxImC?*^z-+d4lqbYy~d
zWW)Be&5kVO<jIW8c;qiWPpBK)CkmIJyb@v)xc0y>THV3wXvqVp_eYUKpPgipRrO_T
zu6M9+ziG9kpy=a<k9<?VP7<XDcriWpBg09K!l`0}=WS%4$)(@qAX6mujbC6b#1~$q
zxHzen>(ChxO<|RX#~3>G%*Lv+H{gdYh4paZ>G;a)jW@C#1?NdUvOReQ^9VTPSyV^L
zZ-EafH+LyH4<<(I?e8JV^9GhNyW3Sv%x+o82o71WAqzOv&K*{DY#O(_=|w75l!+&h
zMTgCgVzHZJIv0CAAz=q+@3Rcs-cog{m7h^9@V(JUc8nX#zt>+X=H0KX8r8wq`@4{;
znuL1mJG>u4R1CjoxPATPy#ec|^1C(kZg9MoMW0;hRwwBlMku$&ccogyu3%cvvr_N-
z){;!SdNZ3(@jUV8)froM_CButQZ);e;+J1DT@<_Vw$d6aW=)YLjJmS1cdBn0%IF@a
zm39r0qoY^32yTY!2!SnP>JV}5&xqRZA6H2>9&y`L83?~(S3*PmD~kf9AD&FC7ytfC
zSmiKb_=5_>ey8CmIczQkuYZ@;DM&YHj)L(I8QJjLfEV{%_D~LPlTjLg&Z&n{u^uNm
zL&O>^tZlAYa~MEl{4+<In5_q@H$j~xo&dBpWc9cp&5qXAmo(E)tvIlb1I1#Hx#tIS
zFJ@h~Zg~+8Ue<ItAH9TFy#B!KZjqstizuflSDUcVR@laKuA^kO9#cl|og}%6@%}Mt
zfYC>%hvT+G(?^Ndf#h|3fA<M5)u8stFKG_=sJlsQlf+uaCH=|UZ%@%$ex-CurzS=~
z$>;NhG}x+rM0$%n1K7RGTn!)=!3@Z8@#ZiLdWGP+_Aw@uWqJs<AFfI<JX!T+qgEo*
zoU++eO935Iqs2u!A2+_gSqyjEn%$>(9Oma;4OpHm1r2F}x9-oLia%d#_NzMVYFSWl
zyX86}b-EqQs(UfRSi>c4T*Cuq$P$Arv<5%oLnv~hcfOxW8#bQbj)%M&ez1nT??nLP
zp*C>T(O1Me*JnaUib65_dhY{Nev2|i9FRPJ<|xr`Moy^95WJQm{~L%0MDI#@(H)Oa
zs>1kX!_!y6eTaMpEB4BiDZ)DL!63Es2K`i4YD9tyK2bi2`)XJT8&ncKWX13U)(E_!
zQH71%nfuzO5|I=hgtM<e5_J2@9j$+4`RSLGoVnIRG4Px$@X-%d7B=ve-l@cpH~HN*
zT%Q9+blHIpy#3DTMj+Xs??scAPt{xUa)Yy8V+wtoHnBR}m2PBm`6_shR+uoX{{+2+
z>hx!1Sih{c!d!yieepk>CEUkw6l}FEnHq~63t<TMZ{2JN{uWZ+#z2miIkA86o-dJ1
zU`zpaT-eEnH!mtq*BOXlYjVA!owHjE>4l9%wxN$o&WcU_K!%$)12v4EiYlk*78O-F
zy@^rD{P7@VqB-M`Xeexr^WsO^)f26F$X~-e{>4^~<rjsN$`KSUsfBW6v-91u&*v)%
z_D#;~zMUSBGEP&0);`1t*MaX0GBwoyoU#+9%eE{LB+r`XV)j(08n;_^Toh+M8rP=X
zy;NfE^&;qepb6p4aG*_OcKN8Yac7b=PMo<lceyuMFl^f0y&r7EZp5XK2Jja8<bkR_
z$0!qvo`!!U{rZ2mK+k`jWMluI7AOy&a)K~tXGA;yNFjt{#&qalynKft>8$DR=(&-Z
zzT=bR=sz~NnY-3^)A_<Hw^=hxuO6As1i6@J)L^W|>wntpbA(MVgy#p#GA)GO`b5ug
z3|+)#6C~RG;{4c?QpX4yD~RDR?Rg<=nY@1FQy<{TZNyk67R#|UuhT*CZ^f+^I(ov;
z^Fl=Sk2)+ko2VCM{dAmySj&|NP~H|!ADjOxckxjaU@c2`I<i7l(6$<jD^~h4!pqJ6
ztH(|O6l-90$2A+JXREZ`nP7Xz@-8>{Q_pvtHSWSU`VhW;jTF5J@;^4FJ(6+DTb|>M
z2ZSTa@{I?E%-R}h|L`_D(!E5|&=}U~ui9SY^KLLWZn(uINMu{=ovXdPMU>qgia(T&
z-Mma}`|+(1t3HR58;e_gNSPv_?PgJ*ju<b*^0miKk5lt@^@@GwL8jcl>y{g-f__R*
zCdN3+HEDH|9o4ZXGZDoFA7IS_-7hK@?Zvbt89i+c%Fbnrt#|g7QRPoTy`0214=$9L
z@udgH4PFTE=B{n$uX$N_mBtE8+qbA#Y!1c(jgcie^zi#Ht}ove45^7W`@j_&)gOr>
zHqP}PKgVS7Z99SgxKZ{Gf%p5BN%|1xzJ`ve0omFz7CFreTPJMS+z8rzohj!aO+Z!T
z%wlA%AA5!6)!8{7gg+MDt6NWBtQV~y$TK<b+?Re0awJ}R;cF8!aC6j8#AkeMTkJ~h
z9_wqJ`FYYenf!fRYBp1@icjD23Kezz?>v?iHM*Ex@Il2^vH(t@DlgJ=Gr}e<^I-Y{
z*=nwzD_O8sW;C`??ldG#Nm`+xAp;I`PtohjLee;-O(&ZzbRzx}Q>!&VUA2+;ogStf
zhUC80L_I-?cJ}F$m~rKVhWp!Uvw=gFROe~}WnT+bv0^GT4x;2wk?J7oXuX*ztkoG&
z8}kyT0%-2G_U1wO4AXFv2FdS(MR77ucta9cfTEQ8Ck$XmSg8@~tvV`rSLMn1(dK9)
zGj&lPDijch&l7WdcAJoU*eSsi%-{gd(a2qXpHz8Oa%N8UKiIqyOHJsAsm3>Dc7*Lj
zl+Q$Ewasw+pmcZ6Jo8oO9FSZo^Y@2xW!`u>FDwnveCLQ-h0W$a1mIh|9JAB9e_Go?
zA+`K`IFPcb_V3<R^E6`a(LbE%1%i&Vv0MDq>Ny-f6M=D_Q3BtQKP7uPD-%5Y9Xf>W
zcn3XIB}WI9Q{1|Nf$Z(g;9&{yHeA*FyRV&n%HurKsl&mVmP|~NPgF~EKXT4d2Bh>x
zS~SI`xWU3Ps3SJwq>dnASuM$V*IcN!Tk}eVd#$AOY@KQY*^d;5I>sO&#to9&UYWNS
z9sR$I5qnJx{bQ>DF9*F4(*UC@FTmgJHU*71R1cAyeu_z2c$~Z0LX)4c`G~05rFk6g
zZqnvVOuW}Q-6pAUN`!vUY(z##Oz>Tp_)z=LXTVpG#dp*?&%_+|1-O54rd({pb9o4u
z7>uuH2wDnJr^260>hqk2`ur@94s>(x%(%0{G~tYcJtmAb_n&#bmz+yCW!bW3uONEK
q3Pt|gznK43etuC0NBxt7OQ!txyh}G?H?Kc`H&vB16$=p-!T$wt_LMOI

literal 6075
zcmaKwcTiK^x`%flKoBB9nh=mgl-`?2C!tzEMOtWr6p<nz5ReuiKoG$Q3M##$NRc8P
zA_~%*)X<ysB1mtS@67$q%>B-p`^>CA)}FQZ%$~jWyPo$KaYt7RdXD29002-OZS{Kq
z00N&4EadD0VAub+5&+nOb=1}Fdy`kkd_0&8PJjINb?H@NZjC916N{O_!^|-CVQ^^i
zYXcDkVU_aoJs61RWhyJUG50=y<jOe>br6dU<Lleq#e$J>S)bzWJPLYUus*@vl8E+=
z`EsyVqEnHg(%?}i)iUcTiEU_~wLsqgH#aV>edY&;roxzmQFkEc)R6z2Ocp@smzQos
z*jGcfJunfjpN77heAa(kjsON&!{*J93p3My!TL<0A#`KY_kuZcuku-d7<%E}oOmM=
za1c7JVBRHThew}tAAU8UX&5h`@dAxv_Te-}_Nu+5@e`-t>KYoa&g87pO!meYO~0(Z
z)=;U!Pm7B2%Xr*TJbl+R^2Qt6vJ%ytqLve0%j>+{F^!+BP>GWd+53hj%V7`933YKV
zIcfY1l=r3t>q^FItb~!MjEA!?Uw1HB<#SSdNY;47j(lqr)Mky+^xJ=!En}m}I>=31
zin>9H9js7BIn9}=)|<{o#ZUMOqVV(#e{o75GwU(=-j9AV?Lak$=!f9@bp1-?{3^E}
zuHTyO#d&S2Vp$U5`L!T3eHuLtLbt}ha1On4ojcX+3W@X}-wHo}w5iQnQfly^S{pA*
zzWb(Wr;y3N)wgj?oSSr!7G~QGLl`Cw!n8ShuSjRU(8jl}ma$M~@m#B60ePF44Z;G>
zJJrrsudcVK=l;|+l_-50qf}`TaR-hYM?QjNcsh{0-a*W7lb^3*?qK$PA=f9&`2{FE
zdXuPhX*3-miaFI#KLis}&4o&|Y_vtI%AB;yCtEGmaJ^)BRO^pK!bEUr`du|}?XZ(<
zLdVm@%lDVr>-RH02JuOQ4O<A?htmg#&@uEHrLDcQPoY(}n>z<h*Is}HJY{w5MbVE*
zZ3AN=Zjn37^ZaGO=&(j$R|&e|cXjeZlYodv@l+SdA%qHdO5KdRG}z9PjXEe%LrIU&
z*{D;|{+^V@PH>fy=4$G9B#jDLj}(^gXUpo0e-I+~wFs?^^Ljh}b1&{`F}kcM#I2SR
zZA<1mE&cbIvTc(?iSl>OS-pK{>0OuC=4v*UY%to!&GP$FC~@1B<Y+oj%E~Q|?lu)>
zjchDVCyjbuZXAKJKGz_1bPIOE5-q|^XPhBK*=r1`@f8?m6#1xQC(tYFsv@sly9!mN
zD97;t1HiuZGP90F=};ahkFT@2zUTmnR?KP>-i+-YTt{@5J8j+-2z`C?f&H7})o->Q
zqE{k6+-`VL{L2=R6#>b&_qKd?xna9l<oP&P?_)(`Bj2VzLN^m&Z;Ey(G7g|`DIT}d
zCT8H2LCc7&46VzGJcHNKMBdmI8%Yt$y21Jbt&Ka<;PC-VVBtPAX6_2E$ZjLtg@WXz
zH_DYwc-3jAweZmTFT8+Ty@Q3=n`oTH?#S84bpBKnBWw@yU<eg!)YNmj2pW&OtJ_t?
zDkneN7dw%TROMMU2^@f3j@k&?>p?R%J!jhzI3L9A=U4q0qB^p{v@==>xB5J^_zF@P
zVw)IgUkRVWM4gY=<bi_1-ux8A@~psa0x^p8$dd4NYiIf8HX9>|`u&<_9BGDw!gS6L
zan0HSgl`vQm<LHI(OXqLVuk-jHT?zk5EL|{R+>(kxIFpsv(I^97N%)YHOrLvy7wb$
z1;RMekK+D@F3Y8PtMFzMO)U!?^q`aKahLp!mu|&Pk8m<gSY!q|_cvQ}!aWUw<}$9N
z$s0G%0SJFYqBKt*AASGHp()~eTv*#WCvE@qv|VTwds>h5Hu{h4lmo+AUgK)_z%&<;
zXI92nO0%VI79;hbb%%v2Q6-~HR$7!uyjwv@%vPJLk*pnsK;5?+#mIiTPrfF%Ja6Ka
z0(J|B>Z{U@8rXxof~n|Og^i28kj#GARwP^{6BUM&ajunJ4wKlPAMC+D+gu|w%){V=
z-76nw3m_Oos^=?+LtG(HfT=6*bm2L1+>bJAV<0;2Pm%j_1?GXG4t5FIw15@CPUB8M
z*fc|Fwvg+%-H~q<V$^<DU#yz1q01W8lY+PR+o4oy&Eb^Vi%|XM?j*_TG~M_G`pu>?
zgEWU>q1L4CFaN4}*ciUCLq=z=z0#tDI!+e99a;$@7vC$cM!GJm_wvb@=CDN(EvnUc
zpUz=c)$=IT2IPPQe;!<}JKGdt-0UJK-~ui2`s~vR;WZWNl;!kMXiyZ204h(s#Fcr>
zIm1VCNr~43H{OA$(NlU0Ggqv;;SNXGG;#fxbsU+#8{@LK&+h1pa?BZos4UZeb^GFT
zjRdbEM@iE05R7qbHlm7s)Tx;A1_*Iw<X{Vqz4n5#wZb;RHEkufk&A0{iSAI(`y3DH
z(JRU)doE#(?iN<yN&Sr1+ZNT(___O~mYo%FiVeJ_t^~x?^W^1xHL5viblz4b!-YAN
z5m-CgyDP@NSO6i~pEixQh~+)PtK@l@icNTi5-IJe^)MAnSR9wNvZ_DyYqEBV6IP>n
zty_ggj-`*IDF3K~g~A+tYEyK|Xawo5js3EqG0avmn}_7&OrrW8*Mc<yXSX&z>Ebd{
zM$o<$T4H^CG2>rM;NNY+we!ewbcTeUUt6J!58gVF%S^jYoq%Vp_Hi|b-Xc(|cTd`e
z6DDZ=#?7%blaX=HObP}IfrKMpW`1b-M6UHxYfBL=uzb5@%5WEx9Wp9W8*vQEe(OGk
zeV8EYj4`}W7*dv!^5|{f2bJy*Dn)Z@0&PuXM86H_;s|LBhWPRE_VCHt^4AZN)quMx
zJIMW<d3TA)ez`sepMmhEG$3Z!WWM=?hjf0}cKH>Lg2gTuw(v6GN4_V9*NYwA-<718
zHO*h!Jh@5tbu9hAi@{MLMDX7<s{1<|{x^5{+bYuT!?Jh0;;RQw17XkMw~Yx_8`>mi
z`<pA((_E0oC|*uBwq2P~_Y;?_Mj_bA+M@<w)|VDVtHpFO_4E);9z2|E8XeM^0G9b8
za^EN@a;0Tv&?+2UijrOv6AE+t<mVb$Y<-8<3I$=DVu3!?VMG+)8uS?n;G0$!@`+e2
zaGy_oYumQz1^)4<0V@qoxsN-jEv3?htUqGncafgT&CPX!eua=yNiPdVg&>_|Fi=o>
zq1djk#}^I?c(>)Zk7L@Equ7XjyOabe&}0(DZ;Y!=ei7A0Pfq{h?9$|Sm$u4*7{RIa
zMt-Bk>Umr{a>{Mlq*<OS!PA<1@aR&3<T^cH9Nga@pSyjP)HVmTTi`eHJy=W4I(rXF
z_Ij3u>%!|XIpwtD9RC!t6A}DqY_<7z()Unvm7LR#4)`V^2LYs93?(M%DhT->;$RIb
zOG^{v8W&zYHQd$Bp6?>DesE^xyz?vDjuqa!<q}m@hGJUH^v=o9TdXN81*8&CAcZjZ
zv!88@Lto$z!oBldLGSwqvvD<^g;AEarxiAQbqCXaaMjLvCcZ0nlujm{Y#F?3rDE0V
z9lzo3inL#oMXWWaOuE}F9R(0&A$ldUppH%od(&o&f%=e7MK=Z;__koq1ko#}l38cb
zN$q`eej?RRPY;cg*g@W<v&$LZ`-S}B4-XMs4WH?kr!*H_4|hJ%Lk~WtnItYsAbOu*
zWCI7FRp)$d*F83sAv@A|?&A@KgjyLh!Y0~_vVQ3o@I5kRNKA!#$TM<m2dU1~$V#AZ
z2mOl7?=Cl!SEXY>@73O0@R@&u{#m`ZI3AW|UEg6>vI^VMfzfa^?#}7pwl+mpuWajn
zW?uTTTN=hV`Q1NF%e;TmkM5W@`%#z5y9gA#^g(7R#n3DaYL#M4al)7!1{^tk@+{6h
z7@TIZixk;$3)O!os(bxhY$FSf{<k{_e?!lQgTjd}pt~`b(_!bZLN?-!6U?-%GU8r>
zncxluC+kx>gkm2I*O?p)eA-@5JzmH0SWfugp2isGIReL?IThyHI=Jh{#T6EH+@umQ
zHxU~MDX`T{6u0qZ^jxNaILLlr%nb{kj2jPp?T-tmcW;fjjUBXjwOjjpG4aQ&+=I}9
znN67<Wq(lQ%JFbIM1pJDHpL*1rgfNEwK<p7=HzmnqZCuOar@ar5NP<Lp*_C7T|L1&
zW`md;=1EjOKmx~-I@Qzjq>tiBpN>EzwrvkdCmFK%w<GH#`ikyhy}_dek{v1bKumFV
zAvJXLMZ;4k`!b8Jsb3naVMe`WhIo&h5T=QqFvLmTL$-L?V0+E~=qCQI2!Hn(4fPR3
z=Q2A55gX%t!@U0fmo+&0nbHf+o$Xak;Os9Ib7$3?T)Lop#V^76>9*wJbU#Jlyo<*(
z_EX}K-YAIrAV*#(09#zjh<km&(o})kFe!TQ_2|@aM*)MvdmQGohnApLC^wS=VK095
zYT{yd4V2#VM;^H?=t>mhA%^pio8Og<;OCH8QGiFS$~$YAON$Fo-J~ql<F?z&-u5(O
z;Flw$T*d5hN|Ly-qVq7ljTpDo64UBs^DlD_5(CzsjfF|Fbn)?p;eG7r@UE`l{?F-=
zww?|=nHK4C_!9Rk;zoumchI_EW799U+F(6WgVDre^>?*9bL(`lld$<IvzsZJ3<okE
zD=X~Ofs7BtFZxlzcmgB{km&flzWf5Gr=jQ7dI!7HN*PHk6zY3qC)ts8#yQ>K{GE0`
zcj|@cZ!G9?k4-y5mo{5r%wU&gwbZwOeXc4)75bbdrTeZ}!e^d8dn?^k)JD1?lw<l|
z1#kLd`OmA}5XkyeOM{?%5N-yF^<)EijbOtWm6!PmMOvcNLx@2Iv^MC`pr&c#7~_go
zIMw<W=s~Ll51&rcH+`8>s@}#tJBcI|guB%ebZ?H?9s=Czj?!!0hJk$(h=ZBdmsXbb
zzZu<NXMlbyJ6n8gEBK{Z1iukeLr>&M@d{P_rJ4j;*~>pGWG`as-Q;q|;_Erhg=W&6
zm7Ie-82=m#{<cHnKS)xMcr86b0W*w3R`lqa0E7hbi5r|VnIyajM+W%-`$SRew48~l
zU`XEVd7R~(Rsn3KGL?JL1%h*)d(sK(eLR5Ikz_aKpRtNH2FyOxlLH7f7kj010F>sV
zE2<tFEJl!;vP;dPThGHt?`*H#pabpk$jeuitZ;HEvHp5qMaB51=Zp~4wxd;f!CcJ~
zUWSiD+d>O#TfI5@OVnImekK@1DeFdhLAVc}aKEQXX=eEmU<4_zUa;JA^2bgb6S;Z^
zj;IuQEyYB@lem^wO+_vBT0vyjza+nZu@d^g#FJfelAONLLUfeXF|R&${VC0ricM1C
zbi4(TYNRxMe|R805S>`m<N<r@)O!hG??>oXDq@`cc93m^Alo|#te?jev6$4RjdjwF
z@@Hq{3!AzX+I9#p-aKuCjI;dnIQc&&d?Em5`I|S>>2<O~|6dNUp~pi?%E;L=f4$ks
zslA_&;41I;E(f7XcCCGl)K&P|`K&e(maaBELB{u9a@j9L%$9D!5Bq!V+%2Xk#8I00
zW0E<^iHoa{n{#G}+IwXUR294#K!HkS?+Bx4eLQ8izJ-vPRgQLr@7JutcDEy^&CztX
zC&PiTXI8(3p6UUk7CtLYhY#n;hw@z*1%as-d`P)ow9(%DBcgC}53kk3#>w!!gHEvV
z-KLy4U0uoxZ3q3de|#CV8K0DX#260LQJ6W11UrKLR~#TVub(X4($xHfrT6kg=IT-J
zGtFULM{_LY2ZA;MK0lhQSf#sulme1Y*L=8J?vhICZce?7P7WivPJO!h^2OZ%)M@j|
z2&tLqfhg2fAe?IfT>R-Mg+_o&&tUg#gjJ7uT`f-2{p~l!@r%>f=R=p<!i|_bJ5{%$
z0eVQ7tFy4ztucVmKgO%k1p4z4m>`rT4~SFL6fVzy)Dl3b4blZ?@fgt(T$$Gv(g6Zf
zxC}lBx$${u%>hDkboX|-t2dCQct23FC7Dyu6WiX!zzHTvyZv&(+wKIpDxO2CG#M~Z
z%ROseGNhH4?y>8=k&qctYyWx*w2$RE;%5bMZZU%q)%D6237z|E4P#j>ph%z-tU|jr
zdmd3Ta!p*noLg?}2>9tA4GcU-SHO`at>5-lYtH`Gbpoqh$yr`d7#5n|GnVyJW)^3=
zJpB=TDP%O;cKQonY5$Y3b~1~~(57yZ`+SAISYNU8-LZ3Q=MdsridCB<EwxHiAcB;f
zBzT}zi>|Mr@ij|Bj{XHwei}8BBar4n6g@1xA31rDsya2Y$mu#RPWM3D09VPPG1)yq
z|ND}sM|Z<q4NA(rGr2b!KAY5AMT6YU97wZRTi4Ypm46!E8!i9gpTgRp5=FExnY%7x
zGrZCgrlU9OBZI=^rB_R^SzlCq>`F$D?re<*xmLOjUo?U|i)=hA>0eaiwm_D)4k=Q5
z_OQ-AiIW)q=WEG*2F+U+@S-x&`kWL+ww1?It?!eF2QKYzyMp>3&f@kHl(;|@-qA4#
zb&eqInF55wix6AEQU;b<mkYdEuNf_R#N(Jjm!Wzh6TZ=FWk0QEm>gUiZhD1ZX3VTT
z98lm0e!`&|l1!%91qUnh{tHvIIEDDoY0}T#bHQhp1vt_m1vM{Klrv85O-rN&Xsx?}
z5jr(fNe~lDUbb*xR&RvHX2H&zjv_HSDr!}<>PM4q7`P`@4m^n|NsX9rTH@Fc%G~#Q
zIkL70At`6@cs>ZJdm2P8A&WR~m{G2RT+Z*XN%}F7GMBD$o^Kn&(uk0@FDUyD40~Yx
z=TC)#%QgOSp5p^)ksa^Xtn2z8*Dij#@I>*@$P)is6RY`FKm(pbl>tMk%jdOUXemgJ
z+JYxd=v?9%WdXev)(Vx^+IyB1SmLR2Y=FOddF&@_Q|pFQKe-~8qw0E!C36GCnJwO~
z+T}k#Rn%C8o!!{q(c5oX{5EgyhFEzg>oFjJql`<K(0XYc!w^62C~9XM6I2psRjAOZ
z&E@^@d+(o%XI-BwaT-Qoixet@FeZWO1ZNIaYah>ONQ$c&)%$j&vZy8+8-CU(BH)#%
zEg5Z$8J1fO0yfq5Q~VI)d_^BVwA{gJxMs?MB@iJ;NNcXqPa7nMAxr%$==394F%4B>
zsND5YO_wK?T;2wml=1Y(PU4orK{hGThQ^lTN${o^#1SNsm1&CSHzn!HEBYxepkVQb
zYN8?q=W8ixur>4=fawpBsM-RK6}hJPaT74YfW0F$<My@A$7Ps&83onETOgOVcxf>C
z+S%N28D`GQ<yh(a&G;Ue1fv?GC-($BBtMy73zvIEF-z#-py)4y%4--iiJ>oEOhvlt
z)V+`S3-=aw)QsVd^$k%GxDR`SjSnqC_X>JL-1&0@M0H{b6Ln&{2@3OpG@Qs(HX@FM
ze}ML1M%Y}mm80Zz^k`;pp#Dr>RCWwDjC=_)<-%$J)9D!*&^Kp&?k<r@xUQ~RdThn?
z$B_dFOx;`;c_De>Y7DXrlT|)=D;IP8SPk#}`}w}$pAGi1gCy3v1Y~{INvJKi*UDKA
zqRQZ$IVH1^I@LUuWp|c&F;lkP;sZEdP`Upwii4`?i6>FsJB*J%(X#|k-;T$b{bVMQ
zv*HBUH?!Yn7Od*xOwp)6BG~Iq7rh3@)aY#DY|`kRDT=C=@~J1QWH}^8XHNx|GN1qV
kMEido^i(+b`M-%h;;vTA)a{|$Q3cM>(a=>dKs^Zl9}h1<FaQ7m

diff --git a/tests/ref/markup/lists.png b/tests/ref/markup/lists.png
index 618e119118065dfb207b233cd8ac3e23f2c42486..503bfc9a1a325ff91e55c7f8d1af5d855854c38d 100644
GIT binary patch
delta 5162
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
D31PyJ

delta 5160
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
KgshM^5B?8S4V*jx

diff --git a/tests/typ/markup/enums.typ b/tests/typ/markup/enums.typ
index 93a175d44..aeff9f2c1 100644
--- a/tests/typ/markup/enums.typ
+++ b/tests/typ/markup/enums.typ
@@ -1,9 +1,9 @@
 // Test enums.
 
 ---
-1. Embrace
-2. Extend
-3. Extinguish
+. Embrace
+. Extend
+. Extinguish
 
 ---
 1. First.
@@ -13,5 +13,11 @@
 
 ---
 2. Second
- . First
+1. First
   . Indented
+
+---
+// Test automatic numbering in summed templates.
+#for i in range(5) {
+   [. #roman(1 + i)]
+}