Streamline field names

3 files changed, 8 insertions, 8 deletions

diff --git a/library/src/meta/document.rs b/library/src/meta/document.rs
index 0d03b496..29ed38fe 100644
--- a/library/src/meta/document.rs
+++ b/library/src/meta/document.rs
@@ -44,7 +44,7 @@ impl LayoutRoot for DocumentNode {
             if let Some(node) = child.to::<StyledNode>() {
                 map = node.map();
                 styles = outer.chain(&map);
-                child = node.sub();
+                child = node.body();
             }
 
             if let Some(page) = child.to::<PageNode>() {
diff --git a/library/src/meta/heading.rs b/library/src/meta/heading.rs
index 38890885..bd95001b 100644
--- a/library/src/meta/heading.rs
+++ b/library/src/meta/heading.rs
@@ -45,7 +45,7 @@ pub struct HeadingNode {
     /// The heading's title.
     #[positional]
     #[required]
-    pub title: Content,
+    pub body: Content,
 
     /// The logical nesting depth of the heading, starting from one.
     #[named]
@@ -120,14 +120,14 @@ impl Prepare for HeadingNode {
 
 impl Show for HeadingNode {
     fn show(&self, _: &mut Vt, this: &Content, _: StyleChain) -> SourceResult<Content> {
-        let mut realized = self.title();
+        let mut realized = self.body();
         let numbers = this.field("numbers").unwrap();
         if *numbers != Value::None {
             realized = numbers.clone().display()
                 + HNode::new(Em::new(0.3).into()).with_weak(true).pack()
                 + realized;
         }
-        Ok(BlockNode::new().with_body(realized).pack())
+        Ok(BlockNode::new().with_body(Some(realized)).pack())
     }
 }
 
diff --git a/library/src/meta/outline.rs b/library/src/meta/outline.rs
index 7bc08bf9..4b5a44f7 100644
--- a/library/src/meta/outline.rs
+++ b/library/src/meta/outline.rs
@@ -103,7 +103,7 @@ impl Show for OutlineNode {
     ) -> SourceResult<Content> {
         let mut seq = vec![ParbreakNode::new().pack()];
         if let Some(title) = styles.get(Self::TITLE) {
-            let body = title.clone().unwrap_or_else(|| {
+            let title = title.clone().unwrap_or_else(|| {
                 TextNode::packed(match styles.get(TextNode::LANG) {
                     Lang::GERMAN => "Inhaltsverzeichnis",
                     Lang::ENGLISH | _ => "Contents",
@@ -111,7 +111,7 @@ impl Show for OutlineNode {
             });
 
             seq.push(
-                HeadingNode::new(body)
+                HeadingNode::new(title)
                     .pack()
                     .styled(HeadingNode::NUMBERING, None)
                     .styled(HeadingNode::OUTLINED, false),
@@ -161,7 +161,7 @@ impl Show for OutlineNode {
             }
 
             // Format the numbering.
-            let mut start = heading.title();
+            let mut start = heading.body();
             let numbers = node.field("numbers").unwrap();
             if *numbers != Value::None {
                 start = numbers.clone().display() + SpaceNode::new().pack() + start;
@@ -175,7 +175,7 @@ impl Show for OutlineNode {
                 seq.push(SpaceNode::new().pack());
                 seq.push(
                     BoxNode::new()
-                        .with_body(filler.clone())
+                        .with_body(Some(filler.clone()))
                         .with_width(Fr::one().into())
                         .pack(),
                 );