From 31fb815681a1bb64b7b53191cad26c1e913be67f Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 20:50:36 -0400
Subject: [PATCH 01/78] Add a function for getting the post blank.

---
 src/types/standard_properties.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/types/standard_properties.rs b/src/types/standard_properties.rs
index aa57962..4cd195a 100644
--- a/src/types/standard_properties.rs
+++ b/src/types/standard_properties.rs
@@ -9,6 +9,11 @@ pub trait StandardProperties<'s> {
     //
     // This corresponds to :contents-begin to :contents-end
     // fn get_contents(&'s self) -> &'s str;
+
+    // Get the slice of the AST node's post-blank text.
+    //
+    // This is optional whitespace following the node.
+    // fn get_post_blank<'b>(&'b self) -> &'s str;
 }
 
 // TODO: Write some debugging code to alert when any of the unknown fields below are non-nil in our test data so we can see what these fields represent.

From 49f6e70a19cd6a49692ef918cfbd3f6ec465ad48 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 21:04:46 -0400
Subject: [PATCH 02/78] Use RPIT to get static dispatch GetStandardProperties.

---
 src/types/get_standard_properties.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/types/get_standard_properties.rs b/src/types/get_standard_properties.rs
index ae6464b..9ffe0fb 100644
--- a/src/types/get_standard_properties.rs
+++ b/src/types/get_standard_properties.rs
@@ -10,3 +10,14 @@ impl<'s, I: StandardProperties<'s>> GetStandardProperties<'s> for I {
         self
     }
 }
+
+pub trait NewGetStandardProperties<'s> {
+    // TODO: Can I eliminate this dynamic dispatch, perhaps using nominal generic structs? Low prioritiy since this is not used during parsing.
+    fn get_standard_properties(self) -> impl StandardProperties<'s>;
+}
+
+impl<'s, I: StandardProperties<'s>> NewGetStandardProperties<'s> for I {
+    fn get_standard_properties(self) -> impl StandardProperties<'s> {
+        self
+    }
+}

From bcf1b49db2dc704f0f8366319e2caa3566c4f1ea Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 21:20:39 -0400
Subject: [PATCH 03/78] Remove the GetStandardProperties trait.

This was using dynamic dispatch to deal with enums to avoid the repetitive typing.
---
 src/compare/diff.rs                  |   3 +-
 src/compare/util.rs                  |   5 +-
 src/parser/citation.rs               |   6 +-
 src/parser/footnote_definition.rs    |  14 +--
 src/parser/paragraph.rs              |  12 +--
 src/parser/plain_list.rs             |  16 ++--
 src/parser/plain_text.rs             |   7 +-
 src/parser/radio_link.rs             |  20 ++---
 src/types/ast_node.rs                | 122 +++++++++++++--------------
 src/types/document.rs                |  25 +++---
 src/types/element.rs                 |  53 ++++++------
 src/types/get_standard_properties.rs |  23 -----
 src/types/mod.rs                     |   2 -
 src/types/object.rs                  |  69 ++++++++-------
 14 files changed, 159 insertions(+), 218 deletions(-)
 delete mode 100644 src/types/get_standard_properties.rs

diff --git a/src/compare/diff.rs b/src/compare/diff.rs
index 0dbf851..3b7a382 100644
--- a/src/compare/diff.rs
+++ b/src/compare/diff.rs
@@ -57,7 +57,6 @@ use crate::types::FixedWidthArea;
 use crate::types::FootnoteDefinition;
 use crate::types::FootnoteReference;
 use crate::types::FootnoteReferenceType;
-use crate::types::GetStandardProperties;
 use crate::types::Heading;
 use crate::types::HorizontalRule;
 use crate::types::Hour;
@@ -413,7 +412,7 @@ pub(crate) fn compare_ast_node<'b, 's>(
             name: rust.get_elisp_fact().get_elisp_name(),
             message: Some(e.to_string()),
             children: Vec::new(),
-            rust_source: rust.get_standard_properties().get_source(),
+            rust_source: rust.get_source(),
             emacs_token: emacs,
         }
         .into()
diff --git a/src/compare/util.rs b/src/compare/util.rs
index b7c09fb..61eb97f 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -15,7 +15,6 @@ use crate::compare::sexp::unquote;
 use crate::types::AffiliatedKeywordValue;
 use crate::types::AstNode;
 use crate::types::GetAffiliatedKeywords;
-use crate::types::GetStandardProperties;
 use crate::types::StandardProperties;
 
 /// Check if the child string slice is a slice of the parent string slice.
@@ -44,14 +43,14 @@ fn get_rust_byte_offsets<'b, 's, S: StandardProperties<'s> + ?Sized>(
 pub(crate) fn compare_standard_properties<
     'b,
     's,
-    S: GetStandardProperties<'s> + GetElispFact<'s> + ?Sized,
+    S: StandardProperties<'s> + GetElispFact<'s> + ?Sized,
 >(
     original_document: &'s str,
     emacs: &'b Token<'s>,
     rust: &'b S,
 ) -> Result<(), Box<dyn std::error::Error>> {
     assert_name(emacs, rust.get_elisp_fact().get_elisp_name())?;
-    assert_bounds(original_document, emacs, rust.get_standard_properties())?;
+    assert_bounds(original_document, emacs, rust)?;
     Ok(())
 }
 
diff --git a/src/parser/citation.rs b/src/parser/citation.rs
index e7f7afe..69d7c62 100644
--- a/src/parser/citation.rs
+++ b/src/parser/citation.rs
@@ -211,7 +211,6 @@ mod tests {
     use crate::context::List;
     use crate::parser::element_parser::element;
     use crate::types::Element;
-    use crate::types::GetStandardProperties;
     use crate::types::StandardProperties;
 
     #[test]
@@ -227,10 +226,7 @@ mod tests {
             _ => panic!("Should be a paragraph!"),
         };
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(
-            first_paragraph.get_standard_properties().get_source(),
-            "[cite:@foo]"
-        );
+        assert_eq!(first_paragraph.get_source(), "[cite:@foo]");
         assert_eq!(first_paragraph.children.len(), 1);
 
         match first_paragraph
diff --git a/src/parser/footnote_definition.rs b/src/parser/footnote_definition.rs
index e263c17..e378006 100644
--- a/src/parser/footnote_definition.rs
+++ b/src/parser/footnote_definition.rs
@@ -160,7 +160,7 @@ mod tests {
     use crate::context::Context;
     use crate::context::GlobalSettings;
     use crate::context::List;
-    use crate::types::GetStandardProperties;
+    use crate::types::StandardProperties;
 
     #[test]
     fn two_paragraphs() {
@@ -181,17 +181,13 @@ line footnote.",
             footnote_definition_matcher(remaining).expect("Parse second footnote_definition.");
         assert_eq!(Into::<&str>::into(remaining), "");
         assert_eq!(
-            first_footnote_definition
-                .get_standard_properties()
-                .get_source(),
+            first_footnote_definition.get_source(),
             "[fn:1] A footnote.
 
 "
         );
         assert_eq!(
-            second_footnote_definition
-                .get_standard_properties()
-                .get_source(),
+            second_footnote_definition.get_source(),
             "[fn:2] A multi-
 
 line footnote."
@@ -216,9 +212,7 @@ not in the footnote.",
             footnote_definition_matcher(input).expect("Parse first footnote_definition");
         assert_eq!(Into::<&str>::into(remaining), "not in the footnote.");
         assert_eq!(
-            first_footnote_definition
-                .get_standard_properties()
-                .get_source(),
+            first_footnote_definition.get_source(),
             "[fn:2] A multi-
 
 line footnote.
diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs
index 077e54b..d20f943 100644
--- a/src/parser/paragraph.rs
+++ b/src/parser/paragraph.rs
@@ -96,7 +96,7 @@ mod tests {
     use crate::context::List;
     use crate::parser::element_parser::element;
     use crate::parser::org_source::OrgSource;
-    use crate::types::GetStandardProperties;
+    use crate::types::StandardProperties;
 
     #[test]
     fn two_paragraphs() {
@@ -109,13 +109,7 @@ mod tests {
         let (remaining, second_paragraph) =
             paragraph_matcher(remaining).expect("Parse second paragraph.");
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(
-            first_paragraph.get_standard_properties().get_source(),
-            "foo bar baz\n\n"
-        );
-        assert_eq!(
-            second_paragraph.get_standard_properties().get_source(),
-            "lorem ipsum"
-        );
+        assert_eq!(first_paragraph.get_source(), "foo bar baz\n\n");
+        assert_eq!(second_paragraph.get_source(), "lorem ipsum");
     }
 }
diff --git a/src/parser/plain_list.rs b/src/parser/plain_list.rs
index 91aeceb..b42ce1b 100644
--- a/src/parser/plain_list.rs
+++ b/src/parser/plain_list.rs
@@ -629,7 +629,7 @@ mod tests {
     use crate::context::Context;
     use crate::context::GlobalSettings;
     use crate::context::List;
-    use crate::types::GetStandardProperties;
+    use crate::types::StandardProperties;
 
     #[test]
     fn plain_list_item_empty() {
@@ -640,7 +640,7 @@ mod tests {
         let plain_list_item_matcher = bind_context!(plain_list_item, &initial_context);
         let (remaining, (_, result)) = plain_list_item_matcher(input).unwrap();
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(result.get_standard_properties().get_source(), "1.");
+        assert_eq!(result.get_source(), "1.");
     }
 
     #[test]
@@ -652,7 +652,7 @@ mod tests {
         let plain_list_item_matcher = bind_context!(plain_list_item, &initial_context);
         let (remaining, (_, result)) = plain_list_item_matcher(input).unwrap();
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(result.get_standard_properties().get_source(), "1. foo");
+        assert_eq!(result.get_source(), "1. foo");
     }
 
     #[test]
@@ -664,7 +664,7 @@ mod tests {
         let (remaining, result) =
             plain_list(std::iter::empty(), input, &initial_context, input).unwrap();
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(result.get_standard_properties().get_source(), "1.");
+        assert_eq!(result.get_source(), "1.");
     }
 
     #[test]
@@ -676,7 +676,7 @@ mod tests {
         let (remaining, result) =
             plain_list(std::iter::empty(), input, &initial_context, input).unwrap();
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(result.get_standard_properties().get_source(), "1. foo");
+        assert_eq!(result.get_source(), "1. foo");
     }
 
     #[test]
@@ -721,7 +721,7 @@ mod tests {
             plain_list_matcher(input).expect("Should parse the plain list successfully.");
         assert_eq!(Into::<&str>::into(remaining), "   ipsum\n");
         assert_eq!(
-            result.get_standard_properties().get_source(),
+            result.get_source(),
             r#"1. foo
 2. bar
    baz
@@ -749,7 +749,7 @@ baz"#,
             plain_list_matcher(input).expect("Should parse the plain list successfully.");
         assert_eq!(Into::<&str>::into(remaining), "baz");
         assert_eq!(
-            result.get_standard_properties().get_source(),
+            result.get_source(),
             r#"1. foo
    1. bar
 
@@ -782,7 +782,7 @@ dolar"#,
             plain_list_matcher(input).expect("Should parse the plain list successfully.");
         assert_eq!(Into::<&str>::into(remaining), "dolar");
         assert_eq!(
-            result.get_standard_properties().get_source(),
+            result.get_source(),
             r#"1. foo
 
    bar
diff --git a/src/parser/plain_text.rs b/src/parser/plain_text.rs
index 2558182..24858bd 100644
--- a/src/parser/plain_text.rs
+++ b/src/parser/plain_text.rs
@@ -143,7 +143,7 @@ mod tests {
     use crate::context::GlobalSettings;
     use crate::context::List;
     use crate::parser::object_parser::detect_standard_set_object_sans_plain_text;
-    use crate::types::GetStandardProperties;
+    use crate::types::StandardProperties;
 
     #[test]
     fn plain_text_simple() {
@@ -160,9 +160,6 @@ mod tests {
         )(input)
         .unwrap();
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(
-            result.get_standard_properties().get_source(),
-            Into::<&str>::into(input)
-        );
+        assert_eq!(result.get_source(), Into::<&str>::into(input));
     }
 }
diff --git a/src/parser/radio_link.rs b/src/parser/radio_link.rs
index dbe8dff..903d64e 100644
--- a/src/parser/radio_link.rs
+++ b/src/parser/radio_link.rs
@@ -175,8 +175,8 @@ mod tests {
     use crate::parser::element_parser::element;
     use crate::types::Bold;
     use crate::types::Element;
-    use crate::types::GetStandardProperties;
     use crate::types::PlainText;
+    use crate::types::StandardProperties;
 
     #[test]
     fn plain_text_radio_target() -> Result<(), Box<dyn std::error::Error>> {
@@ -195,10 +195,7 @@ mod tests {
             _ => panic!("Should be a paragraph!"),
         };
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(
-            first_paragraph.get_standard_properties().get_source(),
-            "foo bar baz"
-        );
+        assert_eq!(first_paragraph.get_source(), "foo bar baz");
         assert_eq!(first_paragraph.children.len(), 3);
         match first_paragraph
             .children
@@ -206,7 +203,7 @@ mod tests {
             .expect("Len already asserted to be 3.")
         {
             Object::RadioLink(inner) => {
-                assert_eq!(inner.get_standard_properties().get_source(), "bar ");
+                assert_eq!(inner.get_source(), "bar ");
                 assert_eq!(inner.path, "bar");
                 assert_eq!(inner.children.len(), 1);
                 let child = inner
@@ -214,7 +211,7 @@ mod tests {
                     .first()
                     .expect("Length already asserted to be 1.");
                 assert!(matches!(child, Object::PlainText(_)));
-                assert_eq!(child.get_standard_properties().get_source(), "bar");
+                assert_eq!(child.get_source(), "bar");
             }
             _ => {
                 return Err("Child should be a radio link.".into());
@@ -244,10 +241,7 @@ mod tests {
             _ => panic!("Should be a paragraph!"),
         };
         assert_eq!(Into::<&str>::into(remaining), "");
-        assert_eq!(
-            first_paragraph.get_standard_properties().get_source(),
-            "foo *bar* baz"
-        );
+        assert_eq!(first_paragraph.get_source(), "foo *bar* baz");
         assert_eq!(first_paragraph.children.len(), 3);
         match first_paragraph
             .children
@@ -255,7 +249,7 @@ mod tests {
             .expect("Len already asserted to be 3.")
         {
             Object::RadioLink(inner) => {
-                assert_eq!(inner.get_standard_properties().get_source(), "*bar* ");
+                assert_eq!(inner.get_source(), "*bar* ");
                 assert_eq!(inner.path, "*bar* ");
                 assert_eq!(inner.children.len(), 1);
                 let child = inner
@@ -263,7 +257,7 @@ mod tests {
                     .first()
                     .expect("Length already asserted to be 1.");
                 assert!(matches!(child, Object::Bold(_)));
-                assert_eq!(child.get_standard_properties().get_source(), "*bar* ");
+                assert_eq!(child.get_source(), "*bar* ");
             }
             _ => {
                 return Err("Child should be a radio link.".into());
diff --git a/src/types/ast_node.rs b/src/types/ast_node.rs
index c9a1729..026931a 100644
--- a/src/types/ast_node.rs
+++ b/src/types/ast_node.rs
@@ -2,6 +2,7 @@ use super::macros::to_ast_node;
 use super::CenterBlock;
 use super::QuoteBlock;
 use super::SpecialBlock;
+use super::StandardProperties;
 use crate::types::AngleLink;
 use crate::types::BabelCall;
 use crate::types::Bold;
@@ -24,7 +25,6 @@ use crate::types::ExportSnippet;
 use crate::types::FixedWidthArea;
 use crate::types::FootnoteDefinition;
 use crate::types::FootnoteReference;
-use crate::types::GetStandardProperties;
 use crate::types::Heading;
 use crate::types::HorizontalRule;
 use crate::types::InlineBabelCall;
@@ -259,67 +259,67 @@ to_ast_node!(&'r Superscript<'s>, AstNode::Superscript);
 to_ast_node!(&'r TableCell<'s>, AstNode::TableCell);
 to_ast_node!(&'r Timestamp<'s>, AstNode::Timestamp);
 
-impl<'r, 's> GetStandardProperties<'s> for AstNode<'r, 's> {
-    fn get_standard_properties<'b>(&'b self) -> &'b dyn crate::types::StandardProperties<'s> {
+impl<'r, 's> StandardProperties<'s> for AstNode<'r, 's> {
+    fn get_source<'b>(&'b self) -> &'s str {
         match self {
-            AstNode::Document(inner) => *inner,
-            AstNode::Heading(inner) => *inner,
-            AstNode::Section(inner) => *inner,
-            AstNode::Paragraph(inner) => *inner,
-            AstNode::PlainList(inner) => *inner,
-            AstNode::PlainListItem(inner) => *inner,
-            AstNode::CenterBlock(inner) => *inner,
-            AstNode::QuoteBlock(inner) => *inner,
-            AstNode::SpecialBlock(inner) => *inner,
-            AstNode::DynamicBlock(inner) => *inner,
-            AstNode::FootnoteDefinition(inner) => *inner,
-            AstNode::Comment(inner) => *inner,
-            AstNode::Drawer(inner) => *inner,
-            AstNode::PropertyDrawer(inner) => *inner,
-            AstNode::NodeProperty(inner) => *inner,
-            AstNode::Table(inner) => *inner,
-            AstNode::TableRow(inner) => *inner,
-            AstNode::VerseBlock(inner) => *inner,
-            AstNode::CommentBlock(inner) => *inner,
-            AstNode::ExampleBlock(inner) => *inner,
-            AstNode::ExportBlock(inner) => *inner,
-            AstNode::SrcBlock(inner) => *inner,
-            AstNode::Clock(inner) => *inner,
-            AstNode::DiarySexp(inner) => *inner,
-            AstNode::Planning(inner) => *inner,
-            AstNode::FixedWidthArea(inner) => *inner,
-            AstNode::HorizontalRule(inner) => *inner,
-            AstNode::Keyword(inner) => *inner,
-            AstNode::BabelCall(inner) => *inner,
-            AstNode::LatexEnvironment(inner) => *inner,
-            AstNode::Bold(inner) => *inner,
-            AstNode::Italic(inner) => *inner,
-            AstNode::Underline(inner) => *inner,
-            AstNode::StrikeThrough(inner) => *inner,
-            AstNode::Code(inner) => *inner,
-            AstNode::Verbatim(inner) => *inner,
-            AstNode::PlainText(inner) => *inner,
-            AstNode::RegularLink(inner) => *inner,
-            AstNode::RadioLink(inner) => *inner,
-            AstNode::RadioTarget(inner) => *inner,
-            AstNode::PlainLink(inner) => *inner,
-            AstNode::AngleLink(inner) => *inner,
-            AstNode::OrgMacro(inner) => *inner,
-            AstNode::Entity(inner) => *inner,
-            AstNode::LatexFragment(inner) => *inner,
-            AstNode::ExportSnippet(inner) => *inner,
-            AstNode::FootnoteReference(inner) => *inner,
-            AstNode::Citation(inner) => *inner,
-            AstNode::CitationReference(inner) => *inner,
-            AstNode::InlineBabelCall(inner) => *inner,
-            AstNode::InlineSourceBlock(inner) => *inner,
-            AstNode::LineBreak(inner) => *inner,
-            AstNode::Target(inner) => *inner,
-            AstNode::StatisticsCookie(inner) => *inner,
-            AstNode::Subscript(inner) => *inner,
-            AstNode::Superscript(inner) => *inner,
-            AstNode::TableCell(inner) => *inner,
-            AstNode::Timestamp(inner) => *inner,
+            AstNode::Document(inner) => inner.get_source(),
+            AstNode::Heading(inner) => inner.get_source(),
+            AstNode::Section(inner) => inner.get_source(),
+            AstNode::Paragraph(inner) => inner.get_source(),
+            AstNode::PlainList(inner) => inner.get_source(),
+            AstNode::PlainListItem(inner) => inner.get_source(),
+            AstNode::CenterBlock(inner) => inner.get_source(),
+            AstNode::QuoteBlock(inner) => inner.get_source(),
+            AstNode::SpecialBlock(inner) => inner.get_source(),
+            AstNode::DynamicBlock(inner) => inner.get_source(),
+            AstNode::FootnoteDefinition(inner) => inner.get_source(),
+            AstNode::Comment(inner) => inner.get_source(),
+            AstNode::Drawer(inner) => inner.get_source(),
+            AstNode::PropertyDrawer(inner) => inner.get_source(),
+            AstNode::NodeProperty(inner) => inner.get_source(),
+            AstNode::Table(inner) => inner.get_source(),
+            AstNode::TableRow(inner) => inner.get_source(),
+            AstNode::VerseBlock(inner) => inner.get_source(),
+            AstNode::CommentBlock(inner) => inner.get_source(),
+            AstNode::ExampleBlock(inner) => inner.get_source(),
+            AstNode::ExportBlock(inner) => inner.get_source(),
+            AstNode::SrcBlock(inner) => inner.get_source(),
+            AstNode::Clock(inner) => inner.get_source(),
+            AstNode::DiarySexp(inner) => inner.get_source(),
+            AstNode::Planning(inner) => inner.get_source(),
+            AstNode::FixedWidthArea(inner) => inner.get_source(),
+            AstNode::HorizontalRule(inner) => inner.get_source(),
+            AstNode::Keyword(inner) => inner.get_source(),
+            AstNode::BabelCall(inner) => inner.get_source(),
+            AstNode::LatexEnvironment(inner) => inner.get_source(),
+            AstNode::Bold(inner) => inner.get_source(),
+            AstNode::Italic(inner) => inner.get_source(),
+            AstNode::Underline(inner) => inner.get_source(),
+            AstNode::StrikeThrough(inner) => inner.get_source(),
+            AstNode::Code(inner) => inner.get_source(),
+            AstNode::Verbatim(inner) => inner.get_source(),
+            AstNode::PlainText(inner) => inner.get_source(),
+            AstNode::RegularLink(inner) => inner.get_source(),
+            AstNode::RadioLink(inner) => inner.get_source(),
+            AstNode::RadioTarget(inner) => inner.get_source(),
+            AstNode::PlainLink(inner) => inner.get_source(),
+            AstNode::AngleLink(inner) => inner.get_source(),
+            AstNode::OrgMacro(inner) => inner.get_source(),
+            AstNode::Entity(inner) => inner.get_source(),
+            AstNode::LatexFragment(inner) => inner.get_source(),
+            AstNode::ExportSnippet(inner) => inner.get_source(),
+            AstNode::FootnoteReference(inner) => inner.get_source(),
+            AstNode::Citation(inner) => inner.get_source(),
+            AstNode::CitationReference(inner) => inner.get_source(),
+            AstNode::InlineBabelCall(inner) => inner.get_source(),
+            AstNode::InlineSourceBlock(inner) => inner.get_source(),
+            AstNode::LineBreak(inner) => inner.get_source(),
+            AstNode::Target(inner) => inner.get_source(),
+            AstNode::StatisticsCookie(inner) => inner.get_source(),
+            AstNode::Subscript(inner) => inner.get_source(),
+            AstNode::Superscript(inner) => inner.get_source(),
+            AstNode::TableCell(inner) => inner.get_source(),
+            AstNode::Timestamp(inner) => inner.get_source(),
         }
     }
 }
diff --git a/src/types/document.rs b/src/types/document.rs
index e6f128c..8328b72 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -1,7 +1,6 @@
 use std::path::PathBuf;
 
 use super::Element;
-use super::GetStandardProperties;
 use super::NodeProperty;
 use super::Object;
 use super::StandardProperties;
@@ -54,15 +53,6 @@ pub enum TodoKeywordType {
     Done,
 }
 
-impl<'s> GetStandardProperties<'s> for DocumentElement<'s> {
-    fn get_standard_properties<'b>(&'b self) -> &'b dyn StandardProperties<'s> {
-        match self {
-            DocumentElement::Heading(inner) => inner,
-            DocumentElement::Section(inner) => inner,
-        }
-    }
-}
-
 impl<'s> StandardProperties<'s> for Document<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
@@ -84,11 +74,7 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
 impl<'s> Heading<'s> {
     pub fn get_raw_value(&self) -> String {
         // TODO: I think this could just return a string slice instead of an owned string.
-        let title_source: String = self
-            .title
-            .iter()
-            .map(|obj| obj.get_standard_properties().get_source())
-            .collect();
+        let title_source: String = self.title.iter().map(|obj| obj.get_source()).collect();
         title_source
     }
 
@@ -132,3 +118,12 @@ impl<'s> Document<'s> {
             .flat_map(|property_drawer| property_drawer.children.iter())
     }
 }
+
+impl<'s> StandardProperties<'s> for DocumentElement<'s> {
+    fn get_source<'b>(&'b self) -> &'s str {
+        match self {
+            DocumentElement::Heading(inner) => inner.get_source(),
+            DocumentElement::Section(inner) => inner.get_source(),
+        }
+    }
+}
diff --git a/src/types/element.rs b/src/types/element.rs
index 19e7ca9..c079f6b 100644
--- a/src/types/element.rs
+++ b/src/types/element.rs
@@ -20,7 +20,6 @@ use super::lesser_element::SrcBlock;
 use super::lesser_element::VerseBlock;
 use super::CenterBlock;
 use super::Drawer;
-use super::GetStandardProperties;
 use super::QuoteBlock;
 use super::SpecialBlock;
 use super::StandardProperties;
@@ -54,33 +53,33 @@ pub enum Element<'s> {
     LatexEnvironment(LatexEnvironment<'s>),
 }
 
-impl<'s> GetStandardProperties<'s> for Element<'s> {
-    fn get_standard_properties<'b>(&'b self) -> &'b dyn StandardProperties<'s> {
+impl<'s> StandardProperties<'s> for Element<'s> {
+    fn get_source<'b>(&'b self) -> &'s str {
         match self {
-            Element::Paragraph(inner) => inner,
-            Element::PlainList(inner) => inner,
-            Element::CenterBlock(inner) => inner,
-            Element::QuoteBlock(inner) => inner,
-            Element::SpecialBlock(inner) => inner,
-            Element::DynamicBlock(inner) => inner,
-            Element::FootnoteDefinition(inner) => inner,
-            Element::Comment(inner) => inner,
-            Element::Drawer(inner) => inner,
-            Element::PropertyDrawer(inner) => inner,
-            Element::Table(inner) => inner,
-            Element::VerseBlock(inner) => inner,
-            Element::CommentBlock(inner) => inner,
-            Element::ExampleBlock(inner) => inner,
-            Element::ExportBlock(inner) => inner,
-            Element::SrcBlock(inner) => inner,
-            Element::Clock(inner) => inner,
-            Element::DiarySexp(inner) => inner,
-            Element::Planning(inner) => inner,
-            Element::FixedWidthArea(inner) => inner,
-            Element::HorizontalRule(inner) => inner,
-            Element::Keyword(inner) => inner,
-            Element::BabelCall(inner) => inner,
-            Element::LatexEnvironment(inner) => inner,
+            Element::Paragraph(inner) => inner.get_source(),
+            Element::PlainList(inner) => inner.get_source(),
+            Element::CenterBlock(inner) => inner.get_source(),
+            Element::QuoteBlock(inner) => inner.get_source(),
+            Element::SpecialBlock(inner) => inner.get_source(),
+            Element::DynamicBlock(inner) => inner.get_source(),
+            Element::FootnoteDefinition(inner) => inner.get_source(),
+            Element::Comment(inner) => inner.get_source(),
+            Element::Drawer(inner) => inner.get_source(),
+            Element::PropertyDrawer(inner) => inner.get_source(),
+            Element::Table(inner) => inner.get_source(),
+            Element::VerseBlock(inner) => inner.get_source(),
+            Element::CommentBlock(inner) => inner.get_source(),
+            Element::ExampleBlock(inner) => inner.get_source(),
+            Element::ExportBlock(inner) => inner.get_source(),
+            Element::SrcBlock(inner) => inner.get_source(),
+            Element::Clock(inner) => inner.get_source(),
+            Element::DiarySexp(inner) => inner.get_source(),
+            Element::Planning(inner) => inner.get_source(),
+            Element::FixedWidthArea(inner) => inner.get_source(),
+            Element::HorizontalRule(inner) => inner.get_source(),
+            Element::Keyword(inner) => inner.get_source(),
+            Element::BabelCall(inner) => inner.get_source(),
+            Element::LatexEnvironment(inner) => inner.get_source(),
         }
     }
 }
diff --git a/src/types/get_standard_properties.rs b/src/types/get_standard_properties.rs
deleted file mode 100644
index 9ffe0fb..0000000
--- a/src/types/get_standard_properties.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use super::StandardProperties;
-
-pub trait GetStandardProperties<'s> {
-    // TODO: Can I eliminate this dynamic dispatch, perhaps using nominal generic structs? Low prioritiy since this is not used during parsing.
-    fn get_standard_properties<'b>(&'b self) -> &'b dyn StandardProperties<'s>;
-}
-
-impl<'s, I: StandardProperties<'s>> GetStandardProperties<'s> for I {
-    fn get_standard_properties<'b>(&'b self) -> &'b dyn StandardProperties<'s> {
-        self
-    }
-}
-
-pub trait NewGetStandardProperties<'s> {
-    // TODO: Can I eliminate this dynamic dispatch, perhaps using nominal generic structs? Low prioritiy since this is not used during parsing.
-    fn get_standard_properties(self) -> impl StandardProperties<'s>;
-}
-
-impl<'s, I: StandardProperties<'s>> NewGetStandardProperties<'s> for I {
-    fn get_standard_properties(self) -> impl StandardProperties<'s> {
-        self
-    }
-}
diff --git a/src/types/mod.rs b/src/types/mod.rs
index 334dd2f..7dad80b 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -2,7 +2,6 @@ mod affiliated_keyword;
 mod ast_node;
 mod document;
 mod element;
-mod get_standard_properties;
 mod greater_element;
 mod lesser_element;
 mod macros;
@@ -22,7 +21,6 @@ pub use document::PriorityCookie;
 pub use document::Section;
 pub use document::TodoKeywordType;
 pub use element::Element;
-pub use get_standard_properties::GetStandardProperties;
 pub use greater_element::CenterBlock;
 pub use greater_element::CheckboxType;
 pub use greater_element::Drawer;
diff --git a/src/types/object.rs b/src/types/object.rs
index f900ccb..9f38eb6 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -6,7 +6,6 @@ use super::util::coalesce_whitespace_if_line_break;
 use super::util::remove_line_break;
 use super::util::remove_whitespace_if_line_break;
 use super::util::to_lowercase;
-use super::GetStandardProperties;
 use super::StandardProperties;
 
 #[derive(Debug)]
@@ -515,40 +514,6 @@ pub struct WarningDelay {
     pub unit: TimeUnit,
 }
 
-impl<'s> GetStandardProperties<'s> for Object<'s> {
-    fn get_standard_properties<'b>(&'b self) -> &'b dyn StandardProperties<'s> {
-        match self {
-            Object::Bold(inner) => inner,
-            Object::Italic(inner) => inner,
-            Object::Underline(inner) => inner,
-            Object::StrikeThrough(inner) => inner,
-            Object::Code(inner) => inner,
-            Object::Verbatim(inner) => inner,
-            Object::PlainText(inner) => inner,
-            Object::RegularLink(inner) => inner,
-            Object::RadioLink(inner) => inner,
-            Object::RadioTarget(inner) => inner,
-            Object::PlainLink(inner) => inner,
-            Object::AngleLink(inner) => inner,
-            Object::OrgMacro(inner) => inner,
-            Object::Entity(inner) => inner,
-            Object::LatexFragment(inner) => inner,
-            Object::ExportSnippet(inner) => inner,
-            Object::FootnoteReference(inner) => inner,
-            Object::Citation(inner) => inner,
-            Object::CitationReference(inner) => inner,
-            Object::InlineBabelCall(inner) => inner,
-            Object::InlineSourceBlock(inner) => inner,
-            Object::LineBreak(inner) => inner,
-            Object::Target(inner) => inner,
-            Object::StatisticsCookie(inner) => inner,
-            Object::Subscript(inner) => inner,
-            Object::Superscript(inner) => inner,
-            Object::Timestamp(inner) => inner,
-        }
-    }
-}
-
 impl<'s> StandardProperties<'s> for Bold<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
@@ -801,3 +766,37 @@ impl<'s> FootnoteReference<'s> {
         }
     }
 }
+
+impl<'s> StandardProperties<'s> for Object<'s> {
+    fn get_source<'b>(&'b self) -> &'s str {
+        match self {
+            Object::Bold(inner) => inner.get_source(),
+            Object::Italic(inner) => inner.get_source(),
+            Object::Underline(inner) => inner.get_source(),
+            Object::StrikeThrough(inner) => inner.get_source(),
+            Object::Code(inner) => inner.get_source(),
+            Object::Verbatim(inner) => inner.get_source(),
+            Object::PlainText(inner) => inner.get_source(),
+            Object::RegularLink(inner) => inner.get_source(),
+            Object::RadioLink(inner) => inner.get_source(),
+            Object::RadioTarget(inner) => inner.get_source(),
+            Object::PlainLink(inner) => inner.get_source(),
+            Object::AngleLink(inner) => inner.get_source(),
+            Object::OrgMacro(inner) => inner.get_source(),
+            Object::Entity(inner) => inner.get_source(),
+            Object::LatexFragment(inner) => inner.get_source(),
+            Object::ExportSnippet(inner) => inner.get_source(),
+            Object::FootnoteReference(inner) => inner.get_source(),
+            Object::Citation(inner) => inner.get_source(),
+            Object::CitationReference(inner) => inner.get_source(),
+            Object::InlineBabelCall(inner) => inner.get_source(),
+            Object::InlineSourceBlock(inner) => inner.get_source(),
+            Object::LineBreak(inner) => inner.get_source(),
+            Object::Target(inner) => inner.get_source(),
+            Object::StatisticsCookie(inner) => inner.get_source(),
+            Object::Subscript(inner) => inner.get_source(),
+            Object::Superscript(inner) => inner.get_source(),
+            Object::Timestamp(inner) => inner.get_source(),
+        }
+    }
+}

From 6c197c376a419225d507bea9d049272d4109c693 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 21:38:09 -0400
Subject: [PATCH 04/78] Add todo implementations of the new standard property
 functions.

---
 src/compare/diff.rs              |   6 +-
 src/parser/lesser_block.rs       |   6 +-
 src/types/ast_node.rs            | 126 ++++++++++++++
 src/types/document.rs            |  38 +++++
 src/types/element.rs             |  58 +++++++
 src/types/greater_element.rs     |  96 +++++++++++
 src/types/lesser_element.rs      | 146 +++++++++++++++-
 src/types/object.rs              | 280 +++++++++++++++++++++++++++++++
 src/types/standard_properties.rs |  16 +-
 9 files changed, 749 insertions(+), 23 deletions(-)

diff --git a/src/compare/diff.rs b/src/compare/diff.rs
index 3b7a382..6475a05 100644
--- a/src/compare/diff.rs
+++ b/src/compare/diff.rs
@@ -1575,7 +1575,7 @@ fn compare_example_block<'b, 's>(
         [],
         (
             EmacsField::Required(":value"),
-            |r| Some(r.get_contents()),
+            |r| Some(r.get_value()),
             compare_property_quoted_string
         ),
         (
@@ -1653,7 +1653,7 @@ fn compare_export_block<'b, 's>(
         ),
         (
             EmacsField::Required(":value"),
-            |r| Some(r.get_contents()),
+            |r| Some(r.get_value()),
             compare_property_quoted_string
         )
     ) {
@@ -1701,7 +1701,7 @@ fn compare_src_block<'b, 's>(
         ),
         (
             EmacsField::Required(":value"),
-            |r| Some(r.get_contents()),
+            |r| Some(r.get_value()),
             compare_property_quoted_string
         ),
         (
diff --git a/src/parser/lesser_block.rs b/src/parser/lesser_block.rs
index 1241cf2..a09ce0d 100644
--- a/src/parser/lesser_block.rs
+++ b/src/parser/lesser_block.rs
@@ -236,7 +236,7 @@ where
             retain_labels,
             use_labels,
             label_format,
-            contents: Into::<&str>::into(contents),
+            value: Into::<&str>::into(contents),
         },
     ))
 }
@@ -292,7 +292,7 @@ where
             ),
             export_type: export_type.map(Into::<&str>::into),
             data: parameters.map(Into::<&str>::into),
-            contents: Into::<&str>::into(contents),
+            value: Into::<&str>::into(contents),
         },
     ))
 }
@@ -371,7 +371,7 @@ where
             retain_labels,
             use_labels,
             label_format,
-            contents: Into::<&str>::into(contents),
+            value: Into::<&str>::into(contents),
         },
     ))
 }
diff --git a/src/types/ast_node.rs b/src/types/ast_node.rs
index 026931a..75749d3 100644
--- a/src/types/ast_node.rs
+++ b/src/types/ast_node.rs
@@ -322,4 +322,130 @@ impl<'r, 's> StandardProperties<'s> for AstNode<'r, 's> {
             AstNode::Timestamp(inner) => inner.get_source(),
         }
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        match self {
+            AstNode::Document(inner) => inner.get_contents(),
+            AstNode::Heading(inner) => inner.get_contents(),
+            AstNode::Section(inner) => inner.get_contents(),
+            AstNode::Paragraph(inner) => inner.get_contents(),
+            AstNode::PlainList(inner) => inner.get_contents(),
+            AstNode::PlainListItem(inner) => inner.get_contents(),
+            AstNode::CenterBlock(inner) => inner.get_contents(),
+            AstNode::QuoteBlock(inner) => inner.get_contents(),
+            AstNode::SpecialBlock(inner) => inner.get_contents(),
+            AstNode::DynamicBlock(inner) => inner.get_contents(),
+            AstNode::FootnoteDefinition(inner) => inner.get_contents(),
+            AstNode::Comment(inner) => inner.get_contents(),
+            AstNode::Drawer(inner) => inner.get_contents(),
+            AstNode::PropertyDrawer(inner) => inner.get_contents(),
+            AstNode::NodeProperty(inner) => inner.get_contents(),
+            AstNode::Table(inner) => inner.get_contents(),
+            AstNode::TableRow(inner) => inner.get_contents(),
+            AstNode::VerseBlock(inner) => inner.get_contents(),
+            AstNode::CommentBlock(inner) => inner.get_contents(),
+            AstNode::ExampleBlock(inner) => inner.get_contents(),
+            AstNode::ExportBlock(inner) => inner.get_contents(),
+            AstNode::SrcBlock(inner) => inner.get_contents(),
+            AstNode::Clock(inner) => inner.get_contents(),
+            AstNode::DiarySexp(inner) => inner.get_contents(),
+            AstNode::Planning(inner) => inner.get_contents(),
+            AstNode::FixedWidthArea(inner) => inner.get_contents(),
+            AstNode::HorizontalRule(inner) => inner.get_contents(),
+            AstNode::Keyword(inner) => inner.get_contents(),
+            AstNode::BabelCall(inner) => inner.get_contents(),
+            AstNode::LatexEnvironment(inner) => inner.get_contents(),
+            AstNode::Bold(inner) => inner.get_contents(),
+            AstNode::Italic(inner) => inner.get_contents(),
+            AstNode::Underline(inner) => inner.get_contents(),
+            AstNode::StrikeThrough(inner) => inner.get_contents(),
+            AstNode::Code(inner) => inner.get_contents(),
+            AstNode::Verbatim(inner) => inner.get_contents(),
+            AstNode::PlainText(inner) => inner.get_contents(),
+            AstNode::RegularLink(inner) => inner.get_contents(),
+            AstNode::RadioLink(inner) => inner.get_contents(),
+            AstNode::RadioTarget(inner) => inner.get_contents(),
+            AstNode::PlainLink(inner) => inner.get_contents(),
+            AstNode::AngleLink(inner) => inner.get_contents(),
+            AstNode::OrgMacro(inner) => inner.get_contents(),
+            AstNode::Entity(inner) => inner.get_contents(),
+            AstNode::LatexFragment(inner) => inner.get_contents(),
+            AstNode::ExportSnippet(inner) => inner.get_contents(),
+            AstNode::FootnoteReference(inner) => inner.get_contents(),
+            AstNode::Citation(inner) => inner.get_contents(),
+            AstNode::CitationReference(inner) => inner.get_contents(),
+            AstNode::InlineBabelCall(inner) => inner.get_contents(),
+            AstNode::InlineSourceBlock(inner) => inner.get_contents(),
+            AstNode::LineBreak(inner) => inner.get_contents(),
+            AstNode::Target(inner) => inner.get_contents(),
+            AstNode::StatisticsCookie(inner) => inner.get_contents(),
+            AstNode::Subscript(inner) => inner.get_contents(),
+            AstNode::Superscript(inner) => inner.get_contents(),
+            AstNode::TableCell(inner) => inner.get_contents(),
+            AstNode::Timestamp(inner) => inner.get_contents(),
+        }
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        match self {
+            AstNode::Document(inner) => inner.get_post_blank(),
+            AstNode::Heading(inner) => inner.get_post_blank(),
+            AstNode::Section(inner) => inner.get_post_blank(),
+            AstNode::Paragraph(inner) => inner.get_post_blank(),
+            AstNode::PlainList(inner) => inner.get_post_blank(),
+            AstNode::PlainListItem(inner) => inner.get_post_blank(),
+            AstNode::CenterBlock(inner) => inner.get_post_blank(),
+            AstNode::QuoteBlock(inner) => inner.get_post_blank(),
+            AstNode::SpecialBlock(inner) => inner.get_post_blank(),
+            AstNode::DynamicBlock(inner) => inner.get_post_blank(),
+            AstNode::FootnoteDefinition(inner) => inner.get_post_blank(),
+            AstNode::Comment(inner) => inner.get_post_blank(),
+            AstNode::Drawer(inner) => inner.get_post_blank(),
+            AstNode::PropertyDrawer(inner) => inner.get_post_blank(),
+            AstNode::NodeProperty(inner) => inner.get_post_blank(),
+            AstNode::Table(inner) => inner.get_post_blank(),
+            AstNode::TableRow(inner) => inner.get_post_blank(),
+            AstNode::VerseBlock(inner) => inner.get_post_blank(),
+            AstNode::CommentBlock(inner) => inner.get_post_blank(),
+            AstNode::ExampleBlock(inner) => inner.get_post_blank(),
+            AstNode::ExportBlock(inner) => inner.get_post_blank(),
+            AstNode::SrcBlock(inner) => inner.get_post_blank(),
+            AstNode::Clock(inner) => inner.get_post_blank(),
+            AstNode::DiarySexp(inner) => inner.get_post_blank(),
+            AstNode::Planning(inner) => inner.get_post_blank(),
+            AstNode::FixedWidthArea(inner) => inner.get_post_blank(),
+            AstNode::HorizontalRule(inner) => inner.get_post_blank(),
+            AstNode::Keyword(inner) => inner.get_post_blank(),
+            AstNode::BabelCall(inner) => inner.get_post_blank(),
+            AstNode::LatexEnvironment(inner) => inner.get_post_blank(),
+            AstNode::Bold(inner) => inner.get_post_blank(),
+            AstNode::Italic(inner) => inner.get_post_blank(),
+            AstNode::Underline(inner) => inner.get_post_blank(),
+            AstNode::StrikeThrough(inner) => inner.get_post_blank(),
+            AstNode::Code(inner) => inner.get_post_blank(),
+            AstNode::Verbatim(inner) => inner.get_post_blank(),
+            AstNode::PlainText(inner) => inner.get_post_blank(),
+            AstNode::RegularLink(inner) => inner.get_post_blank(),
+            AstNode::RadioLink(inner) => inner.get_post_blank(),
+            AstNode::RadioTarget(inner) => inner.get_post_blank(),
+            AstNode::PlainLink(inner) => inner.get_post_blank(),
+            AstNode::AngleLink(inner) => inner.get_post_blank(),
+            AstNode::OrgMacro(inner) => inner.get_post_blank(),
+            AstNode::Entity(inner) => inner.get_post_blank(),
+            AstNode::LatexFragment(inner) => inner.get_post_blank(),
+            AstNode::ExportSnippet(inner) => inner.get_post_blank(),
+            AstNode::FootnoteReference(inner) => inner.get_post_blank(),
+            AstNode::Citation(inner) => inner.get_post_blank(),
+            AstNode::CitationReference(inner) => inner.get_post_blank(),
+            AstNode::InlineBabelCall(inner) => inner.get_post_blank(),
+            AstNode::InlineSourceBlock(inner) => inner.get_post_blank(),
+            AstNode::LineBreak(inner) => inner.get_post_blank(),
+            AstNode::Target(inner) => inner.get_post_blank(),
+            AstNode::StatisticsCookie(inner) => inner.get_post_blank(),
+            AstNode::Subscript(inner) => inner.get_post_blank(),
+            AstNode::Superscript(inner) => inner.get_post_blank(),
+            AstNode::TableCell(inner) => inner.get_post_blank(),
+            AstNode::Timestamp(inner) => inner.get_post_blank(),
+        }
+    }
 }
diff --git a/src/types/document.rs b/src/types/document.rs
index 8328b72..ccb468a 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -57,18 +57,42 @@ impl<'s> StandardProperties<'s> for Document<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Section<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Heading<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> Heading<'s> {
@@ -126,4 +150,18 @@ impl<'s> StandardProperties<'s> for DocumentElement<'s> {
             DocumentElement::Section(inner) => inner.get_source(),
         }
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        match self {
+            DocumentElement::Heading(inner) => inner.get_contents(),
+            DocumentElement::Section(inner) => inner.get_contents(),
+        }
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        match self {
+            DocumentElement::Heading(inner) => inner.get_post_blank(),
+            DocumentElement::Section(inner) => inner.get_post_blank(),
+        }
+    }
 }
diff --git a/src/types/element.rs b/src/types/element.rs
index c079f6b..49e54d1 100644
--- a/src/types/element.rs
+++ b/src/types/element.rs
@@ -82,4 +82,62 @@ impl<'s> StandardProperties<'s> for Element<'s> {
             Element::LatexEnvironment(inner) => inner.get_source(),
         }
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        match self {
+            Element::Paragraph(inner) => inner.get_contents(),
+            Element::PlainList(inner) => inner.get_contents(),
+            Element::CenterBlock(inner) => inner.get_contents(),
+            Element::QuoteBlock(inner) => inner.get_contents(),
+            Element::SpecialBlock(inner) => inner.get_contents(),
+            Element::DynamicBlock(inner) => inner.get_contents(),
+            Element::FootnoteDefinition(inner) => inner.get_contents(),
+            Element::Comment(inner) => inner.get_contents(),
+            Element::Drawer(inner) => inner.get_contents(),
+            Element::PropertyDrawer(inner) => inner.get_contents(),
+            Element::Table(inner) => inner.get_contents(),
+            Element::VerseBlock(inner) => inner.get_contents(),
+            Element::CommentBlock(inner) => inner.get_contents(),
+            Element::ExampleBlock(inner) => inner.get_contents(),
+            Element::ExportBlock(inner) => inner.get_contents(),
+            Element::SrcBlock(inner) => inner.get_contents(),
+            Element::Clock(inner) => inner.get_contents(),
+            Element::DiarySexp(inner) => inner.get_contents(),
+            Element::Planning(inner) => inner.get_contents(),
+            Element::FixedWidthArea(inner) => inner.get_contents(),
+            Element::HorizontalRule(inner) => inner.get_contents(),
+            Element::Keyword(inner) => inner.get_contents(),
+            Element::BabelCall(inner) => inner.get_contents(),
+            Element::LatexEnvironment(inner) => inner.get_contents(),
+        }
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        match self {
+            Element::Paragraph(inner) => inner.get_post_blank(),
+            Element::PlainList(inner) => inner.get_post_blank(),
+            Element::CenterBlock(inner) => inner.get_post_blank(),
+            Element::QuoteBlock(inner) => inner.get_post_blank(),
+            Element::SpecialBlock(inner) => inner.get_post_blank(),
+            Element::DynamicBlock(inner) => inner.get_post_blank(),
+            Element::FootnoteDefinition(inner) => inner.get_post_blank(),
+            Element::Comment(inner) => inner.get_post_blank(),
+            Element::Drawer(inner) => inner.get_post_blank(),
+            Element::PropertyDrawer(inner) => inner.get_post_blank(),
+            Element::Table(inner) => inner.get_post_blank(),
+            Element::VerseBlock(inner) => inner.get_post_blank(),
+            Element::CommentBlock(inner) => inner.get_post_blank(),
+            Element::ExampleBlock(inner) => inner.get_post_blank(),
+            Element::ExportBlock(inner) => inner.get_post_blank(),
+            Element::SrcBlock(inner) => inner.get_post_blank(),
+            Element::Clock(inner) => inner.get_post_blank(),
+            Element::DiarySexp(inner) => inner.get_post_blank(),
+            Element::Planning(inner) => inner.get_post_blank(),
+            Element::FixedWidthArea(inner) => inner.get_post_blank(),
+            Element::HorizontalRule(inner) => inner.get_post_blank(),
+            Element::Keyword(inner) => inner.get_post_blank(),
+            Element::BabelCall(inner) => inner.get_post_blank(),
+            Element::LatexEnvironment(inner) => inner.get_post_blank(),
+        }
+    }
 }
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index e058b42..f459537 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -131,72 +131,168 @@ impl<'s> StandardProperties<'s> for PlainList<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for PlainListItem<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for CenterBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for QuoteBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for SpecialBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for DynamicBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for FootnoteDefinition<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Drawer<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for PropertyDrawer<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for NodeProperty<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Table<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for TableRow<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> PlainListItem<'s> {
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 41097e4..3241a98 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -75,7 +75,7 @@ pub struct ExampleBlock<'s> {
     pub retain_labels: RetainLabels,
     pub use_labels: bool,
     pub label_format: Option<&'s str>,
-    pub contents: &'s str,
+    pub value: &'s str,
 }
 
 #[derive(Debug)]
@@ -84,7 +84,7 @@ pub struct ExportBlock<'s> {
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub export_type: Option<&'s str>,
     pub data: Option<&'s str>,
-    pub contents: &'s str,
+    pub value: &'s str,
 }
 
 #[derive(Debug)]
@@ -99,7 +99,7 @@ pub struct SrcBlock<'s> {
     pub retain_labels: RetainLabels,
     pub use_labels: bool,
     pub label_format: Option<&'s str>,
-    pub contents: &'s str,
+    pub value: &'s str,
 }
 
 #[derive(Debug)]
@@ -198,92 +198,220 @@ impl<'s> StandardProperties<'s> for Paragraph<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for TableCell<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Comment<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for VerseBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 impl<'s> StandardProperties<'s> for CommentBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 impl<'s> StandardProperties<'s> for ExampleBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 impl<'s> StandardProperties<'s> for ExportBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 impl<'s> StandardProperties<'s> for SrcBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Clock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for DiarySexp<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Planning<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for FixedWidthArea<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for HorizontalRule<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Keyword<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for BabelCall<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for LatexEnvironment<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> Comment<'s> {
@@ -312,8 +440,8 @@ impl<'s> FixedWidthArea<'s> {
 
 impl<'s> ExampleBlock<'s> {
     /// Gets the contents of the lesser block, handling the escaping of lines with leading commas.
-    pub fn get_contents(&self) -> Cow<'s, str> {
-        lesser_block_content(self.contents).expect("This parser should never fail.")
+    pub fn get_value(&self) -> Cow<'s, str> {
+        lesser_block_content(self.value).expect("This parser should never fail.")
     }
 }
 
@@ -326,15 +454,15 @@ impl<'s> ExportBlock<'s> {
     }
 
     /// Gets the contents of the lesser block, handling the escaping of lines with leading commas.
-    pub fn get_contents(&self) -> Cow<'s, str> {
-        lesser_block_content(self.contents).expect("This parser should never fail.")
+    pub fn get_value(&self) -> Cow<'s, str> {
+        lesser_block_content(self.value).expect("This parser should never fail.")
     }
 }
 
 impl<'s> SrcBlock<'s> {
     /// Gets the contents of the lesser block, handling the escaping of lines with leading commas.
-    pub fn get_contents(&self) -> Cow<'s, str> {
-        lesser_block_content(self.contents).expect("This parser should never fail.")
+    pub fn get_value(&self) -> Cow<'s, str> {
+        lesser_block_content(self.value).expect("This parser should never fail.")
     }
 }
 
diff --git a/src/types/object.rs b/src/types/object.rs
index 9f38eb6..87a23b6 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -518,162 +518,378 @@ impl<'s> StandardProperties<'s> for Bold<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Italic<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Underline<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for StrikeThrough<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Code<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Verbatim<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for RegularLink<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for RadioLink<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for RadioTarget<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for PlainLink<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for AngleLink<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for OrgMacro<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Entity<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for LatexFragment<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for ExportSnippet<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for FootnoteReference<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Citation<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for CitationReference<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for InlineBabelCall<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for InlineSourceBlock<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for LineBreak<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Target<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for StatisticsCookie<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Subscript<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Superscript<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for Timestamp<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> StandardProperties<'s> for PlainText<'s> {
     fn get_source<'b>(&'b self) -> &'s str {
         self.source
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        todo!()
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        todo!()
+    }
 }
 
 impl<'s> Timestamp<'s> {
@@ -799,4 +1015,68 @@ impl<'s> StandardProperties<'s> for Object<'s> {
             Object::Timestamp(inner) => inner.get_source(),
         }
     }
+
+    fn get_contents(&'s self) -> &'s str {
+        match self {
+            Object::Bold(inner) => inner.get_contents(),
+            Object::Italic(inner) => inner.get_contents(),
+            Object::Underline(inner) => inner.get_contents(),
+            Object::StrikeThrough(inner) => inner.get_contents(),
+            Object::Code(inner) => inner.get_contents(),
+            Object::Verbatim(inner) => inner.get_contents(),
+            Object::PlainText(inner) => inner.get_contents(),
+            Object::RegularLink(inner) => inner.get_contents(),
+            Object::RadioLink(inner) => inner.get_contents(),
+            Object::RadioTarget(inner) => inner.get_contents(),
+            Object::PlainLink(inner) => inner.get_contents(),
+            Object::AngleLink(inner) => inner.get_contents(),
+            Object::OrgMacro(inner) => inner.get_contents(),
+            Object::Entity(inner) => inner.get_contents(),
+            Object::LatexFragment(inner) => inner.get_contents(),
+            Object::ExportSnippet(inner) => inner.get_contents(),
+            Object::FootnoteReference(inner) => inner.get_contents(),
+            Object::Citation(inner) => inner.get_contents(),
+            Object::CitationReference(inner) => inner.get_contents(),
+            Object::InlineBabelCall(inner) => inner.get_contents(),
+            Object::InlineSourceBlock(inner) => inner.get_contents(),
+            Object::LineBreak(inner) => inner.get_contents(),
+            Object::Target(inner) => inner.get_contents(),
+            Object::StatisticsCookie(inner) => inner.get_contents(),
+            Object::Subscript(inner) => inner.get_contents(),
+            Object::Superscript(inner) => inner.get_contents(),
+            Object::Timestamp(inner) => inner.get_contents(),
+        }
+    }
+
+    fn get_post_blank<'b>(&'b self) -> &'s str {
+        match self {
+            Object::Bold(inner) => inner.get_post_blank(),
+            Object::Italic(inner) => inner.get_post_blank(),
+            Object::Underline(inner) => inner.get_post_blank(),
+            Object::StrikeThrough(inner) => inner.get_post_blank(),
+            Object::Code(inner) => inner.get_post_blank(),
+            Object::Verbatim(inner) => inner.get_post_blank(),
+            Object::PlainText(inner) => inner.get_post_blank(),
+            Object::RegularLink(inner) => inner.get_post_blank(),
+            Object::RadioLink(inner) => inner.get_post_blank(),
+            Object::RadioTarget(inner) => inner.get_post_blank(),
+            Object::PlainLink(inner) => inner.get_post_blank(),
+            Object::AngleLink(inner) => inner.get_post_blank(),
+            Object::OrgMacro(inner) => inner.get_post_blank(),
+            Object::Entity(inner) => inner.get_post_blank(),
+            Object::LatexFragment(inner) => inner.get_post_blank(),
+            Object::ExportSnippet(inner) => inner.get_post_blank(),
+            Object::FootnoteReference(inner) => inner.get_post_blank(),
+            Object::Citation(inner) => inner.get_post_blank(),
+            Object::CitationReference(inner) => inner.get_post_blank(),
+            Object::InlineBabelCall(inner) => inner.get_post_blank(),
+            Object::InlineSourceBlock(inner) => inner.get_post_blank(),
+            Object::LineBreak(inner) => inner.get_post_blank(),
+            Object::Target(inner) => inner.get_post_blank(),
+            Object::StatisticsCookie(inner) => inner.get_post_blank(),
+            Object::Subscript(inner) => inner.get_post_blank(),
+            Object::Superscript(inner) => inner.get_post_blank(),
+            Object::Timestamp(inner) => inner.get_post_blank(),
+        }
+    }
 }
diff --git a/src/types/standard_properties.rs b/src/types/standard_properties.rs
index 4cd195a..e2ecc62 100644
--- a/src/types/standard_properties.rs
+++ b/src/types/standard_properties.rs
@@ -5,15 +5,15 @@ pub trait StandardProperties<'s> {
     /// This corresponds to :begin to :end in upstream org-mode's standard properties.
     fn get_source<'b>(&'b self) -> &'s str;
 
-    // Get the slice of the AST node's contents.
-    //
-    // This corresponds to :contents-begin to :contents-end
-    // fn get_contents(&'s self) -> &'s str;
+    /// Get the slice of the AST node's contents.
+    ///
+    /// This corresponds to :contents-begin to :contents-end
+    fn get_contents(&'s self) -> &'s str;
 
-    // Get the slice of the AST node's post-blank text.
-    //
-    // This is optional whitespace following the node.
-    // fn get_post_blank<'b>(&'b self) -> &'s str;
+    /// Get the slice of the AST node's post-blank text.
+    ///
+    /// This is optional whitespace following the node.
+    fn get_post_blank<'b>(&'b self) -> &'s str;
 }
 
 // TODO: Write some debugging code to alert when any of the unknown fields below are non-nil in our test data so we can see what these fields represent.

From 33f4614d2884765c018bba11e8487e1342efa373 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 21:59:58 -0400
Subject: [PATCH 05/78] Make get_rust_byte_offsets more generic so it can be
 used for contents.

---
 src/compare/util.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index 61eb97f..91ccaea 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -29,14 +29,10 @@ fn is_slice_of(parent: &str, child: &str) -> bool {
 /// Get the byte offset into source that the rust object exists at.
 ///
 /// These offsets are zero-based unlike the elisp ones.
-fn get_rust_byte_offsets<'b, 's, S: StandardProperties<'s> + ?Sized>(
-    original_document: &'s str,
-    rust_ast_node: &'b S,
-) -> (usize, usize) {
-    let rust_object_source = rust_ast_node.get_source();
-    debug_assert!(is_slice_of(original_document, rust_object_source));
-    let offset = rust_object_source.as_ptr() as usize - original_document.as_ptr() as usize;
-    let end = offset + rust_object_source.len();
+fn get_rust_byte_offsets<'b, 's>(original_document: &'s str, subset: &'b str) -> (usize, usize) {
+    debug_assert!(is_slice_of(original_document, subset));
+    let offset = subset.as_ptr() as usize - original_document.as_ptr() as usize;
+    let end = offset + subset.len();
     (offset, end)
 }
 
@@ -54,7 +50,7 @@ pub(crate) fn compare_standard_properties<
     Ok(())
 }
 
-pub(crate) fn assert_name<S: AsRef<str>>(
+fn assert_name<S: AsRef<str>>(
     emacs: &Token<'_>,
     name: S,
 ) -> Result<(), Box<dyn std::error::Error>> {
@@ -77,7 +73,7 @@ pub(crate) fn assert_name<S: AsRef<str>>(
 /// Assert that the character ranges defined by upstream org-mode's :standard-properties match the slices in Organic's StandardProperties.
 ///
 /// This does **not** handle plain text because plain text is a special case.
-pub(crate) fn assert_bounds<'b, 's, S: StandardProperties<'s> + ?Sized>(
+fn assert_bounds<'b, 's, S: StandardProperties<'s> + ?Sized>(
     original_document: &'s str,
     emacs: &'b Token<'s>,
     rust: &'b S,
@@ -89,7 +85,7 @@ pub(crate) fn assert_bounds<'b, 's, S: StandardProperties<'s> + ?Sized>(
             .ok_or("Token should have a begin.")?,
         standard_properties.end.ok_or("Token should have an end.")?,
     );
-    let (rust_begin, rust_end) = get_rust_byte_offsets(original_document, rust); // 0-based
+    let (rust_begin, rust_end) = get_rust_byte_offsets(original_document, rust.get_source()); // 0-based
     let rust_begin_char_offset = original_document[..rust_begin].chars().count() + 1; // 1-based
     let rust_end_char_offset =
         rust_begin_char_offset + original_document[rust_begin..rust_end].chars().count(); // 1-based

From 92592104a424d0fbe2a5584dfd1c0c84cf15573e Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 22:10:19 -0400
Subject: [PATCH 06/78] Compare contents begin/end.

---
 src/compare/util.rs              | 47 ++++++++++++++++++++-------
 src/types/ast_node.rs            |  2 +-
 src/types/document.rs            |  8 ++---
 src/types/element.rs             |  2 +-
 src/types/greater_element.rs     | 24 +++++++-------
 src/types/lesser_element.rs      | 32 +++++++++---------
 src/types/object.rs              | 56 ++++++++++++++++----------------
 src/types/standard_properties.rs |  2 +-
 8 files changed, 98 insertions(+), 75 deletions(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index 91ccaea..f55a9a3 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -79,18 +79,41 @@ fn assert_bounds<'b, 's, S: StandardProperties<'s> + ?Sized>(
     rust: &'b S,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let standard_properties = get_emacs_standard_properties(emacs)?; // 1-based
-    let (begin, end) = (
-        standard_properties
-            .begin
-            .ok_or("Token should have a begin.")?,
-        standard_properties.end.ok_or("Token should have an end.")?,
-    );
-    let (rust_begin, rust_end) = get_rust_byte_offsets(original_document, rust.get_source()); // 0-based
-    let rust_begin_char_offset = original_document[..rust_begin].chars().count() + 1; // 1-based
-    let rust_end_char_offset =
-        rust_begin_char_offset + original_document[rust_begin..rust_end].chars().count(); // 1-based
-    if rust_begin_char_offset != begin || rust_end_char_offset != end {
-        Err(format!("Rust bounds (in chars) ({rust_begin}, {rust_end}) do not match emacs bounds ({emacs_begin}, {emacs_end})", rust_begin = rust_begin_char_offset, rust_end = rust_end_char_offset, emacs_begin=begin, emacs_end=end))?;
+
+    // Check begin/end
+    {
+        let (begin, end) = (
+            standard_properties
+                .begin
+                .ok_or("Token should have a begin.")?,
+            standard_properties.end.ok_or("Token should have an end.")?,
+        );
+        let (rust_begin, rust_end) = get_rust_byte_offsets(original_document, rust.get_source()); // 0-based
+        let rust_begin_char_offset = original_document[..rust_begin].chars().count() + 1; // 1-based
+        let rust_end_char_offset =
+            rust_begin_char_offset + original_document[rust_begin..rust_end].chars().count(); // 1-based
+        if rust_begin_char_offset != begin || rust_end_char_offset != end {
+            Err(format!("Rust bounds (in chars) ({rust_begin}, {rust_end}) do not match emacs bounds ({emacs_begin}, {emacs_end})", rust_begin = rust_begin_char_offset, rust_end = rust_end_char_offset, emacs_begin=begin, emacs_end=end))?;
+        }
+    }
+
+    // Check contents-begin/contents-end
+    {
+        let (begin, end) = (
+            standard_properties
+                .contents_begin
+                .ok_or("Token should have a begin.")?,
+            standard_properties
+                .contents_end
+                .ok_or("Token should have an end.")?,
+        );
+        let (rust_begin, rust_end) = get_rust_byte_offsets(original_document, rust.get_contents()); // 0-based
+        let rust_begin_char_offset = original_document[..rust_begin].chars().count() + 1; // 1-based
+        let rust_end_char_offset =
+            rust_begin_char_offset + original_document[rust_begin..rust_end].chars().count(); // 1-based
+        if rust_begin_char_offset != begin || rust_end_char_offset != end {
+            Err(format!("Rust bounds (in chars) ({rust_begin}, {rust_end}) do not match emacs bounds ({emacs_begin}, {emacs_end})", rust_begin = rust_begin_char_offset, rust_end = rust_end_char_offset, emacs_begin=begin, emacs_end=end))?;
+        }
     }
 
     Ok(())
diff --git a/src/types/ast_node.rs b/src/types/ast_node.rs
index 75749d3..d634723 100644
--- a/src/types/ast_node.rs
+++ b/src/types/ast_node.rs
@@ -323,7 +323,7 @@ impl<'r, 's> StandardProperties<'s> for AstNode<'r, 's> {
         }
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         match self {
             AstNode::Document(inner) => inner.get_contents(),
             AstNode::Heading(inner) => inner.get_contents(),
diff --git a/src/types/document.rs b/src/types/document.rs
index ccb468a..8c756c0 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -58,7 +58,7 @@ impl<'s> StandardProperties<'s> for Document<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -72,7 +72,7 @@ impl<'s> StandardProperties<'s> for Section<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -86,7 +86,7 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -151,7 +151,7 @@ impl<'s> StandardProperties<'s> for DocumentElement<'s> {
         }
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         match self {
             DocumentElement::Heading(inner) => inner.get_contents(),
             DocumentElement::Section(inner) => inner.get_contents(),
diff --git a/src/types/element.rs b/src/types/element.rs
index 49e54d1..8c3b03b 100644
--- a/src/types/element.rs
+++ b/src/types/element.rs
@@ -83,7 +83,7 @@ impl<'s> StandardProperties<'s> for Element<'s> {
         }
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         match self {
             Element::Paragraph(inner) => inner.get_contents(),
             Element::PlainList(inner) => inner.get_contents(),
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index f459537..f3e3fc3 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -132,7 +132,7 @@ impl<'s> StandardProperties<'s> for PlainList<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -146,7 +146,7 @@ impl<'s> StandardProperties<'s> for PlainListItem<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -160,7 +160,7 @@ impl<'s> StandardProperties<'s> for CenterBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -174,7 +174,7 @@ impl<'s> StandardProperties<'s> for QuoteBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -188,7 +188,7 @@ impl<'s> StandardProperties<'s> for SpecialBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -202,7 +202,7 @@ impl<'s> StandardProperties<'s> for DynamicBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -216,7 +216,7 @@ impl<'s> StandardProperties<'s> for FootnoteDefinition<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -230,7 +230,7 @@ impl<'s> StandardProperties<'s> for Drawer<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -244,7 +244,7 @@ impl<'s> StandardProperties<'s> for PropertyDrawer<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -258,7 +258,7 @@ impl<'s> StandardProperties<'s> for NodeProperty<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -272,7 +272,7 @@ impl<'s> StandardProperties<'s> for Table<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -286,7 +286,7 @@ impl<'s> StandardProperties<'s> for TableRow<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 3241a98..68a2b9d 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -199,7 +199,7 @@ impl<'s> StandardProperties<'s> for Paragraph<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -213,7 +213,7 @@ impl<'s> StandardProperties<'s> for TableCell<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -227,7 +227,7 @@ impl<'s> StandardProperties<'s> for Comment<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -241,7 +241,7 @@ impl<'s> StandardProperties<'s> for VerseBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -254,7 +254,7 @@ impl<'s> StandardProperties<'s> for CommentBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -267,7 +267,7 @@ impl<'s> StandardProperties<'s> for ExampleBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -280,7 +280,7 @@ impl<'s> StandardProperties<'s> for ExportBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -293,7 +293,7 @@ impl<'s> StandardProperties<'s> for SrcBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -307,7 +307,7 @@ impl<'s> StandardProperties<'s> for Clock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -321,7 +321,7 @@ impl<'s> StandardProperties<'s> for DiarySexp<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -335,7 +335,7 @@ impl<'s> StandardProperties<'s> for Planning<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -349,7 +349,7 @@ impl<'s> StandardProperties<'s> for FixedWidthArea<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -363,7 +363,7 @@ impl<'s> StandardProperties<'s> for HorizontalRule<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -377,7 +377,7 @@ impl<'s> StandardProperties<'s> for Keyword<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -391,7 +391,7 @@ impl<'s> StandardProperties<'s> for BabelCall<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -405,7 +405,7 @@ impl<'s> StandardProperties<'s> for LatexEnvironment<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
diff --git a/src/types/object.rs b/src/types/object.rs
index 87a23b6..ed7bf0e 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -519,7 +519,7 @@ impl<'s> StandardProperties<'s> for Bold<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -533,7 +533,7 @@ impl<'s> StandardProperties<'s> for Italic<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -547,7 +547,7 @@ impl<'s> StandardProperties<'s> for Underline<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -561,7 +561,7 @@ impl<'s> StandardProperties<'s> for StrikeThrough<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -575,7 +575,7 @@ impl<'s> StandardProperties<'s> for Code<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -589,7 +589,7 @@ impl<'s> StandardProperties<'s> for Verbatim<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -603,7 +603,7 @@ impl<'s> StandardProperties<'s> for RegularLink<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -617,7 +617,7 @@ impl<'s> StandardProperties<'s> for RadioLink<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -631,7 +631,7 @@ impl<'s> StandardProperties<'s> for RadioTarget<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -645,7 +645,7 @@ impl<'s> StandardProperties<'s> for PlainLink<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -659,7 +659,7 @@ impl<'s> StandardProperties<'s> for AngleLink<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -673,7 +673,7 @@ impl<'s> StandardProperties<'s> for OrgMacro<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -687,7 +687,7 @@ impl<'s> StandardProperties<'s> for Entity<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -701,7 +701,7 @@ impl<'s> StandardProperties<'s> for LatexFragment<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -715,7 +715,7 @@ impl<'s> StandardProperties<'s> for ExportSnippet<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -729,7 +729,7 @@ impl<'s> StandardProperties<'s> for FootnoteReference<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -743,7 +743,7 @@ impl<'s> StandardProperties<'s> for Citation<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -757,7 +757,7 @@ impl<'s> StandardProperties<'s> for CitationReference<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -771,7 +771,7 @@ impl<'s> StandardProperties<'s> for InlineBabelCall<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -785,7 +785,7 @@ impl<'s> StandardProperties<'s> for InlineSourceBlock<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -799,7 +799,7 @@ impl<'s> StandardProperties<'s> for LineBreak<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -813,7 +813,7 @@ impl<'s> StandardProperties<'s> for Target<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -827,7 +827,7 @@ impl<'s> StandardProperties<'s> for StatisticsCookie<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -841,7 +841,7 @@ impl<'s> StandardProperties<'s> for Subscript<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -855,7 +855,7 @@ impl<'s> StandardProperties<'s> for Superscript<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -869,7 +869,7 @@ impl<'s> StandardProperties<'s> for Timestamp<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -883,7 +883,7 @@ impl<'s> StandardProperties<'s> for PlainText<'s> {
         self.source
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         todo!()
     }
 
@@ -1016,7 +1016,7 @@ impl<'s> StandardProperties<'s> for Object<'s> {
         }
     }
 
-    fn get_contents(&'s self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> &'s str {
         match self {
             Object::Bold(inner) => inner.get_contents(),
             Object::Italic(inner) => inner.get_contents(),
diff --git a/src/types/standard_properties.rs b/src/types/standard_properties.rs
index e2ecc62..e11dc54 100644
--- a/src/types/standard_properties.rs
+++ b/src/types/standard_properties.rs
@@ -8,7 +8,7 @@ pub trait StandardProperties<'s> {
     /// Get the slice of the AST node's contents.
     ///
     /// This corresponds to :contents-begin to :contents-end
-    fn get_contents(&'s self) -> &'s str;
+    fn get_contents<'b>(&'b self) -> &'s str;
 
     /// Get the slice of the AST node's post-blank text.
     ///

From 49bc51ba898335fc95f7ec5c36853f6af40cd192 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 22:18:28 -0400
Subject: [PATCH 07/78] Compare post-blank.

---
 src/compare/util.rs | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index f55a9a3..903b26c 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -47,6 +47,7 @@ pub(crate) fn compare_standard_properties<
 ) -> Result<(), Box<dyn std::error::Error>> {
     assert_name(emacs, rust.get_elisp_fact().get_elisp_name())?;
     assert_bounds(original_document, emacs, rust)?;
+    assert_post_blank(emacs, rust)?;
     Ok(())
 }
 
@@ -112,13 +113,32 @@ fn assert_bounds<'b, 's, S: StandardProperties<'s> + ?Sized>(
         let rust_end_char_offset =
             rust_begin_char_offset + original_document[rust_begin..rust_end].chars().count(); // 1-based
         if rust_begin_char_offset != begin || rust_end_char_offset != end {
-            Err(format!("Rust bounds (in chars) ({rust_begin}, {rust_end}) do not match emacs bounds ({emacs_begin}, {emacs_end})", rust_begin = rust_begin_char_offset, rust_end = rust_end_char_offset, emacs_begin=begin, emacs_end=end))?;
+            Err(format!("Rust contents bounds (in chars) ({rust_begin}, {rust_end}) do not match emacs contents bounds ({emacs_begin}, {emacs_end})", rust_begin = rust_begin_char_offset, rust_end = rust_end_char_offset, emacs_begin=begin, emacs_end=end))?;
         }
     }
 
     Ok(())
 }
 
+/// Assert that the post blank matches between emacs and organic.
+///
+/// This does **not** handle plain text because plain text is a special case.
+fn assert_post_blank<'b, 's, S: StandardProperties<'s> + ?Sized>(
+    emacs: &'b Token<'s>,
+    rust: &'b S,
+) -> Result<(), Box<dyn std::error::Error>> {
+    let standard_properties = get_emacs_standard_properties(emacs)?; // 1-based
+    let rust_post_blank = rust.get_post_blank().chars().count();
+    let emacs_post_blank = standard_properties
+        .post_blank
+        .ok_or("Token should have a post-blank.")?;
+    if rust_post_blank != emacs_post_blank {
+        Err(format!("Rust post-blank (in chars) {rust_post_blank} does not match emacs post-blank ({emacs_post_blank})", rust_post_blank = rust_post_blank, emacs_post_blank = emacs_post_blank))?;
+    }
+
+    Ok(())
+}
+
 struct EmacsStandardProperties {
     begin: Option<usize>,
     #[allow(dead_code)]

From 31406fd520fa0ab328c043ce7dbde297508e6fe9 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 22:19:39 -0400
Subject: [PATCH 08/78] Fix clippy.

---
 src/compare/util.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index 903b26c..0a8b424 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -29,7 +29,7 @@ fn is_slice_of(parent: &str, child: &str) -> bool {
 /// Get the byte offset into source that the rust object exists at.
 ///
 /// These offsets are zero-based unlike the elisp ones.
-fn get_rust_byte_offsets<'b, 's>(original_document: &'s str, subset: &'b str) -> (usize, usize) {
+fn get_rust_byte_offsets(original_document: &str, subset: &str) -> (usize, usize) {
     debug_assert!(is_slice_of(original_document, subset));
     let offset = subset.as_ptr() as usize - original_document.as_ptr() as usize;
     let end = offset + subset.len();

From 90ba17b68ccecb16256bb459a7ce8edf6f8218c9 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 22:32:01 -0400
Subject: [PATCH 09/78] Switch to a numeric post-blank.

Turns out post-blank has different meanings to different object types so we need to return a number to properly do the compare.
---
 src/compare/util.rs              |  4 +--
 src/types/ast_node.rs            |  3 +-
 src/types/document.rs            |  9 ++---
 src/types/element.rs             |  3 +-
 src/types/greater_element.rs     | 25 +++++++-------
 src/types/lesser_element.rs      | 33 +++++++++---------
 src/types/mod.rs                 |  1 +
 src/types/object.rs              | 57 ++++++++++++++++----------------
 src/types/standard_properties.rs |  8 +++--
 9 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index 0a8b424..5e60021 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -128,11 +128,11 @@ fn assert_post_blank<'b, 's, S: StandardProperties<'s> + ?Sized>(
     rust: &'b S,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let standard_properties = get_emacs_standard_properties(emacs)?; // 1-based
-    let rust_post_blank = rust.get_post_blank().chars().count();
+    let rust_post_blank = rust.get_post_blank();
     let emacs_post_blank = standard_properties
         .post_blank
         .ok_or("Token should have a post-blank.")?;
-    if rust_post_blank != emacs_post_blank {
+    if rust_post_blank as usize != emacs_post_blank {
         Err(format!("Rust post-blank (in chars) {rust_post_blank} does not match emacs post-blank ({emacs_post_blank})", rust_post_blank = rust_post_blank, emacs_post_blank = emacs_post_blank))?;
     }
 
diff --git a/src/types/ast_node.rs b/src/types/ast_node.rs
index d634723..bd02c77 100644
--- a/src/types/ast_node.rs
+++ b/src/types/ast_node.rs
@@ -1,5 +1,6 @@
 use super::macros::to_ast_node;
 use super::CenterBlock;
+use super::PostBlank;
 use super::QuoteBlock;
 use super::SpecialBlock;
 use super::StandardProperties;
@@ -386,7 +387,7 @@ impl<'r, 's> StandardProperties<'s> for AstNode<'r, 's> {
         }
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         match self {
             AstNode::Document(inner) => inner.get_post_blank(),
             AstNode::Heading(inner) => inner.get_post_blank(),
diff --git a/src/types/document.rs b/src/types/document.rs
index 8c756c0..42b9754 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -3,6 +3,7 @@ use std::path::PathBuf;
 use super::Element;
 use super::NodeProperty;
 use super::Object;
+use super::PostBlank;
 use super::StandardProperties;
 use super::Timestamp;
 
@@ -62,7 +63,7 @@ impl<'s> StandardProperties<'s> for Document<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -76,7 +77,7 @@ impl<'s> StandardProperties<'s> for Section<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -90,7 +91,7 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -158,7 +159,7 @@ impl<'s> StandardProperties<'s> for DocumentElement<'s> {
         }
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         match self {
             DocumentElement::Heading(inner) => inner.get_post_blank(),
             DocumentElement::Section(inner) => inner.get_post_blank(),
diff --git a/src/types/element.rs b/src/types/element.rs
index 8c3b03b..4d34554 100644
--- a/src/types/element.rs
+++ b/src/types/element.rs
@@ -20,6 +20,7 @@ use super::lesser_element::SrcBlock;
 use super::lesser_element::VerseBlock;
 use super::CenterBlock;
 use super::Drawer;
+use super::PostBlank;
 use super::QuoteBlock;
 use super::SpecialBlock;
 use super::StandardProperties;
@@ -112,7 +113,7 @@ impl<'s> StandardProperties<'s> for Element<'s> {
         }
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         match self {
             Element::Paragraph(inner) => inner.get_post_blank(),
             Element::PlainList(inner) => inner.get_post_blank(),
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index f3e3fc3..c30d078 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -4,6 +4,7 @@ use super::lesser_element::TableCell;
 use super::AffiliatedKeywords;
 use super::Keyword;
 use super::Object;
+use super::PostBlank;
 use super::StandardProperties;
 
 #[derive(Debug)]
@@ -136,7 +137,7 @@ impl<'s> StandardProperties<'s> for PlainList<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -150,7 +151,7 @@ impl<'s> StandardProperties<'s> for PlainListItem<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -164,7 +165,7 @@ impl<'s> StandardProperties<'s> for CenterBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -178,7 +179,7 @@ impl<'s> StandardProperties<'s> for QuoteBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -192,7 +193,7 @@ impl<'s> StandardProperties<'s> for SpecialBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -206,7 +207,7 @@ impl<'s> StandardProperties<'s> for DynamicBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -220,7 +221,7 @@ impl<'s> StandardProperties<'s> for FootnoteDefinition<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -234,7 +235,7 @@ impl<'s> StandardProperties<'s> for Drawer<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -248,7 +249,7 @@ impl<'s> StandardProperties<'s> for PropertyDrawer<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -262,7 +263,7 @@ impl<'s> StandardProperties<'s> for NodeProperty<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -276,7 +277,7 @@ impl<'s> StandardProperties<'s> for Table<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -290,7 +291,7 @@ impl<'s> StandardProperties<'s> for TableRow<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 68a2b9d..7d6b2ad 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -16,6 +16,7 @@ use super::object::Object;
 use super::AffiliatedKeywords;
 use super::GetAffiliatedKeywords;
 use super::PlainText;
+use super::PostBlank;
 use super::StandardProperties;
 use super::Timestamp;
 use crate::error::CustomError;
@@ -203,7 +204,7 @@ impl<'s> StandardProperties<'s> for Paragraph<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -217,7 +218,7 @@ impl<'s> StandardProperties<'s> for TableCell<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -231,7 +232,7 @@ impl<'s> StandardProperties<'s> for Comment<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -245,7 +246,7 @@ impl<'s> StandardProperties<'s> for VerseBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -258,7 +259,7 @@ impl<'s> StandardProperties<'s> for CommentBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -271,7 +272,7 @@ impl<'s> StandardProperties<'s> for ExampleBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -284,7 +285,7 @@ impl<'s> StandardProperties<'s> for ExportBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -297,7 +298,7 @@ impl<'s> StandardProperties<'s> for SrcBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -311,7 +312,7 @@ impl<'s> StandardProperties<'s> for Clock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -325,7 +326,7 @@ impl<'s> StandardProperties<'s> for DiarySexp<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -339,7 +340,7 @@ impl<'s> StandardProperties<'s> for Planning<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -353,7 +354,7 @@ impl<'s> StandardProperties<'s> for FixedWidthArea<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -367,7 +368,7 @@ impl<'s> StandardProperties<'s> for HorizontalRule<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -381,7 +382,7 @@ impl<'s> StandardProperties<'s> for Keyword<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -395,7 +396,7 @@ impl<'s> StandardProperties<'s> for BabelCall<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -409,7 +410,7 @@ impl<'s> StandardProperties<'s> for LatexEnvironment<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
diff --git a/src/types/mod.rs b/src/types/mod.rs
index 7dad80b..e142dce 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -110,4 +110,5 @@ pub use object::WarningDelay;
 pub use object::WarningDelayType;
 pub use object::Year;
 pub use object::YearInner;
+pub use standard_properties::PostBlank;
 pub use standard_properties::StandardProperties;
diff --git a/src/types/object.rs b/src/types/object.rs
index ed7bf0e..b77d849 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -6,6 +6,7 @@ use super::util::coalesce_whitespace_if_line_break;
 use super::util::remove_line_break;
 use super::util::remove_whitespace_if_line_break;
 use super::util::to_lowercase;
+use super::PostBlank;
 use super::StandardProperties;
 
 #[derive(Debug)]
@@ -523,7 +524,7 @@ impl<'s> StandardProperties<'s> for Bold<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -537,7 +538,7 @@ impl<'s> StandardProperties<'s> for Italic<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -551,7 +552,7 @@ impl<'s> StandardProperties<'s> for Underline<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -565,7 +566,7 @@ impl<'s> StandardProperties<'s> for StrikeThrough<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -579,7 +580,7 @@ impl<'s> StandardProperties<'s> for Code<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -593,7 +594,7 @@ impl<'s> StandardProperties<'s> for Verbatim<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -607,7 +608,7 @@ impl<'s> StandardProperties<'s> for RegularLink<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -621,7 +622,7 @@ impl<'s> StandardProperties<'s> for RadioLink<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -635,7 +636,7 @@ impl<'s> StandardProperties<'s> for RadioTarget<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -649,7 +650,7 @@ impl<'s> StandardProperties<'s> for PlainLink<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -663,7 +664,7 @@ impl<'s> StandardProperties<'s> for AngleLink<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -677,7 +678,7 @@ impl<'s> StandardProperties<'s> for OrgMacro<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -691,7 +692,7 @@ impl<'s> StandardProperties<'s> for Entity<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -705,7 +706,7 @@ impl<'s> StandardProperties<'s> for LatexFragment<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -719,7 +720,7 @@ impl<'s> StandardProperties<'s> for ExportSnippet<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -733,7 +734,7 @@ impl<'s> StandardProperties<'s> for FootnoteReference<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -747,7 +748,7 @@ impl<'s> StandardProperties<'s> for Citation<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -761,7 +762,7 @@ impl<'s> StandardProperties<'s> for CitationReference<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -775,7 +776,7 @@ impl<'s> StandardProperties<'s> for InlineBabelCall<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -789,7 +790,7 @@ impl<'s> StandardProperties<'s> for InlineSourceBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -803,7 +804,7 @@ impl<'s> StandardProperties<'s> for LineBreak<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -817,7 +818,7 @@ impl<'s> StandardProperties<'s> for Target<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -831,7 +832,7 @@ impl<'s> StandardProperties<'s> for StatisticsCookie<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -845,7 +846,7 @@ impl<'s> StandardProperties<'s> for Subscript<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -859,7 +860,7 @@ impl<'s> StandardProperties<'s> for Superscript<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -873,7 +874,7 @@ impl<'s> StandardProperties<'s> for Timestamp<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -887,7 +888,7 @@ impl<'s> StandardProperties<'s> for PlainText<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         todo!()
     }
 }
@@ -1048,7 +1049,7 @@ impl<'s> StandardProperties<'s> for Object<'s> {
         }
     }
 
-    fn get_post_blank<'b>(&'b self) -> &'s str {
+    fn get_post_blank<'b>(&'b self) -> PostBlank {
         match self {
             Object::Bold(inner) => inner.get_post_blank(),
             Object::Italic(inner) => inner.get_post_blank(),
diff --git a/src/types/standard_properties.rs b/src/types/standard_properties.rs
index e11dc54..49b8844 100644
--- a/src/types/standard_properties.rs
+++ b/src/types/standard_properties.rs
@@ -10,10 +10,10 @@ pub trait StandardProperties<'s> {
     /// This corresponds to :contents-begin to :contents-end
     fn get_contents<'b>(&'b self) -> &'s str;
 
-    /// Get the slice of the AST node's post-blank text.
+    /// Get the ast node's post-blank.
     ///
-    /// This is optional whitespace following the node.
-    fn get_post_blank<'b>(&'b self) -> &'s str;
+    /// For objects this is a count of the characters of whitespace after the object. For elements this is a count of the line breaks following an element.
+    fn get_post_blank<'b>(&'b self) -> PostBlank;
 }
 
 // TODO: Write some debugging code to alert when any of the unknown fields below are non-nil in our test data so we can see what these fields represent.
@@ -61,3 +61,5 @@ pub trait StandardProperties<'s> {
 // X :parent - Some weird numeric reference to the containing object. Since we output a tree structure, I do not see any value in including this, especially considering the back-references would be a nightmare in rust.
 
 // Special case: Plain text. Plain text counts :begin and :end from the start of the text (so :begin is always 0 AFAICT) and instead of including the full set of standard properties, it only includes :begin, :end, and :parent.
+
+pub type PostBlank = u8;

From d2f2bdf88d1a03c1482a08e206e7adede1430ef4 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 22:41:45 -0400
Subject: [PATCH 10/78] Implement get_contents for footnote references.

---
 src/parser/footnote_reference.rs | 12 ++++---
 src/types/ast_node.rs            |  2 +-
 src/types/document.rs            |  8 ++---
 src/types/element.rs             |  2 +-
 src/types/greater_element.rs     | 24 ++++++-------
 src/types/lesser_element.rs      | 32 ++++++++---------
 src/types/object.rs              | 59 ++++++++++++++++----------------
 src/types/standard_properties.rs |  2 +-
 8 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/src/parser/footnote_reference.rs b/src/parser/footnote_reference.rs
index 2823ad7..d09522b 100644
--- a/src/parser/footnote_reference.rs
+++ b/src/parser/footnote_reference.rs
@@ -2,6 +2,7 @@ use nom::branch::alt;
 use nom::bytes::complete::tag;
 use nom::bytes::complete::tag_no_case;
 use nom::combinator::all_consuming;
+use nom::combinator::consumed;
 use nom::combinator::map_parser;
 use nom::combinator::verify;
 use nom::multi::many1;
@@ -59,7 +60,7 @@ fn anonymous_footnote<'b, 'g, 'r, 's>(
     let initial_context = ContextElement::document_context();
     let initial_context = Context::new(context.get_global_settings(), List::new(&initial_context));
 
-    let (remaining, children) = map_parser(
+    let (remaining, (contents, children)) = consumed(map_parser(
         verify(
             parser_with_context!(text_until_exit)(&parser_context),
             |text| text.len() > 0,
@@ -69,7 +70,7 @@ fn anonymous_footnote<'b, 'g, 'r, 's>(
                 &initial_context,
             )))(i)
         }),
-    )(remaining)?;
+    ))(remaining)?;
 
     let (remaining, _) = tag("]")(remaining)?;
 
@@ -80,6 +81,7 @@ fn anonymous_footnote<'b, 'g, 'r, 's>(
         remaining,
         FootnoteReference {
             source: source.into(),
+            contents: Some(contents.into()),
             label: None,
             definition: children,
         },
@@ -106,7 +108,7 @@ fn inline_footnote<'b, 'g, 'r, 's>(
     let initial_context = ContextElement::document_context();
     let initial_context = Context::new(context.get_global_settings(), List::new(&initial_context));
 
-    let (remaining, children) = map_parser(
+    let (remaining, (contents, children)) = consumed(map_parser(
         verify(
             parser_with_context!(text_until_exit)(&parser_context),
             |text| text.len() > 0,
@@ -116,7 +118,7 @@ fn inline_footnote<'b, 'g, 'r, 's>(
                 &initial_context,
             )))(i)
         }),
-    )(remaining)?;
+    ))(remaining)?;
 
     let (remaining, _) = tag("]")(remaining)?;
 
@@ -127,6 +129,7 @@ fn inline_footnote<'b, 'g, 'r, 's>(
         remaining,
         FootnoteReference {
             source: source.into(),
+            contents: Some(contents.into()),
             label: Some(label_contents.into()),
             definition: children,
         },
@@ -151,6 +154,7 @@ fn footnote_reference_only<'b, 'g, 'r, 's>(
         remaining,
         FootnoteReference {
             source: source.into(),
+            contents: None,
             label: Some(label_contents.into()),
             definition: Vec::with_capacity(0),
         },
diff --git a/src/types/ast_node.rs b/src/types/ast_node.rs
index bd02c77..8d40f13 100644
--- a/src/types/ast_node.rs
+++ b/src/types/ast_node.rs
@@ -324,7 +324,7 @@ impl<'r, 's> StandardProperties<'s> for AstNode<'r, 's> {
         }
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         match self {
             AstNode::Document(inner) => inner.get_contents(),
             AstNode::Heading(inner) => inner.get_contents(),
diff --git a/src/types/document.rs b/src/types/document.rs
index 42b9754..556dcec 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -59,7 +59,7 @@ impl<'s> StandardProperties<'s> for Document<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -73,7 +73,7 @@ impl<'s> StandardProperties<'s> for Section<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -87,7 +87,7 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -152,7 +152,7 @@ impl<'s> StandardProperties<'s> for DocumentElement<'s> {
         }
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         match self {
             DocumentElement::Heading(inner) => inner.get_contents(),
             DocumentElement::Section(inner) => inner.get_contents(),
diff --git a/src/types/element.rs b/src/types/element.rs
index 4d34554..ebfe7da 100644
--- a/src/types/element.rs
+++ b/src/types/element.rs
@@ -84,7 +84,7 @@ impl<'s> StandardProperties<'s> for Element<'s> {
         }
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         match self {
             Element::Paragraph(inner) => inner.get_contents(),
             Element::PlainList(inner) => inner.get_contents(),
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index c30d078..6521e16 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -133,7 +133,7 @@ impl<'s> StandardProperties<'s> for PlainList<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -147,7 +147,7 @@ impl<'s> StandardProperties<'s> for PlainListItem<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -161,7 +161,7 @@ impl<'s> StandardProperties<'s> for CenterBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -175,7 +175,7 @@ impl<'s> StandardProperties<'s> for QuoteBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -189,7 +189,7 @@ impl<'s> StandardProperties<'s> for SpecialBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -203,7 +203,7 @@ impl<'s> StandardProperties<'s> for DynamicBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -217,7 +217,7 @@ impl<'s> StandardProperties<'s> for FootnoteDefinition<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -231,7 +231,7 @@ impl<'s> StandardProperties<'s> for Drawer<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -245,7 +245,7 @@ impl<'s> StandardProperties<'s> for PropertyDrawer<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -259,7 +259,7 @@ impl<'s> StandardProperties<'s> for NodeProperty<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -273,7 +273,7 @@ impl<'s> StandardProperties<'s> for Table<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -287,7 +287,7 @@ impl<'s> StandardProperties<'s> for TableRow<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 7d6b2ad..71e9e70 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -200,7 +200,7 @@ impl<'s> StandardProperties<'s> for Paragraph<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -214,7 +214,7 @@ impl<'s> StandardProperties<'s> for TableCell<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -228,7 +228,7 @@ impl<'s> StandardProperties<'s> for Comment<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -242,7 +242,7 @@ impl<'s> StandardProperties<'s> for VerseBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -255,7 +255,7 @@ impl<'s> StandardProperties<'s> for CommentBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -268,7 +268,7 @@ impl<'s> StandardProperties<'s> for ExampleBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -281,7 +281,7 @@ impl<'s> StandardProperties<'s> for ExportBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -294,7 +294,7 @@ impl<'s> StandardProperties<'s> for SrcBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -308,7 +308,7 @@ impl<'s> StandardProperties<'s> for Clock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -322,7 +322,7 @@ impl<'s> StandardProperties<'s> for DiarySexp<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -336,7 +336,7 @@ impl<'s> StandardProperties<'s> for Planning<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -350,7 +350,7 @@ impl<'s> StandardProperties<'s> for FixedWidthArea<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -364,7 +364,7 @@ impl<'s> StandardProperties<'s> for HorizontalRule<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -378,7 +378,7 @@ impl<'s> StandardProperties<'s> for Keyword<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -392,7 +392,7 @@ impl<'s> StandardProperties<'s> for BabelCall<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -406,7 +406,7 @@ impl<'s> StandardProperties<'s> for LatexEnvironment<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
diff --git a/src/types/object.rs b/src/types/object.rs
index b77d849..df58910 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -192,6 +192,7 @@ pub struct ExportSnippet<'s> {
 #[derive(Debug)]
 pub struct FootnoteReference<'s> {
     pub source: &'s str,
+    pub contents: Option<&'s str>,
     pub label: Option<&'s str>,
     pub definition: Vec<Object<'s>>,
 }
@@ -520,7 +521,7 @@ impl<'s> StandardProperties<'s> for Bold<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -534,7 +535,7 @@ impl<'s> StandardProperties<'s> for Italic<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -548,7 +549,7 @@ impl<'s> StandardProperties<'s> for Underline<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -562,7 +563,7 @@ impl<'s> StandardProperties<'s> for StrikeThrough<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -576,7 +577,7 @@ impl<'s> StandardProperties<'s> for Code<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -590,7 +591,7 @@ impl<'s> StandardProperties<'s> for Verbatim<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -604,7 +605,7 @@ impl<'s> StandardProperties<'s> for RegularLink<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -618,7 +619,7 @@ impl<'s> StandardProperties<'s> for RadioLink<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -632,7 +633,7 @@ impl<'s> StandardProperties<'s> for RadioTarget<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -646,7 +647,7 @@ impl<'s> StandardProperties<'s> for PlainLink<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -660,7 +661,7 @@ impl<'s> StandardProperties<'s> for AngleLink<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -674,7 +675,7 @@ impl<'s> StandardProperties<'s> for OrgMacro<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -688,7 +689,7 @@ impl<'s> StandardProperties<'s> for Entity<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -702,7 +703,7 @@ impl<'s> StandardProperties<'s> for LatexFragment<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -716,7 +717,7 @@ impl<'s> StandardProperties<'s> for ExportSnippet<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -730,8 +731,8 @@ impl<'s> StandardProperties<'s> for FootnoteReference<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
-        todo!()
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
+        self.contents
     }
 
     fn get_post_blank<'b>(&'b self) -> PostBlank {
@@ -744,7 +745,7 @@ impl<'s> StandardProperties<'s> for Citation<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -758,7 +759,7 @@ impl<'s> StandardProperties<'s> for CitationReference<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -772,7 +773,7 @@ impl<'s> StandardProperties<'s> for InlineBabelCall<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -786,7 +787,7 @@ impl<'s> StandardProperties<'s> for InlineSourceBlock<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -800,7 +801,7 @@ impl<'s> StandardProperties<'s> for LineBreak<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -814,7 +815,7 @@ impl<'s> StandardProperties<'s> for Target<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -828,7 +829,7 @@ impl<'s> StandardProperties<'s> for StatisticsCookie<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -842,7 +843,7 @@ impl<'s> StandardProperties<'s> for Subscript<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -856,7 +857,7 @@ impl<'s> StandardProperties<'s> for Superscript<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -870,7 +871,7 @@ impl<'s> StandardProperties<'s> for Timestamp<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -884,7 +885,7 @@ impl<'s> StandardProperties<'s> for PlainText<'s> {
         self.source
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         todo!()
     }
 
@@ -1017,7 +1018,7 @@ impl<'s> StandardProperties<'s> for Object<'s> {
         }
     }
 
-    fn get_contents<'b>(&'b self) -> &'s str {
+    fn get_contents<'b>(&'b self) -> Option<&'s str> {
         match self {
             Object::Bold(inner) => inner.get_contents(),
             Object::Italic(inner) => inner.get_contents(),
diff --git a/src/types/standard_properties.rs b/src/types/standard_properties.rs
index 49b8844..9ec6b27 100644
--- a/src/types/standard_properties.rs
+++ b/src/types/standard_properties.rs
@@ -8,7 +8,7 @@ pub trait StandardProperties<'s> {
     /// Get the slice of the AST node's contents.
     ///
     /// This corresponds to :contents-begin to :contents-end
-    fn get_contents<'b>(&'b self) -> &'s str;
+    fn get_contents<'b>(&'b self) -> Option<&'s str>;
 
     /// Get the ast node's post-blank.
     ///

From 645d9abf9c1b2e68fd476495106c51f30b3a7db1 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 22:48:09 -0400
Subject: [PATCH 11/78] Support nil contents.

---
 src/compare/util.rs | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index 5e60021..1fa9daa 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -100,20 +100,28 @@ fn assert_bounds<'b, 's, S: StandardProperties<'s> + ?Sized>(
 
     // Check contents-begin/contents-end
     {
-        let (begin, end) = (
-            standard_properties
-                .contents_begin
-                .ok_or("Token should have a begin.")?,
-            standard_properties
-                .contents_end
-                .ok_or("Token should have an end.")?,
-        );
-        let (rust_begin, rust_end) = get_rust_byte_offsets(original_document, rust.get_contents()); // 0-based
-        let rust_begin_char_offset = original_document[..rust_begin].chars().count() + 1; // 1-based
-        let rust_end_char_offset =
-            rust_begin_char_offset + original_document[rust_begin..rust_end].chars().count(); // 1-based
-        if rust_begin_char_offset != begin || rust_end_char_offset != end {
-            Err(format!("Rust contents bounds (in chars) ({rust_begin}, {rust_end}) do not match emacs contents bounds ({emacs_begin}, {emacs_end})", rust_begin = rust_begin_char_offset, rust_end = rust_end_char_offset, emacs_begin=begin, emacs_end=end))?;
+        if let Some(rust_contents) = rust.get_contents() {
+            let (begin, end) = (
+                standard_properties
+                    .contents_begin
+                    .ok_or("Token should have a contents-begin.")?,
+                standard_properties
+                    .contents_end
+                    .ok_or("Token should have an contents-end.")?,
+            );
+            let (rust_begin, rust_end) = get_rust_byte_offsets(original_document, rust_contents); // 0-based
+            let rust_begin_char_offset = original_document[..rust_begin].chars().count() + 1; // 1-based
+            let rust_end_char_offset =
+                rust_begin_char_offset + original_document[rust_begin..rust_end].chars().count(); // 1-based
+            if rust_begin_char_offset != begin || rust_end_char_offset != end {
+                Err(format!("Rust contents bounds (in chars) ({rust_begin}, {rust_end}) do not match emacs contents bounds ({emacs_begin}, {emacs_end})", rust_begin = rust_begin_char_offset, rust_end = rust_end_char_offset, emacs_begin=begin, emacs_end=end))?;
+            }
+        } else {
+            if standard_properties.contents_begin.is_some()
+                || standard_properties.contents_end.is_some()
+            {
+                Err(format!("Rust contents is None but emacs contents bounds are ({emacs_begin:?}, {emacs_end:?})", emacs_begin=standard_properties.contents_begin, emacs_end=standard_properties.contents_end))?;
+            }
         }
     }
 

From b1773ac90ea38bf040daf8b939d4e9f26529fe94 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 22:57:11 -0400
Subject: [PATCH 12/78] Get post blank for footnote references.

---
 src/compare/util.rs              | 10 ++++------
 src/parser/footnote_reference.rs |  3 +++
 src/types/object.rs              |  7 ++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index 1fa9daa..e1df0db 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -116,12 +116,10 @@ fn assert_bounds<'b, 's, S: StandardProperties<'s> + ?Sized>(
             if rust_begin_char_offset != begin || rust_end_char_offset != end {
                 Err(format!("Rust contents bounds (in chars) ({rust_begin}, {rust_end}) do not match emacs contents bounds ({emacs_begin}, {emacs_end})", rust_begin = rust_begin_char_offset, rust_end = rust_end_char_offset, emacs_begin=begin, emacs_end=end))?;
             }
-        } else {
-            if standard_properties.contents_begin.is_some()
-                || standard_properties.contents_end.is_some()
-            {
-                Err(format!("Rust contents is None but emacs contents bounds are ({emacs_begin:?}, {emacs_end:?})", emacs_begin=standard_properties.contents_begin, emacs_end=standard_properties.contents_end))?;
-            }
+        } else if standard_properties.contents_begin.is_some()
+            || standard_properties.contents_end.is_some()
+        {
+            Err(format!("Rust contents is None but emacs contents bounds are ({emacs_begin:?}, {emacs_end:?})", emacs_begin=standard_properties.contents_begin, emacs_end=standard_properties.contents_end))?;
         }
     }
 
diff --git a/src/parser/footnote_reference.rs b/src/parser/footnote_reference.rs
index d09522b..a2c5c59 100644
--- a/src/parser/footnote_reference.rs
+++ b/src/parser/footnote_reference.rs
@@ -82,6 +82,7 @@ fn anonymous_footnote<'b, 'g, 'r, 's>(
         FootnoteReference {
             source: source.into(),
             contents: Some(contents.into()),
+            post_blank: _trailing_whitespace.map(Into::<&str>::into),
             label: None,
             definition: children,
         },
@@ -130,6 +131,7 @@ fn inline_footnote<'b, 'g, 'r, 's>(
         FootnoteReference {
             source: source.into(),
             contents: Some(contents.into()),
+            post_blank: _trailing_whitespace.map(Into::<&str>::into),
             label: Some(label_contents.into()),
             definition: children,
         },
@@ -155,6 +157,7 @@ fn footnote_reference_only<'b, 'g, 'r, 's>(
         FootnoteReference {
             source: source.into(),
             contents: None,
+            post_blank: _trailing_whitespace.map(Into::<&str>::into),
             label: Some(label_contents.into()),
             definition: Vec::with_capacity(0),
         },
diff --git a/src/types/object.rs b/src/types/object.rs
index df58910..b14f83b 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -193,6 +193,7 @@ pub struct ExportSnippet<'s> {
 pub struct FootnoteReference<'s> {
     pub source: &'s str,
     pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
     pub label: Option<&'s str>,
     pub definition: Vec<Object<'s>>,
 }
@@ -736,7 +737,11 @@ impl<'s> StandardProperties<'s> for FootnoteReference<'s> {
     }
 
     fn get_post_blank<'b>(&'b self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 92d15c3d9159fa292325e80c0e66eb1670bac5d0 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 22:58:07 -0400
Subject: [PATCH 13/78] Fix clippy.

---
 src/types/ast_node.rs            |  2 +-
 src/types/document.rs            |  8 ++---
 src/types/element.rs             |  2 +-
 src/types/greater_element.rs     | 24 +++++++-------
 src/types/lesser_element.rs      | 32 +++++++++---------
 src/types/object.rs              | 56 ++++++++++++++++----------------
 src/types/standard_properties.rs |  2 +-
 7 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/types/ast_node.rs b/src/types/ast_node.rs
index 8d40f13..e282b90 100644
--- a/src/types/ast_node.rs
+++ b/src/types/ast_node.rs
@@ -387,7 +387,7 @@ impl<'r, 's> StandardProperties<'s> for AstNode<'r, 's> {
         }
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         match self {
             AstNode::Document(inner) => inner.get_post_blank(),
             AstNode::Heading(inner) => inner.get_post_blank(),
diff --git a/src/types/document.rs b/src/types/document.rs
index 556dcec..e6f26ac 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -63,7 +63,7 @@ impl<'s> StandardProperties<'s> for Document<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -77,7 +77,7 @@ impl<'s> StandardProperties<'s> for Section<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -91,7 +91,7 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -159,7 +159,7 @@ impl<'s> StandardProperties<'s> for DocumentElement<'s> {
         }
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         match self {
             DocumentElement::Heading(inner) => inner.get_post_blank(),
             DocumentElement::Section(inner) => inner.get_post_blank(),
diff --git a/src/types/element.rs b/src/types/element.rs
index ebfe7da..b3a2ecb 100644
--- a/src/types/element.rs
+++ b/src/types/element.rs
@@ -113,7 +113,7 @@ impl<'s> StandardProperties<'s> for Element<'s> {
         }
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         match self {
             Element::Paragraph(inner) => inner.get_post_blank(),
             Element::PlainList(inner) => inner.get_post_blank(),
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index 6521e16..29572b7 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -137,7 +137,7 @@ impl<'s> StandardProperties<'s> for PlainList<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -151,7 +151,7 @@ impl<'s> StandardProperties<'s> for PlainListItem<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -165,7 +165,7 @@ impl<'s> StandardProperties<'s> for CenterBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -179,7 +179,7 @@ impl<'s> StandardProperties<'s> for QuoteBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -193,7 +193,7 @@ impl<'s> StandardProperties<'s> for SpecialBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -207,7 +207,7 @@ impl<'s> StandardProperties<'s> for DynamicBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -221,7 +221,7 @@ impl<'s> StandardProperties<'s> for FootnoteDefinition<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -235,7 +235,7 @@ impl<'s> StandardProperties<'s> for Drawer<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -249,7 +249,7 @@ impl<'s> StandardProperties<'s> for PropertyDrawer<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -263,7 +263,7 @@ impl<'s> StandardProperties<'s> for NodeProperty<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -277,7 +277,7 @@ impl<'s> StandardProperties<'s> for Table<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -291,7 +291,7 @@ impl<'s> StandardProperties<'s> for TableRow<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 71e9e70..c3ff018 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -204,7 +204,7 @@ impl<'s> StandardProperties<'s> for Paragraph<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -218,7 +218,7 @@ impl<'s> StandardProperties<'s> for TableCell<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -232,7 +232,7 @@ impl<'s> StandardProperties<'s> for Comment<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -246,7 +246,7 @@ impl<'s> StandardProperties<'s> for VerseBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -259,7 +259,7 @@ impl<'s> StandardProperties<'s> for CommentBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -272,7 +272,7 @@ impl<'s> StandardProperties<'s> for ExampleBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -285,7 +285,7 @@ impl<'s> StandardProperties<'s> for ExportBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -298,7 +298,7 @@ impl<'s> StandardProperties<'s> for SrcBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -312,7 +312,7 @@ impl<'s> StandardProperties<'s> for Clock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -326,7 +326,7 @@ impl<'s> StandardProperties<'s> for DiarySexp<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -340,7 +340,7 @@ impl<'s> StandardProperties<'s> for Planning<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -354,7 +354,7 @@ impl<'s> StandardProperties<'s> for FixedWidthArea<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -368,7 +368,7 @@ impl<'s> StandardProperties<'s> for HorizontalRule<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -382,7 +382,7 @@ impl<'s> StandardProperties<'s> for Keyword<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -396,7 +396,7 @@ impl<'s> StandardProperties<'s> for BabelCall<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -410,7 +410,7 @@ impl<'s> StandardProperties<'s> for LatexEnvironment<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index b14f83b..de10ee5 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -526,7 +526,7 @@ impl<'s> StandardProperties<'s> for Bold<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -540,7 +540,7 @@ impl<'s> StandardProperties<'s> for Italic<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -554,7 +554,7 @@ impl<'s> StandardProperties<'s> for Underline<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -568,7 +568,7 @@ impl<'s> StandardProperties<'s> for StrikeThrough<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -582,7 +582,7 @@ impl<'s> StandardProperties<'s> for Code<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -596,7 +596,7 @@ impl<'s> StandardProperties<'s> for Verbatim<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -610,7 +610,7 @@ impl<'s> StandardProperties<'s> for RegularLink<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -624,7 +624,7 @@ impl<'s> StandardProperties<'s> for RadioLink<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -638,7 +638,7 @@ impl<'s> StandardProperties<'s> for RadioTarget<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -652,7 +652,7 @@ impl<'s> StandardProperties<'s> for PlainLink<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -666,7 +666,7 @@ impl<'s> StandardProperties<'s> for AngleLink<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -680,7 +680,7 @@ impl<'s> StandardProperties<'s> for OrgMacro<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -694,7 +694,7 @@ impl<'s> StandardProperties<'s> for Entity<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -708,7 +708,7 @@ impl<'s> StandardProperties<'s> for LatexFragment<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -722,7 +722,7 @@ impl<'s> StandardProperties<'s> for ExportSnippet<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -736,7 +736,7 @@ impl<'s> StandardProperties<'s> for FootnoteReference<'s> {
         self.contents
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         self.post_blank
             .map(|text| text.chars().count())
             .unwrap_or(0)
@@ -754,7 +754,7 @@ impl<'s> StandardProperties<'s> for Citation<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -768,7 +768,7 @@ impl<'s> StandardProperties<'s> for CitationReference<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -782,7 +782,7 @@ impl<'s> StandardProperties<'s> for InlineBabelCall<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -796,7 +796,7 @@ impl<'s> StandardProperties<'s> for InlineSourceBlock<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -810,7 +810,7 @@ impl<'s> StandardProperties<'s> for LineBreak<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -824,7 +824,7 @@ impl<'s> StandardProperties<'s> for Target<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -838,7 +838,7 @@ impl<'s> StandardProperties<'s> for StatisticsCookie<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -852,7 +852,7 @@ impl<'s> StandardProperties<'s> for Subscript<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -866,7 +866,7 @@ impl<'s> StandardProperties<'s> for Superscript<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -880,7 +880,7 @@ impl<'s> StandardProperties<'s> for Timestamp<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -894,7 +894,7 @@ impl<'s> StandardProperties<'s> for PlainText<'s> {
         todo!()
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         todo!()
     }
 }
@@ -1055,7 +1055,7 @@ impl<'s> StandardProperties<'s> for Object<'s> {
         }
     }
 
-    fn get_post_blank<'b>(&'b self) -> PostBlank {
+    fn get_post_blank(&self) -> PostBlank {
         match self {
             Object::Bold(inner) => inner.get_post_blank(),
             Object::Italic(inner) => inner.get_post_blank(),
diff --git a/src/types/standard_properties.rs b/src/types/standard_properties.rs
index 9ec6b27..426e0f5 100644
--- a/src/types/standard_properties.rs
+++ b/src/types/standard_properties.rs
@@ -13,7 +13,7 @@ pub trait StandardProperties<'s> {
     /// Get the ast node's post-blank.
     ///
     /// For objects this is a count of the characters of whitespace after the object. For elements this is a count of the line breaks following an element.
-    fn get_post_blank<'b>(&'b self) -> PostBlank;
+    fn get_post_blank(&self) -> PostBlank;
 }
 
 // TODO: Write some debugging code to alert when any of the unknown fields below are non-nil in our test data so we can see what these fields represent.

From 281c35677bf8b290a63337179ee560b2f8608f4f Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 23:06:43 -0400
Subject: [PATCH 14/78] Implement the new fields for paragraph.

---
 src/parser/footnote_reference.rs | 12 ++++++------
 src/parser/paragraph.rs          |  9 ++++++---
 src/types/lesser_element.rs      | 12 ++++++++++--
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/parser/footnote_reference.rs b/src/parser/footnote_reference.rs
index a2c5c59..581f6a8 100644
--- a/src/parser/footnote_reference.rs
+++ b/src/parser/footnote_reference.rs
@@ -74,7 +74,7 @@ fn anonymous_footnote<'b, 'g, 'r, 's>(
 
     let (remaining, _) = tag("]")(remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -82,7 +82,7 @@ fn anonymous_footnote<'b, 'g, 'r, 's>(
         FootnoteReference {
             source: source.into(),
             contents: Some(contents.into()),
-            post_blank: _trailing_whitespace.map(Into::<&str>::into),
+            post_blank: post_blank.map(Into::<&str>::into),
             label: None,
             definition: children,
         },
@@ -123,7 +123,7 @@ fn inline_footnote<'b, 'g, 'r, 's>(
 
     let (remaining, _) = tag("]")(remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -131,7 +131,7 @@ fn inline_footnote<'b, 'g, 'r, 's>(
         FootnoteReference {
             source: source.into(),
             contents: Some(contents.into()),
-            post_blank: _trailing_whitespace.map(Into::<&str>::into),
+            post_blank: post_blank.map(Into::<&str>::into),
             label: Some(label_contents.into()),
             definition: children,
         },
@@ -149,7 +149,7 @@ fn footnote_reference_only<'b, 'g, 'r, 's>(
     let (remaining, _) = tag_no_case("[fn:")(input)?;
     let (remaining, label_contents) = label(remaining)?;
     let (remaining, _) = tag("]")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -157,7 +157,7 @@ fn footnote_reference_only<'b, 'g, 'r, 's>(
         FootnoteReference {
             source: source.into(),
             contents: None,
-            post_blank: _trailing_whitespace.map(Into::<&str>::into),
+            post_blank: post_blank.map(Into::<&str>::into),
             label: Some(label_contents.into()),
             definition: Vec::with_capacity(0),
         },
diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs
index d20f943..badfea4 100644
--- a/src/parser/paragraph.rs
+++ b/src/parser/paragraph.rs
@@ -1,4 +1,5 @@
 use nom::branch::alt;
+use nom::combinator::consumed;
 use nom::combinator::eof;
 use nom::combinator::recognize;
 use nom::combinator::verify;
@@ -45,14 +46,14 @@ where
     let standard_set_object_matcher = parser_with_context!(standard_set_object)(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
 
-    let (remaining, (children, _exit_contents)) = verify(
+    let (remaining, (contents, (children, _exit_contents))) = consumed(verify(
         many_till(standard_set_object_matcher, exit_matcher),
         |(children, _exit_contents)| !children.is_empty(),
-    )(remaining)?;
+    ))(remaining)?;
 
     // Not checking parent exit matcher because if there are any children matched then we have a valid paragraph.
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -60,6 +61,8 @@ where
         remaining,
         Paragraph {
             source: source.into(),
+            contents: Some(contents.into()),
+            post_blank: post_blank.map(Into::<&str>::into),
             affiliated_keywords: parse_affiliated_keywords(
                 context.get_global_settings(),
                 affiliated_keywords,
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index c3ff018..41ed9db 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -25,6 +25,8 @@ use crate::error::Res;
 #[derive(Debug)]
 pub struct Paragraph<'s> {
     pub source: &'s str,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub children: Vec<Object<'s>>,
 }
@@ -189,6 +191,8 @@ impl<'s> Paragraph<'s> {
     pub(crate) fn of_text(source: &'s str, body: &'s str) -> Self {
         Paragraph {
             source,
+            contents: None,   // TODO
+            post_blank: None, // TODO
             affiliated_keywords: AffiliatedKeywords::default(),
             children: vec![Object::PlainText(PlainText { source: body })],
         }
@@ -201,11 +205,15 @@ impl<'s> StandardProperties<'s> for Paragraph<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 70002800c2daea7c18affe5eee635f93b037ef1a Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 23:12:04 -0400
Subject: [PATCH 15/78] Implement the new fields for footnote definitions.

---
 src/parser/footnote_definition.rs |  6 +++++-
 src/types/greater_element.rs      | 10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/parser/footnote_definition.rs b/src/parser/footnote_definition.rs
index e378006..2cf2d1e 100644
--- a/src/parser/footnote_definition.rs
+++ b/src/parser/footnote_definition.rs
@@ -75,6 +75,7 @@ where
     let parser_context = parser_context.with_additional_node(&contexts[2]);
     let element_matcher = parser_with_context!(element(true))(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
+    let before_contents = remaining;
     let (mut remaining, (mut children, _exit_contents)) =
         many_till(include_input(element_matcher), exit_matcher)(remaining)?;
 
@@ -90,13 +91,16 @@ where
         }
     }
 
-    let (remaining, _trailing_ws) =
+    let contents = get_consumed(before_contents, remaining);
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
         FootnoteDefinition {
             source: source.into(),
+            contents: Some(contents.into()),
+            post_blank: post_blank.map(Into::<&str>::into),
             affiliated_keywords: parse_affiliated_keywords(
                 context.get_global_settings(),
                 affiliated_keywords,
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index 29572b7..d16806e 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -82,6 +82,8 @@ pub struct DynamicBlock<'s> {
 #[derive(Debug)]
 pub struct FootnoteDefinition<'s> {
     pub source: &'s str,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub label: &'s str,
     pub children: Vec<Element<'s>>,
@@ -218,11 +220,15 @@ impl<'s> StandardProperties<'s> for FootnoteDefinition<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 03754be71eaf1053f2ca4de12dd7aa0250cb6f2b Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 23:16:57 -0400
Subject: [PATCH 16/78] Implement the new fields for section.

---
 src/parser/section.rs | 17 +++++++++++------
 src/types/document.rs | 10 ++++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/parser/section.rs b/src/parser/section.rs
index 4c87545..d762cda 100644
--- a/src/parser/section.rs
+++ b/src/parser/section.rs
@@ -1,3 +1,4 @@
+use nom::combinator::consumed;
 use nom::combinator::opt;
 use nom::combinator::recognize;
 use nom::combinator::verify;
@@ -58,12 +59,12 @@ pub(crate) fn zeroth_section<'b, 'g, 'r, 's>(
         many0(blank_line),
     )))(input)?;
 
-    let (remaining, (mut children, _exit_contents)) = verify(
+    let (remaining, (contents, (mut children, _exit_contents))) = consumed(verify(
         many_till(element_matcher, exit_matcher),
         |(children, _exit_contents)| {
             !children.is_empty() || comment_and_property_drawer_element.is_some()
         },
-    )(remaining)?;
+    ))(remaining)?;
 
     if let Some((comment, property_drawer, _ws)) = comment_and_property_drawer_element {
         children.insert(0, Element::PropertyDrawer(property_drawer));
@@ -72,7 +73,7 @@ pub(crate) fn zeroth_section<'b, 'g, 'r, 's>(
         }
     }
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
 
     let source = get_consumed(input, remaining);
@@ -80,6 +81,8 @@ pub(crate) fn zeroth_section<'b, 'g, 'r, 's>(
         remaining,
         Section {
             source: source.into(),
+            contents: Some(contents.into()),
+            post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
     ))
@@ -115,12 +118,12 @@ pub(crate) fn section<'b, 'g, 'r, 's>(
         remaining = remain;
         input = remain;
     }
-    let (remaining, (mut children, _exit_contents)) = verify(
+    let (remaining, (contents, (mut children, _exit_contents))) = consumed(verify(
         many_till(element_matcher, exit_matcher),
         |(children, _exit_contents)| {
             !children.is_empty() || property_drawer_element.is_some() || planning_element.is_some()
         },
-    )(remaining)?;
+    ))(remaining)?;
     if let Some(ele) = property_drawer_element.map(Element::PropertyDrawer) {
         children.insert(0, ele);
     }
@@ -128,7 +131,7 @@ pub(crate) fn section<'b, 'g, 'r, 's>(
         children.insert(0, ele)
     }
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
 
     let source = get_consumed(input, remaining);
@@ -136,6 +139,8 @@ pub(crate) fn section<'b, 'g, 'r, 's>(
         remaining,
         Section {
             source: source.into(),
+            contents: Some(contents.into()),
+            post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
     ))
diff --git a/src/types/document.rs b/src/types/document.rs
index e6f26ac..51fa9df 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -39,6 +39,8 @@ pub struct Heading<'s> {
 #[derive(Debug)]
 pub struct Section<'s> {
     pub source: &'s str,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Element<'s>>,
 }
 
@@ -74,11 +76,15 @@ impl<'s> StandardProperties<'s> for Section<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 425bc12353bedb03c00556472bf65d1ef14730d7 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 23:46:53 -0400
Subject: [PATCH 17/78] Add implementations to calculate the new fields for
 heading.

---
 src/types/document.rs       | 32 ++++++++++++++++++++++++++++++--
 src/types/lesser_element.rs |  2 +-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/types/document.rs b/src/types/document.rs
index 51fa9df..7b4d645 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -94,11 +94,39 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        let first_child = self.children.first();
+        let last_child = self.children.last();
+        match (first_child, last_child) {
+            (None, None) => None,
+            (None, Some(_)) | (Some(_), None) => unreachable!(),
+            (Some(first_child), Some(last_child)) => {
+                let first_child_offset = first_child.get_source().as_ptr() as usize;
+                let last_child_offset = {
+                    let last_child_source = last_child.get_source();
+                    last_child_source.as_ptr() as usize + last_child_source.len()
+                };
+                let source_offset = self.source.as_ptr() as usize;
+                debug_assert!(super::lesser_element::is_slice_of(
+                    self.source,
+                    first_child.get_source()
+                ));
+                debug_assert!(super::lesser_element::is_slice_of(
+                    self.source,
+                    last_child.get_source()
+                ));
+                Some(
+                    &self.source[(first_child_offset - source_offset)
+                        ..(last_child_offset - first_child_offset)],
+                )
+            }
+        }
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.children
+            .last()
+            .map(|child| child.get_post_blank())
+            .unwrap_or(0)
     }
 }
 
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 41ed9db..322e2c2 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -610,7 +610,7 @@ fn content_line<'s>(input: &'s str) -> Res<&'s str, (Option<&'s str>, &'s str)>
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 /// Check if the child string slice is a slice of the parent string slice.
-fn is_slice_of(parent: &str, child: &str) -> bool {
+pub(crate) fn is_slice_of(parent: &str, child: &str) -> bool {
     let parent_start = parent.as_ptr() as usize;
     let parent_end = parent_start + parent.len();
     let child_start = child.as_ptr() as usize;

From f0868ba3edf14287d0d1482d0f7e6e0aecee1739 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Tue, 31 Oct 2023 23:56:40 -0400
Subject: [PATCH 18/78] Add a post blank implementation to document.

---
 src/types/document.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/types/document.rs b/src/types/document.rs
index 7b4d645..ea1a9a6 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -66,7 +66,10 @@ impl<'s> StandardProperties<'s> for Document<'s> {
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.into_iter()
+            .last()
+            .map(|child| child.get_post_blank())
+            .unwrap_or(0)
     }
 }
 

From e0ec5c115fce3cec7f894e21af40fa9b5d907e89 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Wed, 1 Nov 2023 00:49:22 -0400
Subject: [PATCH 19/78] Need a constant value for generic numbers.

---
 src/types/document.rs | 5 +++++
 src/types/mod.rs      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/types/document.rs b/src/types/document.rs
index ea1a9a6..a6e8217 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -6,6 +6,7 @@ use super::Object;
 use super::PostBlank;
 use super::StandardProperties;
 use super::Timestamp;
+use crate::types::remove_trailing::RemoveTrailing;
 
 pub type PriorityCookie = u8;
 pub type HeadlineLevel = u16;
@@ -62,6 +63,10 @@ impl<'s> StandardProperties<'s> for Document<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
+        let post_blank = self.get_post_blank();
+        let foo: RemoveTrailing<_, post_blank> =
+            RemoveTrailing::new(self.source.split_inclusive("\n"));
+        // self.source.split_inclusive("\n")
         todo!()
     }
 
diff --git a/src/types/mod.rs b/src/types/mod.rs
index e142dce..2653394 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -6,6 +6,7 @@ mod greater_element;
 mod lesser_element;
 mod macros;
 mod object;
+mod remove_trailing;
 mod standard_properties;
 mod util;
 pub use affiliated_keyword::AffiliatedKeyword;

From 3fb7cb82cda854839b3d97c2cd25ae8182aca387 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Wed, 1 Nov 2023 01:07:54 -0400
Subject: [PATCH 20/78] Implement get_contents for document.

---
 src/types/document.rs        | 27 +++++++++++++----
 src/types/remove_trailing.rs | 56 ++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 src/types/remove_trailing.rs

diff --git a/src/types/document.rs b/src/types/document.rs
index a6e8217..157e929 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -1,12 +1,12 @@
 use std::path::PathBuf;
 
+use super::remove_trailing::RemoveTrailing;
 use super::Element;
 use super::NodeProperty;
 use super::Object;
 use super::PostBlank;
 use super::StandardProperties;
 use super::Timestamp;
-use crate::types::remove_trailing::RemoveTrailing;
 
 pub type PriorityCookie = u8;
 pub type HeadlineLevel = u16;
@@ -64,10 +64,27 @@ impl<'s> StandardProperties<'s> for Document<'s> {
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
         let post_blank = self.get_post_blank();
-        let foo: RemoveTrailing<_, post_blank> =
-            RemoveTrailing::new(self.source.split_inclusive("\n"));
-        // self.source.split_inclusive("\n")
-        todo!()
+        let mut content_lines = self
+            .source
+            .split_inclusive('\n')
+            .remove_trailing(post_blank);
+        let first_line = content_lines.next();
+        let last_line = content_lines.last().or(first_line);
+        match (first_line, last_line) {
+            (None, None) => None,
+            (None, Some(_)) | (Some(_), None) => unreachable!(),
+            (Some(first_line), Some(last_line)) => {
+                let first_line_offset = first_line.as_ptr() as usize;
+                let last_line_offset = last_line.as_ptr() as usize + last_line.len();
+                let source_offset = self.source.as_ptr() as usize;
+                debug_assert!(super::lesser_element::is_slice_of(self.source, first_line));
+                debug_assert!(super::lesser_element::is_slice_of(self.source, last_line));
+                Some(
+                    &self.source[(first_line_offset - source_offset)
+                        ..(last_line_offset - first_line_offset)],
+                )
+            }
+        }
     }
 
     fn get_post_blank(&self) -> PostBlank {
diff --git a/src/types/remove_trailing.rs b/src/types/remove_trailing.rs
new file mode 100644
index 0000000..822c64c
--- /dev/null
+++ b/src/types/remove_trailing.rs
@@ -0,0 +1,56 @@
+pub(crate) trait RemoveTrailing: Iterator + Sized {
+    fn remove_trailing<R: Into<usize>>(self, amount_to_remove: R) -> RemoveTrailingIter<Self>;
+}
+
+impl<I> RemoveTrailing for I
+where
+    I: Iterator,
+{
+    fn remove_trailing<R: Into<usize>>(self, amount_to_remove: R) -> RemoveTrailingIter<Self> {
+        RemoveTrailingIter {
+            inner: self,
+            buffer: Vec::new(),
+            next_to_pop: 0,
+            amount_to_remove: amount_to_remove.into(),
+        }
+    }
+}
+
+pub(crate) struct RemoveTrailingIter<I: Iterator> {
+    inner: I,
+    buffer: Vec<I::Item>,
+    next_to_pop: usize,
+    amount_to_remove: usize,
+}
+
+impl<I: Iterator> Iterator for RemoveTrailingIter<I> {
+    type Item = I::Item;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.buffer.len() < self.amount_to_remove {
+            self.buffer.reserve_exact(self.amount_to_remove);
+        }
+        while self.buffer.len() < self.amount_to_remove {
+            if let Some(elem) = self.inner.next() {
+                self.buffer.push(elem);
+            } else {
+                // The inner was smaller than amount_to_remove, so never return anything.
+                return None;
+            }
+        }
+
+        let new_value = self.inner.next();
+        if self.amount_to_remove == 0 {
+            return new_value;
+        }
+
+        if let Some(new_value) = new_value {
+            let ret = std::mem::replace(&mut self.buffer[self.next_to_pop], new_value);
+            self.next_to_pop = (self.next_to_pop + 1) % self.amount_to_remove;
+            Some(ret)
+        } else {
+            // We have exactly the amount in the buffer than we wanted to cut off, so stop returning values.
+            None
+        }
+    }
+}

From 8fd9ff384895127e12991ff9e91e136408d2fe17 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 8 Dec 2023 15:51:38 -0500
Subject: [PATCH 21/78] Implement the new fields for bold, italic, underline,
 and strike-through.

---
 src/parser/radio_link.rs  |  2 ++
 src/parser/text_markup.rs | 61 +++++++++++++++++++++++++++------------
 src/parser/util.rs        | 13 +++++++--
 src/types/object.rs       | 40 ++++++++++++++++++++-----
 4 files changed, 86 insertions(+), 30 deletions(-)

diff --git a/src/parser/radio_link.rs b/src/parser/radio_link.rs
index 903d64e..06710de 100644
--- a/src/parser/radio_link.rs
+++ b/src/parser/radio_link.rs
@@ -225,6 +225,8 @@ mod tests {
         let input = OrgSource::new("foo *bar* baz");
         let radio_target_match = vec![Object::Bold(Bold {
             source: "*bar*",
+            contents: "bar",
+            post_blank: Some(" "),
             children: vec![Object::PlainText(PlainText { source: "bar" })],
         })];
         let global_settings = GlobalSettings {
diff --git a/src/parser/text_markup.rs b/src/parser/text_markup.rs
index cdb1763..58662cf 100644
--- a/src/parser/text_markup.rs
+++ b/src/parser/text_markup.rs
@@ -3,11 +3,13 @@ use nom::bytes::complete::tag;
 use nom::character::complete::anychar;
 use nom::character::complete::multispace1;
 use nom::character::complete::one_of;
-use nom::character::complete::space0;
+use nom::character::complete::space1;
 use nom::combinator::all_consuming;
+use nom::combinator::consumed;
 use nom::combinator::map;
 use nom::combinator::map_parser;
 use nom::combinator::not;
+use nom::combinator::opt;
 use nom::combinator::peek;
 use nom::combinator::recognize;
 use nom::combinator::verify;
@@ -76,12 +78,14 @@ fn bold<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Bold<'s>> {
-    let (remaining, children) = text_markup_object("*")(context, input)?;
+    let (remaining, (contents, children, post_blank)) = text_markup_object("*")(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
         Bold {
             source: source.into(),
+            contents: contents.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
     ))
@@ -95,12 +99,14 @@ fn italic<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Italic<'s>> {
-    let (remaining, children) = text_markup_object("/")(context, input)?;
+    let (remaining, (contents, children, post_blank)) = text_markup_object("/")(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
         Italic {
             source: source.into(),
+            contents: contents.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
     ))
@@ -114,12 +120,14 @@ fn underline<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Underline<'s>> {
-    let (remaining, children) = text_markup_object("_")(context, input)?;
+    let (remaining, (contents, children, post_blank)) = text_markup_object("_")(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
         Underline {
             source: source.into(),
+            contents: contents.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
     ))
@@ -133,12 +141,14 @@ fn strike_through<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, StrikeThrough<'s>> {
-    let (remaining, children) = text_markup_object("+")(context, input)?;
+    let (remaining, (contents, children, post_blank)) = text_markup_object("+")(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
         StrikeThrough {
             source: source.into(),
+            contents: contents.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
     ))
@@ -187,8 +197,10 @@ fn text_markup_object(
 ) -> impl for<'b, 'g, 'r, 's> Fn(
     RefContext<'b, 'g, 'r, 's>,
     OrgSource<'s>,
-) -> Res<OrgSource<'s>, Vec<Object<'s>>>
-       + '_ {
+) -> Res<
+    OrgSource<'s>,
+    (OrgSource<'s>, Vec<Object<'s>>, Option<OrgSource<'s>>),
+> + '_ {
     move |context, input: OrgSource<'_>| _text_markup_object(context, input, marker_symbol)
 }
 
@@ -200,7 +212,7 @@ fn _text_markup_object<'b, 'g, 'r, 's, 'c>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
     marker_symbol: &'c str,
-) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
+) -> Res<OrgSource<'s>, (OrgSource<'s>, Vec<Object<'s>>, Option<OrgSource<'s>>)> {
     let (remaining, _) = pre(context, input)?;
     let (remaining, open) = tag(marker_symbol)(remaining)?;
     let (remaining, _peek_not_whitespace) =
@@ -215,7 +227,7 @@ fn _text_markup_object<'b, 'g, 'r, 's, 'c>(
     let initial_context = ContextElement::document_context();
     let initial_context = Context::new(context.get_global_settings(), List::new(&initial_context));
 
-    let (remaining, children) = map_parser(
+    let (remaining, (contents, children)) = consumed(map_parser(
         verify(
             parser_with_context!(text_until_exit)(&parser_context),
             |text| text.len() > 0,
@@ -225,7 +237,7 @@ fn _text_markup_object<'b, 'g, 'r, 's, 'c>(
                 &initial_context,
             )))(i)
         }),
-    )(remaining)?;
+    ))(remaining)?;
 
     {
         #[cfg(feature = "tracing")]
@@ -240,9 +252,9 @@ fn _text_markup_object<'b, 'g, 'r, 's, 'c>(
     }
 
     let (remaining, _close) = text_markup_end_specialized(context, remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
-    Ok((remaining, children))
+    Ok((remaining, (contents, children, post_blank)))
 }
 
 fn text_markup_string(
@@ -382,13 +394,15 @@ impl<'x> RematchObject<'x> for Bold<'x> {
         _context: RefContext<'b, 'g, 'r, 's>,
         input: OrgSource<'s>,
     ) -> Res<OrgSource<'s>, Object<'s>> {
-        let (remaining, children) =
+        let (remaining, (contents, children, post_blank)) =
             _rematch_text_markup_object(_context, input, "*", &self.children)?;
         let source = get_consumed(input, remaining);
         Ok((
             remaining,
             Object::Bold(Bold {
                 source: source.into(),
+                contents: contents.into(),
+                post_blank: post_blank.map(Into::<&str>::into),
                 children,
             }),
         ))
@@ -405,13 +419,15 @@ impl<'x> RematchObject<'x> for Italic<'x> {
         _context: RefContext<'b, 'g, 'r, 's>,
         input: OrgSource<'s>,
     ) -> Res<OrgSource<'s>, Object<'s>> {
-        let (remaining, children) =
+        let (remaining, (contents, children, post_blank)) =
             _rematch_text_markup_object(_context, input, "/", &self.children)?;
         let source = get_consumed(input, remaining);
         Ok((
             remaining,
             Object::Italic(Italic {
                 source: source.into(),
+                contents: contents.into(),
+                post_blank: post_blank.map(Into::<&str>::into),
                 children,
             }),
         ))
@@ -428,13 +444,15 @@ impl<'x> RematchObject<'x> for Underline<'x> {
         _context: RefContext<'b, 'g, 'r, 's>,
         input: OrgSource<'s>,
     ) -> Res<OrgSource<'s>, Object<'s>> {
-        let (remaining, children) =
+        let (remaining, (contents, children, post_blank)) =
             _rematch_text_markup_object(_context, input, "_", &self.children)?;
         let source = get_consumed(input, remaining);
         Ok((
             remaining,
             Object::Underline(Underline {
                 source: source.into(),
+                contents: contents.into(),
+                post_blank: post_blank.map(Into::<&str>::into),
                 children,
             }),
         ))
@@ -451,13 +469,15 @@ impl<'x> RematchObject<'x> for StrikeThrough<'x> {
         _context: RefContext<'b, 'g, 'r, 's>,
         input: OrgSource<'s>,
     ) -> Res<OrgSource<'s>, Object<'s>> {
-        let (remaining, children) =
+        let (remaining, (contents, children, post_blank)) =
             _rematch_text_markup_object(_context, input, "+", &self.children)?;
         let source = get_consumed(input, remaining);
         Ok((
             remaining,
             Object::StrikeThrough(StrikeThrough {
                 source: source.into(),
+                contents: contents.into(),
+                post_blank: post_blank.map(Into::<&str>::into),
                 children,
             }),
         ))
@@ -473,7 +493,7 @@ fn _rematch_text_markup_object<'b, 'g, 'r, 's, 'x>(
     input: OrgSource<'s>,
     marker_symbol: &'static str,
     original_match_children: &'x Vec<Object<'x>>,
-) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
+) -> Res<OrgSource<'s>, (OrgSource<'s>, Vec<Object<'s>>, Option<OrgSource<'s>>)> {
     let (remaining, _) = pre(context, input)?;
     let (remaining, open) = tag(marker_symbol)(remaining)?;
     let (remaining, _peek_not_whitespace) = peek(not(multispace1))(remaining)?;
@@ -484,6 +504,7 @@ fn _rematch_text_markup_object<'b, 'g, 'r, 's, 'x>(
     });
     let parser_context = context.with_additional_node(&parser_context);
 
+    let contents_begin = remaining;
     let (remaining, children) =
         // TODO: This doesn't really check the exit matcher between each object. I think it may be possible to construct an org document that parses incorrectly with the current code.
         rematch_target(&parser_context, original_match_children, remaining)?;
@@ -499,8 +520,10 @@ fn _rematch_text_markup_object<'b, 'g, 'r, 's, 'x>(
             )));
         }
     }
+    let contents_end = remaining;
+    let contents = contents_begin.get_until(contents_end);
 
     let (remaining, _close) = text_markup_end_specialized(context, remaining)?;
-    let (remaining, _trailing_whitespace) = space0(remaining)?;
-    Ok((remaining, children))
+    let (remaining, post_blank) = opt(space1)(remaining)?;
+    Ok((remaining, (contents, children, post_blank)))
 }
diff --git a/src/parser/util.rs b/src/parser/util.rs
index 82f1250..29523f2 100644
--- a/src/parser/util.rs
+++ b/src/parser/util.rs
@@ -81,14 +81,21 @@ pub(crate) fn maybe_consume_object_trailing_whitespace_if_not_exiting<'b, 'g, 'r
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Option<OrgSource<'s>>> {
     // We have to check exit matcher after each character because description list tags need to end with a space unconsumed (" ::").
-    let (remaining, _) = many_till(
+    let (remaining, post_blank) = recognize(many_till(
         one_of(" \t"),
         alt((
             peek(recognize(none_of(" \t"))),
             parser_with_context!(exit_matcher_parser)(context),
         )),
-    )(input)?;
-    Ok((remaining, None))
+    ))(input)?;
+    Ok((
+        remaining,
+        if post_blank.len() == 0 {
+            None
+        } else {
+            Some(post_blank)
+        },
+    ))
 }
 
 #[cfg_attr(
diff --git a/src/types/object.rs b/src/types/object.rs
index de10ee5..40db622 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -43,24 +43,32 @@ pub enum Object<'s> {
 #[derive(Debug)]
 pub struct Bold<'s> {
     pub source: &'s str,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
 }
 
 #[derive(Debug)]
 pub struct Italic<'s> {
     pub source: &'s str,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
 }
 
 #[derive(Debug)]
 pub struct Underline<'s> {
     pub source: &'s str,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
 }
 
 #[derive(Debug)]
 pub struct StrikeThrough<'s> {
     pub source: &'s str,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
 }
 
@@ -523,11 +531,15 @@ impl<'s> StandardProperties<'s> for Bold<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -537,11 +549,15 @@ impl<'s> StandardProperties<'s> for Italic<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -551,11 +567,15 @@ impl<'s> StandardProperties<'s> for Underline<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -565,11 +585,15 @@ impl<'s> StandardProperties<'s> for StrikeThrough<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 9bcba4020dfe8ba3e0b314f713da27ca93bd34bd Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 8 Dec 2023 16:04:18 -0500
Subject: [PATCH 22/78] Implement the new fields for verbatim and code.

---
 src/parser/text_markup.rs | 14 ++++++++------
 src/types/object.rs       | 18 ++++++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/parser/text_markup.rs b/src/parser/text_markup.rs
index 58662cf..c8195b4 100644
--- a/src/parser/text_markup.rs
+++ b/src/parser/text_markup.rs
@@ -162,13 +162,14 @@ fn verbatim<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Verbatim<'s>> {
-    let (remaining, contents) = text_markup_string("=")(context, input)?;
+    let (remaining, (contents, post_blank)) = text_markup_string("=")(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
         Verbatim {
             source: source.into(),
             contents: contents.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -181,13 +182,14 @@ fn code<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Code<'s>> {
-    let (remaining, contents) = text_markup_string("~")(context, input)?;
+    let (remaining, (contents, post_blank)) = text_markup_string("~")(context, input)?;
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
         Code {
             source: source.into(),
             contents: contents.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -262,7 +264,7 @@ fn text_markup_string(
 ) -> impl for<'b, 'g, 'r, 's> Fn(
     RefContext<'b, 'g, 'r, 's>,
     OrgSource<'s>,
-) -> Res<OrgSource<'s>, OrgSource<'s>>
+) -> Res<OrgSource<'s>, (OrgSource<'s>, Option<OrgSource<'s>>)>
        + '_ {
     move |context, input: OrgSource<'_>| _text_markup_string(context, input, marker_symbol)
 }
@@ -275,7 +277,7 @@ fn _text_markup_string<'b, 'g, 'r, 's, 'c>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
     marker_symbol: &'c str,
-) -> Res<OrgSource<'s>, OrgSource<'s>> {
+) -> Res<OrgSource<'s>, (OrgSource<'s>, Option<OrgSource<'s>>)> {
     let (remaining, _) = pre(context, input)?;
     let (remaining, open) = tag(marker_symbol)(remaining)?;
     let (remaining, _peek_not_whitespace) =
@@ -308,9 +310,9 @@ fn _text_markup_string<'b, 'g, 'r, 's, 'c>(
     }
 
     let (remaining, _close) = text_markup_end_specialized(context, remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
-    Ok((remaining, contents))
+    Ok((remaining, (contents, post_blank)))
 }
 
 #[cfg_attr(
diff --git a/src/types/object.rs b/src/types/object.rs
index 40db622..5d79340 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -76,12 +76,14 @@ pub struct StrikeThrough<'s> {
 pub struct Code<'s> {
     pub source: &'s str,
     pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
 pub struct Verbatim<'s> {
     pub source: &'s str,
     pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -603,11 +605,15 @@ impl<'s> StandardProperties<'s> for Code<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -617,11 +623,15 @@ impl<'s> StandardProperties<'s> for Verbatim<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 4a8607726c302fa5b2ff42cb9917053c42d972ca Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 8 Dec 2023 16:09:47 -0500
Subject: [PATCH 23/78] Implement the new fields for comment.

---
 src/types/lesser_element.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 322e2c2..c62bca4 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -237,11 +237,11 @@ impl<'s> StandardProperties<'s> for Comment<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        0
     }
 }
 

From 50145c6cf2d73c4e3936ae263839bd8f05105f44 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 8 Dec 2023 16:16:38 -0500
Subject: [PATCH 24/78] Implement the new fields for line break.

---
 src/types/object.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/object.rs b/src/types/object.rs
index 5d79340..1687854 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -841,11 +841,11 @@ impl<'s> StandardProperties<'s> for LineBreak<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        0
     }
 }
 

From 0108f5b0b1cce6ea0b50d671864da8da150a9c16 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 12:04:59 -0500
Subject: [PATCH 25/78] Implement the new fields for subscript and superscript.

---
 src/parser/subscript_and_superscript.rs | 47 ++++++++++++++++---------
 src/types/object.rs                     | 20 ++++++++---
 2 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/parser/subscript_and_superscript.rs b/src/parser/subscript_and_superscript.rs
index ac627d1..369881f 100644
--- a/src/parser/subscript_and_superscript.rs
+++ b/src/parser/subscript_and_superscript.rs
@@ -3,6 +3,7 @@ use nom::bytes::complete::tag;
 use nom::bytes::complete::take_while;
 use nom::character::complete::anychar;
 use nom::character::complete::one_of;
+use nom::combinator::consumed;
 use nom::combinator::map;
 use nom::combinator::not;
 use nom::combinator::opt;
@@ -54,17 +55,20 @@ pub(crate) fn subscript<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Subscript<'s>> {
-    // We check for the underscore first before checking the pre-character as a minor optimization to avoid walking up the context tree to find the document root unnecessarily.
     let (remaining, _) = tag("_")(input)?;
     pre(input)?;
     let (remaining, body) = script_body(context, remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
-    let (use_brackets, body) = match body {
-        ScriptBody::Braceless(text) => (false, vec![Object::PlainText(PlainText { source: text })]),
-        ScriptBody::WithBraces(body) => (true, body),
+    let (use_brackets, contents, body) = match body {
+        ScriptBody::Braceless(text) => (
+            false,
+            text,
+            vec![Object::PlainText(PlainText { source: text })],
+        ),
+        ScriptBody::WithBraces(contents, body) => (true, contents, body),
     };
 
     Ok((
@@ -72,6 +76,8 @@ pub(crate) fn subscript<'b, 'g, 'r, 's>(
         Subscript {
             source: source.into(),
             use_brackets,
+            contents,
+            post_blank: post_blank.map(Into::<&str>::into),
             children: body,
         },
     ))
@@ -89,13 +95,17 @@ pub(crate) fn superscript<'b, 'g, 'r, 's>(
     let (remaining, _) = tag("^")(input)?;
     pre(input)?;
     let (remaining, body) = script_body(context, remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
-    let (use_brackets, body) = match body {
-        ScriptBody::Braceless(text) => (false, vec![Object::PlainText(PlainText { source: text })]),
-        ScriptBody::WithBraces(body) => (true, body),
+    let (use_brackets, contents, body) = match body {
+        ScriptBody::Braceless(text) => (
+            false,
+            text,
+            vec![Object::PlainText(PlainText { source: text })],
+        ),
+        ScriptBody::WithBraces(contents, body) => (true, contents, body),
     };
 
     Ok((
@@ -103,6 +113,8 @@ pub(crate) fn superscript<'b, 'g, 'r, 's>(
         Superscript {
             source: source.into(),
             use_brackets,
+            contents,
+            post_blank: post_blank.map(Into::<&str>::into),
             children: body,
         },
     ))
@@ -117,7 +129,7 @@ fn pre<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
 #[derive(Debug)]
 enum ScriptBody<'s> {
     Braceless(&'s str),
-    WithBraces(Vec<Object<'s>>),
+    WithBraces(&'s str, Vec<Object<'s>>),
 }
 
 #[cfg_attr(
@@ -135,9 +147,10 @@ fn script_body<'b, 'g, 'r, 's>(
         map(parser_with_context!(script_alphanum)(context), |body| {
             ScriptBody::Braceless(body.into())
         }),
-        map(parser_with_context!(script_with_braces)(context), |body| {
-            ScriptBody::WithBraces(body)
-        }),
+        map(
+            parser_with_context!(script_with_braces)(context),
+            |(contents, body)| ScriptBody::WithBraces(Into::<&str>::into(contents), body),
+        ),
         map(
             parser_with_context!(script_with_parenthesis)(context),
             |body| ScriptBody::Braceless(body.into()),
@@ -195,7 +208,7 @@ fn end_script_alphanum_character<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>,
 fn script_with_braces<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
-) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
+) -> Res<OrgSource<'s>, (OrgSource<'s>, Vec<Object<'s>>)> {
     let (remaining, _) = tag("{")(input)?;
     let exit_with_depth = script_with_braces_end(remaining.get_brace_depth());
     let parser_context = ContextElement::ExitMatcherNode(ExitMatcherNode {
@@ -204,13 +217,13 @@ fn script_with_braces<'b, 'g, 'r, 's>(
     });
     let parser_context = context.with_additional_node(&parser_context);
 
-    let (remaining, (children, _exit_contents)) = many_till(
+    let (remaining, (contents, (children, _exit_contents))) = consumed(many_till(
         parser_with_context!(standard_set_object)(&parser_context),
         parser_with_context!(exit_matcher_parser)(&parser_context),
-    )(remaining)?;
+    ))(remaining)?;
 
     let (remaining, _) = tag("}")(remaining)?;
-    Ok((remaining, children))
+    Ok((remaining, (contents, children)))
 }
 
 fn script_with_braces_end(starting_brace_depth: BracketDepth) -> impl ContextMatcher {
diff --git a/src/types/object.rs b/src/types/object.rs
index 1687854..f908417 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -264,6 +264,8 @@ pub struct StatisticsCookie<'s> {
 pub struct Subscript<'s> {
     pub source: &'s str,
     pub use_brackets: bool,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
 }
 
@@ -271,6 +273,8 @@ pub struct Subscript<'s> {
 pub struct Superscript<'s> {
     pub source: &'s str,
     pub use_brackets: bool,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
 }
 
@@ -883,11 +887,15 @@ impl<'s> StandardProperties<'s> for Subscript<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -897,11 +905,15 @@ impl<'s> StandardProperties<'s> for Superscript<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From b943f9076663789935fdaa254637cb6e5e7eb8d7 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 12:19:49 -0500
Subject: [PATCH 26/78] Implement the new fields for regular link.

---
 src/parser/regular_link.rs | 11 ++++++++---
 src/types/object.rs        | 10 ++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/parser/regular_link.rs b/src/parser/regular_link.rs
index 0097438..75216ae 100644
--- a/src/parser/regular_link.rs
+++ b/src/parser/regular_link.rs
@@ -73,7 +73,7 @@ fn regular_link_without_description<'b, 'g, 'r, 's>(
     let (remaining, _opening_bracket) = tag("[[")(input)?;
     let (remaining, path) = pathreg(context, remaining)?;
     let (remaining, _closing_bracket) = tag("]]")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -84,6 +84,8 @@ fn regular_link_without_description<'b, 'g, 'r, 's>(
             path: path.path,
             raw_link: path.raw_link,
             search_option: path.search_option,
+            contents: None,
+            post_blank: post_blank.map(Into::<&str>::into),
             children: Vec::new(),
             application: path.application,
         },
@@ -101,9 +103,10 @@ fn regular_link_with_description<'b, 'g, 'r, 's>(
     let (remaining, _opening_bracket) = tag("[[")(input)?;
     let (remaining, path) = pathreg(context, remaining)?;
     let (remaining, _closing_bracket) = tag("][")(remaining)?;
-    let (remaining, description) = description(context, remaining)?;
+    let (remaining, (contents, description)) =
+        consumed(parser_with_context!(description)(context))(remaining)?;
     let (remaining, _closing_bracket) = tag("]]")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -114,6 +117,8 @@ fn regular_link_with_description<'b, 'g, 'r, 's>(
             path: path.path,
             raw_link: path.raw_link,
             search_option: path.search_option,
+            contents: Some(Into::<&str>::into(contents)),
+            post_blank: post_blank.map(Into::<&str>::into),
             children: description,
             application: path.application,
         },
diff --git a/src/types/object.rs b/src/types/object.rs
index f908417..0763f01 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -110,6 +110,8 @@ pub struct RegularLink<'s> {
     /// This does not take into account the post-processing that you would get from the upstream emacs org-mode AST. Use `get_search_option` for an equivalent value.
     pub search_option: Option<Cow<'s, str>>,
 
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
     pub application: Option<Cow<'s, str>>,
 }
@@ -645,11 +647,15 @@ impl<'s> StandardProperties<'s> for RegularLink<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 30c03b552971a914d99545b45d3df7e218bf7787 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 12:27:35 -0500
Subject: [PATCH 27/78] Implement the new fields for radio target.

---
 src/parser/radio_link.rs | 3 ++-
 src/types/object.rs      | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/radio_link.rs b/src/parser/radio_link.rs
index 06710de..ffda83f 100644
--- a/src/parser/radio_link.rs
+++ b/src/parser/radio_link.rs
@@ -134,7 +134,7 @@ pub(crate) fn radio_target<'b, 'g, 'r, 's>(
     ))(remaining)?;
 
     let (remaining, _closing) = tag(">>>")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -142,6 +142,7 @@ pub(crate) fn radio_target<'b, 'g, 'r, 's>(
         RadioTarget {
             source: source.into(),
             value: raw_value.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
     ))
diff --git a/src/types/object.rs b/src/types/object.rs
index 0763f01..801c1e6 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -120,6 +120,7 @@ pub struct RegularLink<'s> {
 pub struct RadioTarget<'s> {
     pub source: &'s str,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
 }
 
@@ -679,11 +680,15 @@ impl<'s> StandardProperties<'s> for RadioTarget<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.value)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 9cfb2fa052c9cabb28d79bcf0afdac48df7ddcd4 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 12:38:13 -0500
Subject: [PATCH 28/78] Implement the new fields for keywords.

---
 src/parser/keyword.rs       | 5 ++++-
 src/types/lesser_element.rs | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/parser/keyword.rs b/src/parser/keyword.rs
index 32db361..e2c67b7 100644
--- a/src/parser/keyword.rs
+++ b/src/parser/keyword.rs
@@ -58,6 +58,7 @@ fn _filtered_keyword<'s, F: Fn(OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s
                 affiliated_keywords: AffiliatedKeywords::default(), // To be populated by the caller if this keyword is in a context to support affiliated keywords.
                 key: parsed_key.into(),
                 value: "",
+                post_blank: None,
             },
         ));
     }
@@ -71,6 +72,7 @@ fn _filtered_keyword<'s, F: Fn(OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s
             affiliated_keywords: AffiliatedKeywords::default(), // To be populated by the caller if this keyword is in a context to support affiliated keywords.
             key: parsed_key.into(),
             value: parsed_value.into(),
+            post_blank: None,
         },
     ))
 }
@@ -89,12 +91,13 @@ where
     AK: IntoIterator<Item = Keyword<'s>>,
 {
     let (remaining, mut kw) = filtered_keyword(regular_keyword_key)(remaining)?;
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     kw.affiliated_keywords =
         parse_affiliated_keywords(context.get_global_settings(), affiliated_keywords);
     kw.source = Into::<&str>::into(source);
+    kw.post_blank = post_blank.map(Into::<&str>::into);
     Ok((remaining, kw))
 }
 
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index c62bca4..7f0c491 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -153,6 +153,7 @@ pub struct Keyword<'s> {
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub key: &'s str,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -387,11 +388,15 @@ impl<'s> StandardProperties<'s> for Keyword<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From d556d28f49a9a2f9723b1bf4cb1a65e89ee8dfb8 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 12:44:42 -0500
Subject: [PATCH 29/78] Implement the new fields for entity.

---
 src/parser/entity.rs | 3 ++-
 src/types/object.rs  | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/entity.rs b/src/parser/entity.rs
index 84c271b..94c91a2 100644
--- a/src/parser/entity.rs
+++ b/src/parser/entity.rs
@@ -28,7 +28,7 @@ pub(crate) fn entity<'b, 'g, 'r, 's>(
     let (remaining, _) = tag("\\")(input)?;
     let (remaining, (entity_definition, entity_name, use_brackets)) = name(context, remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
 
     let source = get_consumed(input, remaining);
@@ -43,6 +43,7 @@ pub(crate) fn entity<'b, 'g, 'r, 's>(
             ascii: entity_definition.ascii,
             utf8: entity_definition.utf8,
             use_brackets,
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index 801c1e6..07555cd 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -187,6 +187,7 @@ pub struct Entity<'s> {
     // Skipping latin1 because it is detrimental to the future. If anyone out there is using latin1, take a long look in the mirror and change your ways.
     pub utf8: &'s str,
     pub use_brackets: bool,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -740,11 +741,15 @@ impl<'s> StandardProperties<'s> for Entity<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From ab281de3c6b74c137554c656c8e76b16f4e38f94 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 12:46:20 -0500
Subject: [PATCH 30/78] Implement the new fields for latex fragment.

---
 src/parser/latex_fragment.rs | 3 ++-
 src/types/object.rs          | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/latex_fragment.rs b/src/parser/latex_fragment.rs
index e4ade8a..413981d 100644
--- a/src/parser/latex_fragment.rs
+++ b/src/parser/latex_fragment.rs
@@ -39,7 +39,7 @@ pub(crate) fn latex_fragment<'b, 'g, 'r, 's>(
         parser_with_context!(bordered_dollar_fragment)(context),
     ))(input)?;
     let value = get_consumed(input, remaining);
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -47,6 +47,7 @@ pub(crate) fn latex_fragment<'b, 'g, 'r, 's>(
         LatexFragment {
             source: source.into(),
             value: value.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index 07555cd..a546347 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -194,6 +194,7 @@ pub struct Entity<'s> {
 pub struct LatexFragment<'s> {
     pub source: &'s str,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -759,11 +760,15 @@ impl<'s> StandardProperties<'s> for LatexFragment<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 4af0d3141ff4fdfcdc14adc12da54932efaa49d5 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 12:51:07 -0500
Subject: [PATCH 31/78] Implement the new fields for statistics cookie.

---
 src/parser/statistics_cookie.rs | 6 ++++--
 src/types/object.rs             | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/parser/statistics_cookie.rs b/src/parser/statistics_cookie.rs
index af919d1..3d0fd22 100644
--- a/src/parser/statistics_cookie.rs
+++ b/src/parser/statistics_cookie.rs
@@ -40,7 +40,7 @@ fn percent_statistics_cookie<'b, 'g, 'r, 's>(
         tag("%]"),
     )))(input)?;
     let value = get_consumed(input, remaining);
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -48,6 +48,7 @@ fn percent_statistics_cookie<'b, 'g, 'r, 's>(
         StatisticsCookie {
             source: source.into(),
             value: value.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -68,7 +69,7 @@ fn fraction_statistics_cookie<'b, 'g, 'r, 's>(
         tag("]"),
     )))(input)?;
     let value = get_consumed(input, remaining);
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -76,6 +77,7 @@ fn fraction_statistics_cookie<'b, 'g, 'r, 's>(
         StatisticsCookie {
             source: source.into(),
             value: value.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index a546347..6fbc87b 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -263,6 +263,7 @@ pub struct Target<'s> {
 pub struct StatisticsCookie<'s> {
     pub source: &'s str,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -894,11 +895,15 @@ impl<'s> StandardProperties<'s> for StatisticsCookie<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 670209e9fcd3fcb18b806cccad88c98fdc5f5baa Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 12:58:05 -0500
Subject: [PATCH 32/78] Fix post blank for comment.

---
 src/parser/comment.rs       | 3 ++-
 src/types/lesser_element.rs | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/parser/comment.rs b/src/parser/comment.rs
index 7523037..80bf16a 100644
--- a/src/parser/comment.rs
+++ b/src/parser/comment.rs
@@ -46,7 +46,7 @@ pub(crate) fn comment<'b, 'g, 'r, 's>(
     let (remaining, mut remaining_lines) =
         many0(preceded(not(exit_matcher), comment_line_matcher))(remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     let mut value = Vec::with_capacity(remaining_lines.len() + 1);
@@ -67,6 +67,7 @@ pub(crate) fn comment<'b, 'g, 'r, 's>(
         Comment {
             source: source.into(),
             value,
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 7f0c491..17aca5d 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -35,6 +35,7 @@ pub struct Paragraph<'s> {
 pub struct Comment<'s> {
     pub source: &'s str,
     pub value: Vec<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -242,7 +243,11 @@ impl<'s> StandardProperties<'s> for Comment<'s> {
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        0
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 13c62bf29f09a81870b4bef6c6b8e27dc580fe31 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 13:00:43 -0500
Subject: [PATCH 33/78] Implement the new fields for angle link.

---
 src/parser/angle_link.rs | 3 ++-
 src/types/object.rs      | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/angle_link.rs b/src/parser/angle_link.rs
index 8cd21a7..444270b 100644
--- a/src/parser/angle_link.rs
+++ b/src/parser/angle_link.rs
@@ -47,7 +47,7 @@ pub(crate) fn angle_link<'b, 'g, 'r, 's>(
         parser_with_context!(parse_angle_link)(context),
     ))(remaining)?;
     let (remaining, _) = tag(">")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -59,6 +59,7 @@ pub(crate) fn angle_link<'b, 'g, 'r, 's>(
             raw_link: raw_link.into(),
             search_option: parsed_link.search_option,
             application: parsed_link.application,
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index 6fbc87b..3c8ee82 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -157,6 +157,7 @@ pub struct AngleLink<'s> {
     /// This does not take into account the post-processing that you would get from the upstream emacs org-mode AST. Use `get_search_option` for an equivalent value.
     pub search_option: Option<&'s str>,
     pub application: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -715,11 +716,15 @@ impl<'s> StandardProperties<'s> for AngleLink<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 4753f4c7c69f7027669d1a5cafb1e8529697309c Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 13:08:53 -0500
Subject: [PATCH 34/78] Implement the new fields for plain link.

---
 src/parser/plain_link.rs | 3 ++-
 src/types/object.rs      | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/plain_link.rs b/src/parser/plain_link.rs
index cc4815d..339a094 100644
--- a/src/parser/plain_link.rs
+++ b/src/parser/plain_link.rs
@@ -54,7 +54,7 @@ pub(crate) fn plain_link<'b, 'g, 'r, 's>(
     let (remaining, _) = pre(context, input)?;
     let (remaining, path_plain) = parse_path_plain(context, remaining)?;
     peek(parser_with_context!(post)(context))(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -66,6 +66,7 @@ pub(crate) fn plain_link<'b, 'g, 'r, 's>(
             raw_link: path_plain.raw_link,
             search_option: path_plain.search_option,
             application: path_plain.application,
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index 3c8ee82..185fe43 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -139,6 +139,7 @@ pub struct PlainLink<'s> {
     pub raw_link: &'s str,
     pub search_option: Option<&'s str>,
     pub application: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -702,11 +703,15 @@ impl<'s> StandardProperties<'s> for PlainLink<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 68dccd54b1b287f0cf812e22a5cd9f763c9c1ef7 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 14:10:27 -0500
Subject: [PATCH 35/78] Implement the new fields for radio link.

---
 src/parser/radio_link.rs | 7 ++++++-
 src/types/object.rs      | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/parser/radio_link.rs b/src/parser/radio_link.rs
index ffda83f..c1af7ee 100644
--- a/src/parser/radio_link.rs
+++ b/src/parser/radio_link.rs
@@ -39,7 +39,7 @@ pub(crate) fn radio_link<'b, 'g, 'r, 's>(
         let rematched_target = rematch_target(context, radio_target, input);
         if let Ok((remaining, rematched_target)) = rematched_target {
             let path = get_consumed(input, remaining);
-            let (remaining, _) = space0(remaining)?;
+            let (remaining, post_blank) = space0(remaining)?;
             let source = get_consumed(input, remaining);
             return Ok((
                 remaining,
@@ -47,6 +47,11 @@ pub(crate) fn radio_link<'b, 'g, 'r, 's>(
                     source: source.into(),
                     children: rematched_target,
                     path: path.into(),
+                    post_blank: if post_blank.len() > 0 {
+                        Some(Into::<&str>::into(post_blank))
+                    } else {
+                        None
+                    },
                 },
             ));
         }
diff --git a/src/types/object.rs b/src/types/object.rs
index 185fe43..e036188 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -128,6 +128,7 @@ pub struct RadioTarget<'s> {
 pub struct RadioLink<'s> {
     pub source: &'s str,
     pub path: &'s str,
+    pub post_blank: Option<&'s str>,
     pub children: Vec<Object<'s>>,
 }
 
@@ -671,11 +672,15 @@ impl<'s> StandardProperties<'s> for RadioLink<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.path)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 87ce7d7432188f3a6021f7ff22ad71ea35c3d704 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 14:18:04 -0500
Subject: [PATCH 36/78] Implement the new fields for timestamp.

---
 src/parser/timestamp.rs | 21 ++++++++++++++-------
 src/types/object.rs     |  9 +++++++--
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/parser/timestamp.rs b/src/parser/timestamp.rs
index 926e969..6b41fe6 100644
--- a/src/parser/timestamp.rs
+++ b/src/parser/timestamp.rs
@@ -69,7 +69,7 @@ fn diary_timestamp<'b, 'g, 'r, 's>(
     let (remaining, _) = tag("<%%(")(input)?;
     let (remaining, _body) = sexp(context, remaining)?;
     let (remaining, _) = tag(")>")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -85,6 +85,7 @@ fn diary_timestamp<'b, 'g, 'r, 's>(
             end_time: None,
             repeater: None,
             warning_delay: None,
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -159,7 +160,7 @@ fn active_timestamp<'b, 'g, 'r, 's>(
     )))(remaining)?;
     let (remaining, _) = tag(">")(remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -175,6 +176,7 @@ fn active_timestamp<'b, 'g, 'r, 's>(
             end_time: time.map(|(_, time)| time),
             repeater: repeater.map(|(_, repeater)| repeater),
             warning_delay: warning_delay.map(|(_, warning_delay)| warning_delay),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -213,7 +215,7 @@ pub(crate) fn inactive_timestamp<'b, 'g, 'r, 's>(
     )))(remaining)?;
     let (remaining, _) = tag("]")(remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -229,6 +231,7 @@ pub(crate) fn inactive_timestamp<'b, 'g, 'r, 's>(
             end_time: time.map(|(_, time)| time),
             repeater: repeater.map(|(_, repeater)| repeater),
             warning_delay: warning_delay.map(|(_, warning_delay)| warning_delay),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -246,7 +249,7 @@ fn active_date_range_timestamp<'b, 'g, 'r, 's>(
     let (remaining, _separator) = tag("--")(remaining)?;
     let (remaining, second_timestamp) = active_timestamp(context, remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -264,6 +267,7 @@ fn active_date_range_timestamp<'b, 'g, 'r, 's>(
             warning_delay: first_timestamp
                 .warning_delay
                 .or(second_timestamp.warning_delay),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -302,7 +306,7 @@ fn active_time_range_timestamp<'b, 'g, 'r, 's>(
     )))(remaining)?;
     let (remaining, _) = tag(">")(remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -318,6 +322,7 @@ fn active_time_range_timestamp<'b, 'g, 'r, 's>(
             end_time: Some(second_time),
             repeater: repeater.map(|(_, repeater)| repeater),
             warning_delay: warning_delay.map(|(_, warning_delay)| warning_delay),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -335,7 +340,7 @@ pub(crate) fn inactive_date_range_timestamp<'b, 'g, 'r, 's>(
     let (remaining, _separator) = tag("--")(remaining)?;
     let (remaining, second_timestamp) = inactive_timestamp(context, remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -354,6 +359,7 @@ pub(crate) fn inactive_date_range_timestamp<'b, 'g, 'r, 's>(
             warning_delay: first_timestamp
                 .warning_delay
                 .or(second_timestamp.warning_delay),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -392,7 +398,7 @@ pub(crate) fn inactive_time_range_timestamp<'b, 'g, 'r, 's>(
     )))(remaining)?;
     let (remaining, _) = tag("]")(remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -408,6 +414,7 @@ pub(crate) fn inactive_time_range_timestamp<'b, 'g, 'r, 's>(
             end_time: Some(second_time),
             repeater: repeater.map(|(_, repeater)| repeater),
             warning_delay: warning_delay.map(|(_, warning_delay)| warning_delay),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index e036188..0415c37 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -299,6 +299,7 @@ pub struct Timestamp<'s> {
     pub end_time: Option<Time<'s>>,
     pub repeater: Option<Repeater>,
     pub warning_delay: Option<WarningDelay>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug, Clone)]
@@ -964,11 +965,15 @@ impl<'s> StandardProperties<'s> for Timestamp<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From aba29df34c752cc0da36ea97508fb91ca7e9e2dd Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 14:22:56 -0500
Subject: [PATCH 37/78] Implement the new fields for org macro.

---
 src/parser/org_macro.rs | 3 ++-
 src/types/object.rs     | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/org_macro.rs b/src/parser/org_macro.rs
index 92bfbad..c9af1e9 100644
--- a/src/parser/org_macro.rs
+++ b/src/parser/org_macro.rs
@@ -32,7 +32,7 @@ pub(crate) fn org_macro<'b, 'g, 'r, 's>(
     let (remaining, macro_args) = opt(parser_with_context!(org_macro_args)(context))(remaining)?;
     let (remaining, _) = tag("}}}")(remaining)?;
     let macro_value = get_consumed(input, remaining);
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
 
     let source = get_consumed(input, remaining);
@@ -47,6 +47,7 @@ pub(crate) fn org_macro<'b, 'g, 'r, 's>(
                 .map(|arg| arg.into())
                 .collect(),
             value: Into::<&str>::into(macro_value),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index 0415c37..a535fd1 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -177,6 +177,7 @@ pub struct OrgMacro<'s> {
     pub args: Vec<&'s str>,
 
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -745,11 +746,15 @@ impl<'s> StandardProperties<'s> for OrgMacro<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From f141a4e186d648a144a431fcaae54e3b175e5632 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 14:38:14 -0500
Subject: [PATCH 38/78] Implement the new fields for citation.

---
 src/parser/citation.rs | 10 +++++++++-
 src/types/object.rs    | 14 ++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/parser/citation.rs b/src/parser/citation.rs
index 69d7c62..983048f 100644
--- a/src/parser/citation.rs
+++ b/src/parser/citation.rs
@@ -46,16 +46,22 @@ pub(crate) fn citation<'b, 'g, 'r, 's>(
     let (remaining, prefix) =
         must_balance_bracket(opt(parser_with_context!(global_prefix)(context)))(remaining)?;
 
+    let contents_begin = remaining;
     let (remaining, references) =
         separated_list1(tag(";"), parser_with_context!(citation_reference)(context))(remaining)?;
+    let contents_end = {
+        let (rem, _) = opt(tag(";"))(remaining)?;
+        rem
+    };
     let (remaining, suffix) = must_balance_bracket(opt(map(
         tuple((tag(";"), parser_with_context!(global_suffix)(context))),
         |(_, suffix)| suffix,
     )))(remaining)?;
     let (remaining, _) = tag("]")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
+    let contents = contents_begin.get_until(contents_end);
     Ok((
         remaining,
         Citation {
@@ -64,6 +70,8 @@ pub(crate) fn citation<'b, 'g, 'r, 's>(
             prefix: prefix.unwrap_or(Vec::new()),
             suffix: suffix.unwrap_or(Vec::new()),
             children: references,
+            contents: Into::<&str>::into(contents),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index a535fd1..894cc1a 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -224,6 +224,8 @@ pub struct Citation<'s> {
     pub prefix: Vec<Object<'s>>,
     pub suffix: Vec<Object<'s>>,
     pub children: Vec<CitationReference<'s>>,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -832,11 +834,15 @@ impl<'s> StandardProperties<'s> for Citation<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -846,11 +852,11 @@ impl<'s> StandardProperties<'s> for CitationReference<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        0
     }
 }
 

From 67a9103b074c5411ae67becb73452ccc36ce0295 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 14:41:49 -0500
Subject: [PATCH 39/78] Implement the new fields for export snippet.

---
 src/parser/export_snippet.rs | 3 ++-
 src/types/object.rs          | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/export_snippet.rs b/src/parser/export_snippet.rs
index c588f5f..bff0f37 100644
--- a/src/parser/export_snippet.rs
+++ b/src/parser/export_snippet.rs
@@ -39,7 +39,7 @@ pub(crate) fn export_snippet<'b, 'g, 'r, 's>(
         parser_with_context!(contents)(&parser_context),
     )))(remaining)?;
     let (remaining, _) = tag("@@")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -48,6 +48,7 @@ pub(crate) fn export_snippet<'b, 'g, 'r, 's>(
             source: source.into(),
             backend: backend_name.into(),
             contents: backend_contents.map(|(_colon, backend_contents)| backend_contents.into()),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index 894cc1a..892616a 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -206,6 +206,7 @@ pub struct ExportSnippet<'s> {
     pub source: &'s str,
     pub backend: &'s str,
     pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -802,11 +803,15 @@ impl<'s> StandardProperties<'s> for ExportSnippet<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 0b421393937c82f11265fd331da98a061fd95bcc Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 14:47:22 -0500
Subject: [PATCH 40/78] Implement the new fields for inline babel call and
 inline source block.

---
 src/parser/inline_babel_call.rs   |  3 ++-
 src/parser/inline_source_block.rs |  3 ++-
 src/types/object.rs               | 18 ++++++++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/parser/inline_babel_call.rs b/src/parser/inline_babel_call.rs
index f059da0..7f67a71 100644
--- a/src/parser/inline_babel_call.rs
+++ b/src/parser/inline_babel_call.rs
@@ -38,7 +38,7 @@ pub(crate) fn inline_babel_call<'b, 'g, 'r, 's>(
     let (remaining, arguments) = argument(context, remaining)?;
     let (remaining, end_header) = opt(parser_with_context!(header)(context))(remaining)?;
     let value = get_consumed(input, remaining);
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -54,6 +54,7 @@ pub(crate) fn inline_babel_call<'b, 'g, 'r, 's>(
                 None
             },
             end_header: end_header.map(Into::<&str>::into),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/parser/inline_source_block.rs b/src/parser/inline_source_block.rs
index f0e22a7..11ce69b 100644
--- a/src/parser/inline_source_block.rs
+++ b/src/parser/inline_source_block.rs
@@ -38,7 +38,7 @@ pub(crate) fn inline_source_block<'b, 'g, 'r, 's>(
     let (remaining, language) = lang(context, remaining)?;
     let (remaining, parameters) = opt(parser_with_context!(header)(context))(remaining)?;
     let (remaining, value) = body(context, remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -48,6 +48,7 @@ pub(crate) fn inline_source_block<'b, 'g, 'r, 's>(
             language: language.into(),
             parameters: parameters.map(Into::<&str>::into),
             value: value.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index 892616a..b4a8095 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -245,6 +245,7 @@ pub struct InlineBabelCall<'s> {
     pub inside_header: Option<&'s str>,
     pub arguments: Option<&'s str>,
     pub end_header: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -253,6 +254,7 @@ pub struct InlineSourceBlock<'s> {
     pub language: &'s str,
     pub parameters: Option<&'s str>,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -871,11 +873,15 @@ impl<'s> StandardProperties<'s> for InlineBabelCall<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -885,11 +891,15 @@ impl<'s> StandardProperties<'s> for InlineSourceBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 175ff1e6c4556d394ac1b39ee4d90abcb584ee77 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 14:49:18 -0500
Subject: [PATCH 41/78] Implement the new fields for LaTeX environment.

---
 src/parser/latex_environment.rs | 3 ++-
 src/types/lesser_element.rs     | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/latex_environment.rs b/src/parser/latex_environment.rs
index 6503a66..cfcc344 100644
--- a/src/parser/latex_environment.rs
+++ b/src/parser/latex_environment.rs
@@ -57,7 +57,7 @@ where
     let (remaining, _end) = latex_environment_end_specialized(&parser_context, remaining)?;
     let value_end = remaining;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     let value = get_consumed(value_start, value_end);
@@ -70,6 +70,7 @@ where
                 affiliated_keywords,
             ),
             value: value.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 17aca5d..e4eab1e 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -173,6 +173,7 @@ pub struct LatexEnvironment<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 /// A line number used in switches to lesser blocks.
@@ -425,11 +426,15 @@ impl<'s> StandardProperties<'s> for LatexEnvironment<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 2e7db0f8bda42e38f5620fce83e67d6125ac342a Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 11 Dec 2023 15:59:56 -0500
Subject: [PATCH 42/78] Implement the new fields for lesser block.

---
 src/parser/lesser_block.rs  | 48 +++++++++++++++++++++++--------------
 src/types/lesser_element.rs | 46 +++++++++++++++++++++++++++--------
 2 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/src/parser/lesser_block.rs b/src/parser/lesser_block.rs
index a09ce0d..9f06497 100644
--- a/src/parser/lesser_block.rs
+++ b/src/parser/lesser_block.rs
@@ -80,22 +80,28 @@ where
     let object_matcher = parser_with_context!(standard_set_object)(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
     // Check for a completely empty block
-    let (remaining, children) = match consumed(many_till(blank_line, exit_matcher))(remaining) {
-        Ok((remaining, (whitespace, (_children, _exit_contents)))) => (
-            remaining,
-            vec![Object::PlainText(PlainText {
-                source: whitespace.into(),
-            })],
-        ),
-        Err(_) => {
-            let (remaining, (children, _exit_contents)) =
-                many_till(object_matcher, exit_matcher)(remaining)?;
-            (remaining, children)
-        }
-    };
+    let (remaining, contents, children) =
+        match consumed(many_till(blank_line, exit_matcher))(remaining) {
+            Ok((remaining, (whitespace, (_children, _exit_contents)))) => (
+                remaining,
+                whitespace,
+                if whitespace.len() > 0 {
+                    vec![Object::PlainText(PlainText {
+                        source: whitespace.into(),
+                    })]
+                } else {
+                    Vec::new()
+                },
+            ),
+            Err(_) => {
+                let (remaining, (contents, (children, _exit_contents))) =
+                    consumed(many_till(object_matcher, exit_matcher))(remaining)?;
+                (remaining, contents, children)
+            }
+        };
     let (remaining, _end) = lesser_block_end_specialized(&parser_context, remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -108,6 +114,8 @@ where
             ),
             data: parameters.map(Into::<&str>::into),
             children,
+            contents: Into::<&str>::into(contents),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -144,7 +152,7 @@ where
     let (remaining, contents) = parser_with_context!(text_until_exit)(&parser_context)(remaining)?;
     let (remaining, _end) = lesser_block_end_specialized(&parser_context, remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -156,6 +164,7 @@ where
                 affiliated_keywords,
             ),
             contents: contents.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -205,7 +214,7 @@ where
     let (remaining, contents) = text_until_exit(&parser_context, remaining)?;
     let (remaining, _end) = lesser_block_end_specialized(&parser_context, remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     let (switches, number_lines, preserve_indent, retain_labels, use_labels, label_format) = {
@@ -237,6 +246,7 @@ where
             use_labels,
             label_format,
             value: Into::<&str>::into(contents),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -279,7 +289,7 @@ where
     let (remaining, contents) = text_until_exit(&parser_context, remaining)?;
     let (remaining, _end) = lesser_block_end_specialized(&parser_context, remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -293,6 +303,7 @@ where
             export_type: export_type.map(Into::<&str>::into),
             data: parameters.map(Into::<&str>::into),
             value: Into::<&str>::into(contents),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -334,7 +345,7 @@ where
     let (remaining, contents) = text_until_exit(&parser_context, remaining)?;
     let (remaining, _end) = lesser_block_end_specialized(&parser_context, remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     let (switches, number_lines, preserve_indent, retain_labels, use_labels, label_format) = {
@@ -372,6 +383,7 @@ where
             use_labels,
             label_format,
             value: Into::<&str>::into(contents),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index e4eab1e..596d056 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -50,6 +50,8 @@ pub struct VerseBlock<'s> {
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub data: Option<&'s str>,
     pub children: Vec<Object<'s>>,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -57,6 +59,7 @@ pub struct CommentBlock<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 pub type CharOffsetInLine = u16;
@@ -80,6 +83,7 @@ pub struct ExampleBlock<'s> {
     pub use_labels: bool,
     pub label_format: Option<&'s str>,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -89,6 +93,7 @@ pub struct ExportBlock<'s> {
     pub export_type: Option<&'s str>,
     pub data: Option<&'s str>,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -104,6 +109,7 @@ pub struct SrcBlock<'s> {
     pub use_labels: bool,
     pub label_format: Option<&'s str>,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -258,11 +264,15 @@ impl<'s> StandardProperties<'s> for VerseBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 impl<'s> StandardProperties<'s> for CommentBlock<'s> {
@@ -271,11 +281,15 @@ impl<'s> StandardProperties<'s> for CommentBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 impl<'s> StandardProperties<'s> for ExampleBlock<'s> {
@@ -284,11 +298,15 @@ impl<'s> StandardProperties<'s> for ExampleBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 impl<'s> StandardProperties<'s> for ExportBlock<'s> {
@@ -297,11 +315,15 @@ impl<'s> StandardProperties<'s> for ExportBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 impl<'s> StandardProperties<'s> for SrcBlock<'s> {
@@ -310,11 +332,15 @@ impl<'s> StandardProperties<'s> for SrcBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 68a220aa1c09ff18a7cae07a2feade3c94eea0e0 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 10:16:33 -0500
Subject: [PATCH 43/78] Implement the new fields for babel call.

---
 .../lesser_element/babel_call/simple.org      |  2 +
 src/parser/babel_call.rs                      | 99 +++++++++----------
 src/types/lesser_element.rs                   |  9 +-
 3 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/org_mode_samples/lesser_element/babel_call/simple.org b/org_mode_samples/lesser_element/babel_call/simple.org
index bafcb01..27d102c 100644
--- a/org_mode_samples/lesser_element/babel_call/simple.org
+++ b/org_mode_samples/lesser_element/babel_call/simple.org
@@ -5,3 +5,5 @@
 #+call: dolar cat(dog)
 
 #+call: (bat)
+
+#+call:
diff --git a/src/parser/babel_call.rs b/src/parser/babel_call.rs
index fdfdac5..22b3925 100644
--- a/src/parser/babel_call.rs
+++ b/src/parser/babel_call.rs
@@ -4,7 +4,6 @@ use nom::bytes::complete::tag_no_case;
 use nom::character::complete::anychar;
 use nom::character::complete::one_of;
 use nom::character::complete::space0;
-use nom::combinator::consumed;
 use nom::combinator::opt;
 use nom::combinator::peek;
 use nom::combinator::recognize;
@@ -43,32 +42,10 @@ where
     start_of_line(remaining)?;
     let (remaining, _) = tuple((space0, tag("#+"), tag_no_case("call"), tag(":")))(remaining)?;
 
-    if let Ok((remaining, (_, line_break))) = tuple((space0, org_line_ending))(remaining) {
-        let (remaining, _trailing_ws) =
-            maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
-        let source = get_consumed(input, remaining);
-        return Ok((
-            remaining,
-            BabelCall {
-                source: Into::<&str>::into(source),
-                affiliated_keywords: parse_affiliated_keywords(
-                    context.get_global_settings(),
-                    affiliated_keywords,
-                ),
-                value: Into::<&str>::into(line_break.take(0)),
-                call: None,
-                inside_header: None,
-                arguments: None,
-                end_header: None,
-            },
-        ));
-    }
-
     let (remaining, _ws) = space0(remaining)?;
-    let (remaining, (value, babel_call_value)) = consumed(babel_call_value)(remaining)?;
-    let (remaining, _ws) = tuple((space0, org_line_ending))(remaining)?;
+    let (remaining, babel_call_value) = babel_call_value(remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -80,17 +57,22 @@ where
                 context.get_global_settings(),
                 affiliated_keywords,
             ),
-            value: Into::<&str>::into(value).trim_end(),
+            value: Into::<&str>::into(babel_call_value.value),
             call: babel_call_value.call.map(Into::<&str>::into),
             inside_header: babel_call_value.inside_header.map(Into::<&str>::into),
             arguments: babel_call_value.arguments.map(Into::<&str>::into),
             end_header: babel_call_value.end_header.map(Into::<&str>::into),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
 
 #[derive(Debug)]
 struct BabelCallValue<'s> {
+    /// The entire string to the right of "#+call: " without the trailing line break.
+    value: OrgSource<'s>,
+
+    /// The function name which may contain a line break if there are no headers/arguments.
     call: Option<OrgSource<'s>>,
     inside_header: Option<OrgSource<'s>>,
     arguments: Option<OrgSource<'s>>,
@@ -99,13 +81,45 @@ struct BabelCallValue<'s> {
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn babel_call_value<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, BabelCallValue<'s>> {
-    let (remaining, call) = opt(babel_call_call)(input)?;
-    let (remaining, inside_header) = opt(inside_header)(remaining)?;
-    let (remaining, arguments) = opt(arguments)(remaining)?;
-    let (remaining, end_header) = opt(end_header)(remaining)?;
+    alt((
+        babel_call_value_without_headers,
+        babel_call_value_with_headers,
+    ))(input)
+}
+
+#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
+fn babel_call_value_without_headers<'s>(
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, BabelCallValue<'s>> {
+    let (remaining, value) = babel_call_call_with_headers(input)?;
+    let (remaining, _ws) = tuple((space0, org_line_ending))(remaining)?;
+    let call = get_consumed(input, remaining);
     Ok((
         remaining,
         BabelCallValue {
+            value,
+            call: Some(call),
+            inside_header: None,
+            arguments: None,
+            end_header: None,
+        },
+    ))
+}
+
+#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
+fn babel_call_value_with_headers<'s>(
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, BabelCallValue<'s>> {
+    let (remaining, call) = opt(babel_call_call_with_headers)(input)?;
+    let (remaining, inside_header) = opt(inside_header)(remaining)?;
+    let (remaining, arguments) = opt(arguments)(remaining)?;
+    let (remaining, end_header) = opt(end_header)(remaining)?;
+    let value = get_consumed(input, remaining);
+    let (remaining, _ws) = tuple((space0, org_line_ending))(remaining)?;
+    Ok((
+        remaining,
+        BabelCallValue {
+            value,
             call,
             inside_header,
             arguments: arguments.flatten(),
@@ -115,14 +129,15 @@ fn babel_call_value<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, BabelCallVal
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn babel_call_call<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
+fn babel_call_call_with_headers<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
+    // When babel call contains no arguments or headers (for example: "#+call: lorem ipsum\n") then the trailing line break is part of the call. Otherwise, it is not.
     verify(
         recognize(many_till(
             anychar,
-            alt((
-                peek(recognize(one_of("[("))),
+            peek(alt((
+                recognize(one_of("[(")),
                 recognize(tuple((space0, org_line_ending))),
-            )),
+            ))),
         )),
         |s| s.len() > 0,
     )(input)
@@ -232,19 +247,3 @@ fn impl_balanced_bracket<
     };
     Ok((remaining, contents))
 }
-
-#[cfg(test)]
-mod tests {
-    use nom::combinator::opt;
-
-    use super::*;
-
-    #[test]
-    fn simple_call() -> Result<(), Box<dyn std::error::Error>> {
-        let input = OrgSource::new("()");
-        let (remaining, call) = opt(babel_call_call)(input)?;
-        assert_eq!(Into::<&str>::into(remaining), "()");
-        assert!(call.is_none());
-        Ok(())
-    }
-}
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 596d056..004f938 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -172,6 +172,7 @@ pub struct BabelCall<'s> {
     pub inside_header: Option<&'s str>,
     pub arguments: Option<&'s str>,
     pub end_header: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -438,11 +439,15 @@ impl<'s> StandardProperties<'s> for BabelCall<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From d6232dc49c3fb54c6979782eeb2905bfdbe3f20a Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 10:49:04 -0500
Subject: [PATCH 44/78] Implement the new fields for clock.

---
 src/parser/clock.rs         | 3 ++-
 src/types/lesser_element.rs | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/clock.rs b/src/parser/clock.rs
index e25dd39..0ad17b0 100644
--- a/src/parser/clock.rs
+++ b/src/parser/clock.rs
@@ -40,7 +40,7 @@ pub(crate) fn clock<'b, 'g, 'r, 's>(
     let (remaining, (timestamp, duration)) = clock_timestamp(context, remaining)?;
     let (remaining, _) = tuple((space0, org_line_ending))(remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -54,6 +54,7 @@ pub(crate) fn clock<'b, 'g, 'r, 's>(
             } else {
                 ClockStatus::Running
             },
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 004f938..1a3c185 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -124,6 +124,7 @@ pub struct Clock<'s> {
     pub timestamp: Timestamp<'s>,
     pub duration: Option<&'s str>,
     pub status: ClockStatus,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -351,11 +352,15 @@ impl<'s> StandardProperties<'s> for Clock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 28f12a04f7af8ef6e81df76754249050dcc0d364 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 10:59:40 -0500
Subject: [PATCH 45/78] Implement the new fields for drawer.

---
 src/parser/drawer.rs         | 57 +++++++++++++++++++++++-------------
 src/types/greater_element.rs | 10 +++++--
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/parser/drawer.rs b/src/parser/drawer.rs
index ecbc618..d36c260 100644
--- a/src/parser/drawer.rs
+++ b/src/parser/drawer.rs
@@ -4,6 +4,7 @@ use nom::bytes::complete::tag_no_case;
 use nom::bytes::complete::take_while;
 use nom::character::complete::line_ending;
 use nom::character::complete::space0;
+use nom::combinator::consumed;
 use nom::combinator::eof;
 use nom::combinator::not;
 use nom::combinator::recognize;
@@ -70,29 +71,12 @@ where
     let parser_context = context.with_additional_node(&contexts[0]);
     let parser_context = parser_context.with_additional_node(&contexts[1]);
     let parser_context = parser_context.with_additional_node(&contexts[2]);
+    let (remaining, (contents, children)) =
+        consumed(parser_with_context!(children)(&parser_context))(remaining)?;
 
-    let element_matcher = parser_with_context!(element(true))(&parser_context);
-    let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
-    let (remaining, children) = match tuple((
-        not(exit_matcher),
-        blank_line,
-        many_till(blank_line, exit_matcher),
-    ))(remaining)
-    {
-        Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
-            let source = get_consumed(remaining, remain);
-            let element = Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()));
-            (remain, vec![element])
-        }
-        Err(_) => {
-            let (remaining, (children, _exit_contents)) =
-                many_till(element_matcher, exit_matcher)(remaining)?;
-            (remaining, children)
-        }
-    };
     let (remaining, _end) = drawer_end(&parser_context, remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -106,10 +90,43 @@ where
             ),
             drawer_name: drawer_name.into(),
             children,
+            contents: Some(contents.into()),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
 
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(ret, level = "debug", skip(context))
+)]
+fn children<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<Element<'s>>> {
+    let element_matcher = parser_with_context!(element(true))(context);
+    let exit_matcher = parser_with_context!(exit_matcher_parser)(context);
+
+    let (remaining, children) = match tuple((
+        not(exit_matcher),
+        blank_line,
+        many_till(blank_line, exit_matcher),
+    ))(input)
+    {
+        Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
+            let source = get_consumed(input, remain);
+            let element = Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()));
+            (remain, vec![element])
+        }
+        Err(_) => {
+            let (remaining, (children, _exit_contents)) =
+                many_till(element_matcher, exit_matcher)(input)?;
+            (remaining, children)
+        }
+    };
+    Ok((remaining, children))
+}
+
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 fn name<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     take_while(|c| WORD_CONSTITUENT_CHARACTERS.contains(c) || "-_".contains(c))(input)
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index d16806e..05606cc 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -95,6 +95,8 @@ pub struct Drawer<'s> {
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub drawer_name: &'s str,
     pub children: Vec<Element<'s>>,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -238,11 +240,15 @@ impl<'s> StandardProperties<'s> for Drawer<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 252be3e00159eefab3f71cae2e054962ac79608b Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 11:38:52 -0500
Subject: [PATCH 46/78] Fix post blank for timestamp date ranges.

---
 src/parser/clock.rs     |  2 +-
 src/parser/timestamp.rs | 50 +++++++++++++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/parser/clock.rs b/src/parser/clock.rs
index 0ad17b0..e702640 100644
--- a/src/parser/clock.rs
+++ b/src/parser/clock.rs
@@ -82,7 +82,7 @@ fn clock_timestamp<'b, 'g, 'r, 's>(
             |(timestamp, duration)| (timestamp, duration.map(Into::<&str>::into)),
         ),
         map(
-            parser_with_context!(inactive_timestamp)(context),
+            parser_with_context!(inactive_timestamp(true))(context),
             |timestamp| (timestamp, None),
         ),
     ))(input)
diff --git a/src/parser/timestamp.rs b/src/parser/timestamp.rs
index 6b41fe6..1342c25 100644
--- a/src/parser/timestamp.rs
+++ b/src/parser/timestamp.rs
@@ -53,8 +53,8 @@ pub(crate) fn timestamp<'b, 'g, 'r, 's>(
         parser_with_context!(inactive_time_range_timestamp)(context),
         parser_with_context!(active_date_range_timestamp)(context),
         parser_with_context!(inactive_date_range_timestamp)(context),
-        parser_with_context!(active_timestamp)(context),
-        parser_with_context!(inactive_timestamp)(context),
+        parser_with_context!(active_timestamp(true))(context),
+        parser_with_context!(inactive_timestamp(true))(context),
     ))(input)
 }
 
@@ -126,13 +126,23 @@ fn sexp_end<'b, 'g, 'r, 's>(
     alt((tag(")>"), recognize(one_of(">\n"))))(input)
 }
 
+const fn active_timestamp(
+    allow_post_blank: bool,
+) -> impl for<'b, 'g, 'r, 's> Fn(
+    RefContext<'b, 'g, 'r, 's>,
+    OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
+    move |context, input| impl_active_timestamp(context, input, allow_post_blank)
+}
+
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))
 )]
-fn active_timestamp<'b, 'g, 'r, 's>(
+fn impl_active_timestamp<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
+    allow_post_blank: bool,
 ) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _) = tag("<")(input)?;
     let (remaining, start) = date(context, remaining)?;
@@ -160,8 +170,11 @@ fn active_timestamp<'b, 'g, 'r, 's>(
     )))(remaining)?;
     let (remaining, _) = tag(">")(remaining)?;
 
-    let (remaining, post_blank) =
-        maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
+    let (remaining, post_blank) = if allow_post_blank {
+        maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?
+    } else {
+        (remaining, None)
+    };
     let source = get_consumed(input, remaining);
 
     Ok((
@@ -181,13 +194,23 @@ fn active_timestamp<'b, 'g, 'r, 's>(
     ))
 }
 
+pub(crate) const fn inactive_timestamp(
+    allow_post_blank: bool,
+) -> impl for<'b, 'g, 'r, 's> Fn(
+    RefContext<'b, 'g, 'r, 's>,
+    OrgSource<'s>,
+) -> Res<OrgSource<'s>, Timestamp<'s>> {
+    move |context, input| impl_inactive_timestamp(context, input, allow_post_blank)
+}
+
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))
 )]
-pub(crate) fn inactive_timestamp<'b, 'g, 'r, 's>(
+fn impl_inactive_timestamp<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
+    allow_post_blank: bool,
 ) -> Res<OrgSource<'s>, Timestamp<'s>> {
     let (remaining, _) = tag("[")(input)?;
     let (remaining, start) = date(context, remaining)?;
@@ -215,8 +238,11 @@ pub(crate) fn inactive_timestamp<'b, 'g, 'r, 's>(
     )))(remaining)?;
     let (remaining, _) = tag("]")(remaining)?;
 
-    let (remaining, post_blank) =
-        maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
+    let (remaining, post_blank) = if allow_post_blank {
+        maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?
+    } else {
+        (remaining, None)
+    };
     let source = get_consumed(input, remaining);
 
     Ok((
@@ -244,10 +270,10 @@ fn active_date_range_timestamp<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Timestamp<'s>> {
-    let (remaining, first_timestamp) = active_timestamp(context, input)?;
+    let (remaining, first_timestamp) = impl_active_timestamp(context, input, false)?;
     // TODO: Does the space0 at the end of the active/inactive timestamp parsers cause this to be incorrect? I could use a look-behind to make sure the preceding character is not whitespace
     let (remaining, _separator) = tag("--")(remaining)?;
-    let (remaining, second_timestamp) = active_timestamp(context, remaining)?;
+    let (remaining, second_timestamp) = impl_active_timestamp(context, remaining, false)?;
 
     let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
@@ -335,10 +361,10 @@ pub(crate) fn inactive_date_range_timestamp<'b, 'g, 'r, 's>(
     context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Timestamp<'s>> {
-    let (remaining, first_timestamp) = inactive_timestamp(context, input)?;
+    let (remaining, first_timestamp) = impl_inactive_timestamp(context, input, false)?;
     // TODO: Does the space0 at the end of the active/inactive timestamp parsers cause this to be incorrect? I could use a look-behind to make sure the preceding character is not whitespace
     let (remaining, _separator) = tag("--")(remaining)?;
-    let (remaining, second_timestamp) = inactive_timestamp(context, remaining)?;
+    let (remaining, second_timestamp) = impl_inactive_timestamp(context, remaining, false)?;
 
     let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;

From f192507cd992bebcc54bb11b8744589debbf0d34 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 12:10:34 -0500
Subject: [PATCH 47/78] Implement the new fields for diary sexp.

---
 src/parser/diary_sexp.rs    | 3 ++-
 src/types/lesser_element.rs | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/diary_sexp.rs b/src/parser/diary_sexp.rs
index c58f0d3..5230e2f 100644
--- a/src/parser/diary_sexp.rs
+++ b/src/parser/diary_sexp.rs
@@ -31,7 +31,7 @@ where
     let (remaining, value) = recognize(tuple((tag("%%("), is_not("\r\n"))))(remaining)?;
     let (remaining, _eol) = org_line_ending(remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -43,6 +43,7 @@ where
                 affiliated_keywords,
             ),
             value: Into::<&str>::into(value),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 1a3c185..9c4ff95 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -132,6 +132,7 @@ pub struct DiarySexp<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -370,11 +371,15 @@ impl<'s> StandardProperties<'s> for DiarySexp<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 3962db12a88413b06d3ed3d5ee0ec1adaa4ae00a Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 12:29:46 -0500
Subject: [PATCH 48/78] Implement the new fields for fixed width area.

---
 src/compare/util.rs            | 2 +-
 src/parser/fixed_width_area.rs | 3 ++-
 src/types/lesser_element.rs    | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index e1df0db..79cefcd 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -139,7 +139,7 @@ fn assert_post_blank<'b, 's, S: StandardProperties<'s> + ?Sized>(
         .post_blank
         .ok_or("Token should have a post-blank.")?;
     if rust_post_blank as usize != emacs_post_blank {
-        Err(format!("Rust post-blank (in chars) {rust_post_blank} does not match emacs post-blank ({emacs_post_blank})", rust_post_blank = rust_post_blank, emacs_post_blank = emacs_post_blank))?;
+        Err(format!("Rust post-blank {rust_post_blank} does not match emacs post-blank ({emacs_post_blank})", rust_post_blank = rust_post_blank, emacs_post_blank = emacs_post_blank))?;
     }
 
     Ok(())
diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs
index 73f4d15..eae3833 100644
--- a/src/parser/fixed_width_area.rs
+++ b/src/parser/fixed_width_area.rs
@@ -41,7 +41,7 @@ where
     let (remaining, mut remaining_lines) =
         many0(preceded(not(exit_matcher), fixed_width_area_line_matcher))(remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     let mut value = Vec::with_capacity(remaining_lines.len() + 1);
@@ -66,6 +66,7 @@ where
                 affiliated_keywords,
             ),
             value,
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 9c4ff95..8ddaa12 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -148,6 +148,7 @@ pub struct FixedWidthArea<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub value: Vec<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -403,11 +404,15 @@ impl<'s> StandardProperties<'s> for FixedWidthArea<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 60d1ecfa759c1fe6abf8a815c3bb9f06b87c418d Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 12:45:51 -0500
Subject: [PATCH 49/78] Fix fixed width area to not consume trailing line break
 so it can be part of the post-blank.

---
 src/parser/fixed_width_area.rs | 49 ++++++++++++++--------------------
 src/parser/util.rs             | 23 ++++++++++++++++
 src/types/lesser_element.rs    |  8 +-----
 3 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs
index eae3833..9631ac8 100644
--- a/src/parser/fixed_width_area.rs
+++ b/src/parser/fixed_width_area.rs
@@ -2,16 +2,19 @@ use nom::branch::alt;
 use nom::bytes::complete::tag;
 use nom::character::complete::anychar;
 use nom::character::complete::space0;
+use nom::combinator::map;
 use nom::combinator::not;
+use nom::combinator::peek;
 use nom::combinator::recognize;
 use nom::multi::many0;
 use nom::multi::many_till;
 use nom::sequence::preceded;
 use nom::sequence::tuple;
+use nom::InputTake;
 
 use super::affiliated_keyword::parse_affiliated_keywords;
 use super::org_source::OrgSource;
-use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
+use super::util::maybe_consume_trailing_whitespace_if_not_exiting_mid_line;
 use super::util::org_line_ending;
 use crate::context::parser_with_context;
 use crate::context::RefContext;
@@ -35,28 +38,22 @@ pub(crate) fn fixed_width_area<'b, 'g, 'r, 's, AK>(
 where
     AK: IntoIterator<Item = Keyword<'s>>,
 {
-    let fixed_width_area_line_matcher = parser_with_context!(fixed_width_area_line)(context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(context);
-    let (remaining, first_line) = fixed_width_area_line_matcher(remaining)?;
-    let (remaining, mut remaining_lines) =
-        many0(preceded(not(exit_matcher), fixed_width_area_line_matcher))(remaining)?;
+    let (remaining, first_line) = fixed_width_area_line(remaining)?;
+    let (remaining, remaining_lines) = many0(preceded(
+        not(tuple((org_line_ending, exit_matcher))),
+        map(
+            tuple((org_line_ending, fixed_width_area_line)),
+            |(_line_ending, line_contents)| line_contents,
+        ),
+    ))(remaining)?;
 
     let (remaining, post_blank) =
-        maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
+        maybe_consume_trailing_whitespace_if_not_exiting_mid_line(context, remaining)?;
     let source = get_consumed(input, remaining);
     let mut value = Vec::with_capacity(remaining_lines.len() + 1);
-    let last_line = remaining_lines.pop();
-    if let Some(last_line) = last_line {
-        value.push(Into::<&str>::into(first_line));
-        value.extend(remaining_lines.into_iter().map(Into::<&str>::into));
-        let last_line = Into::<&str>::into(last_line);
-        // Trim the line ending from the final line.
-        value.push(&last_line[..(last_line.len() - 1)])
-    } else {
-        // Trim the line ending from the only line.
-        let only_line = Into::<&str>::into(first_line);
-        value.push(&only_line[..(only_line.len() - 1)])
-    }
+    value.push(Into::<&str>::into(first_line));
+    value.extend(remaining_lines.into_iter().map(Into::<&str>::into));
     Ok((
         remaining,
         FixedWidthArea {
@@ -71,21 +68,15 @@ where
     ))
 }
 
-#[cfg_attr(
-    feature = "tracing",
-    tracing::instrument(ret, level = "debug", skip(_context))
-)]
-fn fixed_width_area_line<'b, 'g, 'r, 's>(
-    _context: RefContext<'b, 'g, 'r, 's>,
-    input: OrgSource<'s>,
-) -> Res<OrgSource<'s>, OrgSource<'s>> {
+#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
+fn fixed_width_area_line<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(input)?;
     let (remaining, _) = tuple((space0, tag(":")))(input)?;
-    if let Ok((remaining, line_break)) = org_line_ending(remaining) {
-        return Ok((remaining, line_break));
+    if let Ok((remain, _line_break)) = org_line_ending(remaining) {
+        return Ok((remain, remaining.take(0)));
     }
     let (remaining, _) = tag(" ")(remaining)?;
-    let (remaining, value) = recognize(many_till(anychar, org_line_ending))(remaining)?;
+    let (remaining, value) = recognize(many_till(anychar, peek(org_line_ending)))(remaining)?;
     Ok((remaining, value))
 }
 
diff --git a/src/parser/util.rs b/src/parser/util.rs
index 29523f2..3ed86d2 100644
--- a/src/parser/util.rs
+++ b/src/parser/util.rs
@@ -72,6 +72,13 @@ fn element_trailing_whitespace<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, O
     alt((eof, recognize(many0(blank_line))))(input)
 }
 
+#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
+fn element_trailing_whitespace_mid_line<'s>(
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
+    alt((eof, recognize(many0(blank_line))))(input)
+}
+
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))
@@ -114,6 +121,22 @@ pub(crate) fn maybe_consume_trailing_whitespace_if_not_exiting<'b, 'g, 'r, 's>(
     }
 }
 
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(ret, level = "debug", skip(context))
+)]
+pub(crate) fn maybe_consume_trailing_whitespace_if_not_exiting_mid_line<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Option<OrgSource<'s>>> {
+    if context.should_consume_trailing_whitespace() && exit_matcher_parser(context, input).is_err()
+    {
+        Ok(opt(element_trailing_whitespace_mid_line)(input)?)
+    } else {
+        Ok((input, None))
+    }
+}
+
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 8ddaa12..17933df 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -498,13 +498,7 @@ impl<'s> Comment<'s> {
 
 impl<'s> FixedWidthArea<'s> {
     pub fn get_value(&self) -> String {
-        let final_size = self.value.iter().map(|line| line.len()).sum();
-        let mut ret = String::with_capacity(final_size);
-        for line in &self.value {
-            ret.push_str(line);
-        }
-
-        ret
+        self.value.join("\n")
     }
 }
 

From 21819932462ce51f4873f3ca7ee19133877786fc Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 12:50:01 -0500
Subject: [PATCH 50/78] Implement the new fields for horizontal rule.

---
 src/parser/horizontal_rule.rs | 3 ++-
 src/types/lesser_element.rs   | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/horizontal_rule.rs b/src/parser/horizontal_rule.rs
index eb1e015..f71e416 100644
--- a/src/parser/horizontal_rule.rs
+++ b/src/parser/horizontal_rule.rs
@@ -38,7 +38,7 @@ where
         space0,
         alt((line_ending, eof)),
     )))(remaining)?;
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -49,6 +49,7 @@ where
                 context.get_global_settings(),
                 affiliated_keywords,
             ),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 17933df..acc7bc0 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -155,6 +155,7 @@ pub struct FixedWidthArea<'s> {
 pub struct HorizontalRule<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -422,11 +423,15 @@ impl<'s> StandardProperties<'s> for HorizontalRule<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 57f566a7a185d9c95ff9bd36923b8c858a152cd7 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 12:55:05 -0500
Subject: [PATCH 51/78] Implement the new fields for planning.

---
 src/parser/planning.rs      | 3 ++-
 src/types/lesser_element.rs | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/parser/planning.rs b/src/parser/planning.rs
index caaf151..804e070 100644
--- a/src/parser/planning.rs
+++ b/src/parser/planning.rs
@@ -33,7 +33,7 @@ pub(crate) fn planning<'b, 'g, 'r, 's>(
         many1(parser_with_context!(planning_parameter)(context))(remaining)?;
     let (remaining, _trailing_ws) = tuple((space0, org_line_ending))(remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -62,6 +62,7 @@ pub(crate) fn planning<'b, 'g, 'r, 's>(
             scheduled,
             deadline,
             closed,
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index acc7bc0..49a4d76 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -141,6 +141,7 @@ pub struct Planning<'s> {
     pub scheduled: Option<Timestamp<'s>>,
     pub deadline: Option<Timestamp<'s>>,
     pub closed: Option<Timestamp<'s>>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -391,11 +392,15 @@ impl<'s> StandardProperties<'s> for Planning<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From bb472b63cc4ffc99d03a64b01b8f6da3aa43345c Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 13:03:42 -0500
Subject: [PATCH 52/78] Implement the new fields for property drawer.

---
 src/parser/property_drawer.rs | 27 +++++++++++++++++++++------
 src/types/greater_element.rs  | 10 ++++++++--
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/parser/property_drawer.rs b/src/parser/property_drawer.rs
index 5cf4d02..40197f4 100644
--- a/src/parser/property_drawer.rs
+++ b/src/parser/property_drawer.rs
@@ -6,6 +6,7 @@ use nom::character::complete::anychar;
 use nom::character::complete::line_ending;
 use nom::character::complete::space0;
 use nom::character::complete::space1;
+use nom::combinator::consumed;
 use nom::combinator::eof;
 use nom::combinator::opt;
 use nom::combinator::recognize;
@@ -64,14 +65,11 @@ pub(crate) fn property_drawer<'b, 'g, 'r, 's>(
     let parser_context = context.with_additional_node(&contexts[0]);
     let parser_context = parser_context.with_additional_node(&contexts[1]);
     let parser_context = parser_context.with_additional_node(&contexts[2]);
-
-    let node_property_matcher = parser_with_context!(node_property)(&parser_context);
-    let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
-    let (remaining, (children, _exit_contents)) =
-        many_till(node_property_matcher, exit_matcher)(remaining)?;
+    let (remaining, (contents, children)) =
+        consumed(parser_with_context!(children)(&parser_context))(remaining)?;
     let (remaining, _end) = property_drawer_end(&parser_context, remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -80,10 +78,27 @@ pub(crate) fn property_drawer<'b, 'g, 'r, 's>(
         PropertyDrawer {
             source: source.into(),
             children,
+            contents: Some(contents.into()),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
 
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(ret, level = "debug", skip(context))
+)]
+fn children<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Vec<NodeProperty<'s>>> {
+    let node_property_matcher = parser_with_context!(node_property)(context);
+    let exit_matcher = parser_with_context!(exit_matcher_parser)(context);
+    let (remaining, (children, _exit_contents)) =
+        many_till(node_property_matcher, exit_matcher)(input)?;
+    Ok((remaining, children))
+}
+
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(_context))
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index 05606cc..6c8ba10 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -103,6 +103,8 @@ pub struct Drawer<'s> {
 pub struct PropertyDrawer<'s> {
     pub source: &'s str,
     pub children: Vec<NodeProperty<'s>>,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -258,11 +260,15 @@ impl<'s> StandardProperties<'s> for PropertyDrawer<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From ffa5349f2591ff8a83db883a6af644bdea815cf9 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 13:14:49 -0500
Subject: [PATCH 53/78] Fix get_contents for headlines.

---
 src/parser/headline.rs |  7 +++++++
 src/types/document.rs  | 28 ++--------------------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/parser/headline.rs b/src/parser/headline.rs
index aca0fa3..a3889b3 100644
--- a/src/parser/headline.rs
+++ b/src/parser/headline.rs
@@ -66,6 +66,7 @@ fn _heading<'b, 'g, 'r, 's>(
     let (remaining, pre_headline) = headline(context, input, parent_star_count)?;
     let section_matcher = bind_context!(section, context);
     let heading_matcher = bind_context!(heading(pre_headline.star_count), context);
+    let contents_begin = remaining;
     let (remaining, maybe_section) =
         opt(map(section_matcher, DocumentElement::Section))(remaining)?;
     let (remaining, _ws) = opt(tuple((start_of_line, many0(blank_line))))(remaining)?;
@@ -91,6 +92,7 @@ fn _heading<'b, 'g, 'r, 's>(
     };
     let is_archived = pre_headline.tags.contains(&"ARCHIVE");
 
+    let contents = get_consumed(contents_begin, remaining);
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
@@ -112,6 +114,11 @@ fn _heading<'b, 'g, 'r, 's>(
             scheduled,
             deadline,
             closed,
+            contents: if contents.len() > 0 {
+                Some(Into::<&str>::into(contents))
+            } else {
+                None
+            },
         },
     ))
 }
diff --git a/src/types/document.rs b/src/types/document.rs
index 157e929..f0bfa74 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -35,6 +35,7 @@ pub struct Heading<'s> {
     pub scheduled: Option<Timestamp<'s>>,
     pub deadline: Option<Timestamp<'s>>,
     pub closed: Option<Timestamp<'s>>,
+    pub contents: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -119,32 +120,7 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        let first_child = self.children.first();
-        let last_child = self.children.last();
-        match (first_child, last_child) {
-            (None, None) => None,
-            (None, Some(_)) | (Some(_), None) => unreachable!(),
-            (Some(first_child), Some(last_child)) => {
-                let first_child_offset = first_child.get_source().as_ptr() as usize;
-                let last_child_offset = {
-                    let last_child_source = last_child.get_source();
-                    last_child_source.as_ptr() as usize + last_child_source.len()
-                };
-                let source_offset = self.source.as_ptr() as usize;
-                debug_assert!(super::lesser_element::is_slice_of(
-                    self.source,
-                    first_child.get_source()
-                ));
-                debug_assert!(super::lesser_element::is_slice_of(
-                    self.source,
-                    last_child.get_source()
-                ));
-                Some(
-                    &self.source[(first_child_offset - source_offset)
-                        ..(last_child_offset - first_child_offset)],
-                )
-            }
-        }
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {

From 7b8fa1eb4a77c91be74aa8a6d4566b822a515db3 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 13:21:58 -0500
Subject: [PATCH 54/78] Fix get_contents for sections.

---
 src/parser/section.rs | 11 ++++-------
 src/types/document.rs |  3 +--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/parser/section.rs b/src/parser/section.rs
index d762cda..487281c 100644
--- a/src/parser/section.rs
+++ b/src/parser/section.rs
@@ -1,4 +1,3 @@
-use nom::combinator::consumed;
 use nom::combinator::opt;
 use nom::combinator::recognize;
 use nom::combinator::verify;
@@ -59,12 +58,12 @@ pub(crate) fn zeroth_section<'b, 'g, 'r, 's>(
         many0(blank_line),
     )))(input)?;
 
-    let (remaining, (contents, (mut children, _exit_contents))) = consumed(verify(
+    let (remaining, (mut children, _exit_contents)) = verify(
         many_till(element_matcher, exit_matcher),
         |(children, _exit_contents)| {
             !children.is_empty() || comment_and_property_drawer_element.is_some()
         },
-    ))(remaining)?;
+    )(remaining)?;
 
     if let Some((comment, property_drawer, _ws)) = comment_and_property_drawer_element {
         children.insert(0, Element::PropertyDrawer(property_drawer));
@@ -81,7 +80,6 @@ pub(crate) fn zeroth_section<'b, 'g, 'r, 's>(
         remaining,
         Section {
             source: source.into(),
-            contents: Some(contents.into()),
             post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
@@ -118,12 +116,12 @@ pub(crate) fn section<'b, 'g, 'r, 's>(
         remaining = remain;
         input = remain;
     }
-    let (remaining, (contents, (mut children, _exit_contents))) = consumed(verify(
+    let (remaining, (mut children, _exit_contents)) = verify(
         many_till(element_matcher, exit_matcher),
         |(children, _exit_contents)| {
             !children.is_empty() || property_drawer_element.is_some() || planning_element.is_some()
         },
-    ))(remaining)?;
+    )(remaining)?;
     if let Some(ele) = property_drawer_element.map(Element::PropertyDrawer) {
         children.insert(0, ele);
     }
@@ -139,7 +137,6 @@ pub(crate) fn section<'b, 'g, 'r, 's>(
         remaining,
         Section {
             source: source.into(),
-            contents: Some(contents.into()),
             post_blank: post_blank.map(Into::<&str>::into),
             children,
         },
diff --git a/src/types/document.rs b/src/types/document.rs
index f0bfa74..bfe0083 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -41,7 +41,6 @@ pub struct Heading<'s> {
 #[derive(Debug)]
 pub struct Section<'s> {
     pub source: &'s str,
-    pub contents: Option<&'s str>,
     pub post_blank: Option<&'s str>,
     pub children: Vec<Element<'s>>,
 }
@@ -102,7 +101,7 @@ impl<'s> StandardProperties<'s> for Section<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        self.contents
+        Some(self.source)
     }
 
     fn get_post_blank(&self) -> PostBlank {

From 6ce25c8a3bbdcea435701873e961d6be40067515 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 14:25:01 -0500
Subject: [PATCH 55/78] Update property drawer empty test to include a variety
 of whitespace.

---
 .../greater_element/property_drawer/empty.org | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/org_mode_samples/greater_element/property_drawer/empty.org b/org_mode_samples/greater_element/property_drawer/empty.org
index d86fd5b..cf5bb6c 100644
--- a/org_mode_samples/greater_element/property_drawer/empty.org
+++ b/org_mode_samples/greater_element/property_drawer/empty.org
@@ -1,3 +1,32 @@
+* Empty
+:PROPERTIES:
+:END:
+* Single new line
 :PROPERTIES:
 
+:END:
+* Single line with spaces
+:PROPERTIES:
+      
+:END:
+* Many lines, first line without spaces
+:PROPERTIES:
+
+
+
+
+:END:
+* Many lines, first line with spaces
+:PROPERTIES:
+      
+
+
+
+:END:
+* Many lines, first line with spaces, later line with spaces
+:PROPERTIES:
+      
+
+    
+
 :END:

From 7430daa7687433b669da4af86d97bcf9a2118ba4 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 14:49:28 -0500
Subject: [PATCH 56/78] Fix handling of property drawers containing only
 whitespace.

---
 src/parser/drawer.rs          | 27 +++++---------
 src/parser/paragraph.rs       | 68 +++++++++++++++++++++++++++++++++++
 src/parser/property_drawer.rs |  6 +++-
 src/types/lesser_element.rs   | 23 ++++++++++--
 4 files changed, 103 insertions(+), 21 deletions(-)

diff --git a/src/parser/drawer.rs b/src/parser/drawer.rs
index d36c260..7afd553 100644
--- a/src/parser/drawer.rs
+++ b/src/parser/drawer.rs
@@ -13,7 +13,9 @@ use nom::sequence::tuple;
 
 use super::affiliated_keyword::parse_affiliated_keywords;
 use super::org_source::OrgSource;
+use super::paragraph::empty_paragraph;
 use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
+use crate::context::bind_context;
 use crate::context::parser_with_context;
 use crate::context::ContextElement;
 use crate::context::ExitClass;
@@ -22,7 +24,6 @@ use crate::context::RefContext;
 use crate::error::CustomError;
 use crate::error::Res;
 use crate::parser::element_parser::element;
-use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::util::immediate_in_section;
@@ -31,7 +32,6 @@ use crate::parser::util::WORD_CONSTITUENT_CHARACTERS;
 use crate::types::Drawer;
 use crate::types::Element;
 use crate::types::Keyword;
-use crate::types::Paragraph;
 
 #[cfg_attr(
     feature = "tracing",
@@ -107,23 +107,14 @@ fn children<'b, 'g, 'r, 's>(
     let element_matcher = parser_with_context!(element(true))(context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(context);
 
-    let (remaining, children) = match tuple((
-        not(exit_matcher),
-        blank_line,
-        many_till(blank_line, exit_matcher),
-    ))(input)
+    if let Ok((remaining, (_not_exit, empty_para))) =
+        tuple((not(exit_matcher), bind_context!(empty_paragraph, context)))(input)
     {
-        Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
-            let source = get_consumed(input, remain);
-            let element = Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()));
-            (remain, vec![element])
-        }
-        Err(_) => {
-            let (remaining, (children, _exit_contents)) =
-                many_till(element_matcher, exit_matcher)(input)?;
-            (remaining, children)
-        }
-    };
+        return Ok((remaining, vec![Element::Paragraph(empty_para)]));
+    }
+
+    let (remaining, (children, _exit_contents)) = many_till(element_matcher, exit_matcher)(input)?;
+
     Ok((remaining, children))
 }
 
diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs
index badfea4..237dce1 100644
--- a/src/parser/paragraph.rs
+++ b/src/parser/paragraph.rs
@@ -1,6 +1,8 @@
 use nom::branch::alt;
+use nom::character::complete::space1;
 use nom::combinator::consumed;
 use nom::combinator::eof;
+use nom::combinator::opt;
 use nom::combinator::recognize;
 use nom::combinator::verify;
 use nom::multi::many1;
@@ -13,6 +15,7 @@ use super::org_source::OrgSource;
 use super::util::blank_line;
 use super::util::get_consumed;
 use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
+use super::util::org_line_ending;
 use crate::context::parser_with_context;
 use crate::context::ContextElement;
 use crate::context::ExitClass;
@@ -72,6 +75,57 @@ where
     ))
 }
 
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(ret, level = "debug", skip(context))
+)]
+pub(crate) fn empty_paragraph<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Paragraph<'s>> {
+    // If it is just a single newline then source, contents, and post-blank are "\n".
+    // If it has multiple newlines then contents is the first "\n" and post-blank is all the new lines.
+    // If there are any spaces on the first line then post-blank excludes the first line.
+
+    let exit_matcher = parser_with_context!(exit_matcher_parser)(context);
+
+    let (remaining, first_line_with_spaces) =
+        opt(recognize(tuple((space1, org_line_ending))))(input)?;
+
+    let post_blank_begin = remaining;
+
+    if let Some(first_line_with_spaces) = first_line_with_spaces {
+        let (remaining, _additional_lines) =
+            recognize(many_till(blank_line, exit_matcher))(remaining)?;
+        let post_blank = get_consumed(post_blank_begin, remaining);
+        let source = get_consumed(input, remaining);
+        Ok((
+            remaining,
+            Paragraph::of_text_full(
+                Into::<&str>::into(source),
+                Into::<&str>::into(first_line_with_spaces),
+                Some(Into::<&str>::into(first_line_with_spaces)),
+                Some(Into::<&str>::into(post_blank)),
+            ),
+        ))
+    } else {
+        let (remaining, first_line) = blank_line(remaining)?;
+        let (remaining, _additional_lines) =
+            recognize(many_till(blank_line, exit_matcher))(remaining)?;
+        let post_blank = get_consumed(post_blank_begin, remaining);
+        let source = get_consumed(input, remaining);
+        Ok((
+            remaining,
+            Paragraph::of_text_full(
+                Into::<&str>::into(source),
+                Into::<&str>::into(first_line),
+                Some(Into::<&str>::into(first_line)),
+                Some(Into::<&str>::into(post_blank)),
+            ),
+        ))
+    }
+}
+
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))
@@ -99,6 +153,7 @@ mod tests {
     use crate::context::List;
     use crate::parser::element_parser::element;
     use crate::parser::org_source::OrgSource;
+    use crate::parser::paragraph::empty_paragraph;
     use crate::types::StandardProperties;
 
     #[test]
@@ -115,4 +170,17 @@ mod tests {
         assert_eq!(first_paragraph.get_source(), "foo bar baz\n\n");
         assert_eq!(second_paragraph.get_source(), "lorem ipsum");
     }
+
+    #[test]
+    fn paragraph_whitespace() {
+        let input = OrgSource::new("\n");
+        let global_settings = GlobalSettings::default();
+        let initial_context = ContextElement::document_context();
+        let initial_context = Context::new(&global_settings, List::new(&initial_context));
+        let paragraph_matcher = bind_context!(empty_paragraph, &initial_context);
+        let (remaining, paragraph) = paragraph_matcher(input).expect("Parse paragraph");
+        assert_eq!(Into::<&str>::into(remaining), "");
+        assert_eq!(paragraph.get_source(), "\n");
+        assert_eq!(paragraph.get_contents(), Some("\n"));
+    }
 }
diff --git a/src/parser/property_drawer.rs b/src/parser/property_drawer.rs
index 40197f4..4191f60 100644
--- a/src/parser/property_drawer.rs
+++ b/src/parser/property_drawer.rs
@@ -78,7 +78,11 @@ pub(crate) fn property_drawer<'b, 'g, 'r, 's>(
         PropertyDrawer {
             source: source.into(),
             children,
-            contents: Some(contents.into()),
+            contents: if contents.len() > 0 {
+                Some(contents.into())
+            } else {
+                None
+            },
             post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 49a4d76..ab696b4 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -204,10 +204,29 @@ impl<'s> Paragraph<'s> {
     ///
     /// This is used for elements that support an "empty" content like greater blocks.
     pub(crate) fn of_text(source: &'s str, body: &'s str) -> Self {
+        // TODO: This should be replaced with of_text_full.
         Paragraph {
             source,
-            contents: None,   // TODO
-            post_blank: None, // TODO
+            contents: None,
+            post_blank: None,
+            affiliated_keywords: AffiliatedKeywords::default(),
+            children: vec![Object::PlainText(PlainText { source: body })],
+        }
+    }
+
+    /// Generate a paragraph of the passed in text with no additional properties.
+    ///
+    /// This is used for elements that support an "empty" content like greater blocks.
+    pub(crate) fn of_text_full(
+        source: &'s str,
+        body: &'s str,
+        contents: Option<&'s str>,
+        post_blank: Option<&'s str>,
+    ) -> Self {
+        Paragraph {
+            source,
+            contents,
+            post_blank,
             affiliated_keywords: AffiliatedKeywords::default(),
             children: vec![Object::PlainText(PlainText { source: body })],
         }

From e47901a67f71c03870e37ce5049db20bc821aca0 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 14:57:44 -0500
Subject: [PATCH 57/78] Implement the new fields for node property.

---
 src/types/greater_element.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index 6c8ba10..d3e2da1 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -278,11 +278,11 @@ impl<'s> StandardProperties<'s> for NodeProperty<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        0
     }
 }
 

From 45a506334c7b2d2e46610472e43cf083db4d94b1 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 15:20:31 -0500
Subject: [PATCH 58/78] Remove leading blank lines from heading contents.

---
 src/parser/headline.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parser/headline.rs b/src/parser/headline.rs
index a3889b3..6af4336 100644
--- a/src/parser/headline.rs
+++ b/src/parser/headline.rs
@@ -66,7 +66,7 @@ fn _heading<'b, 'g, 'r, 's>(
     let (remaining, pre_headline) = headline(context, input, parent_star_count)?;
     let section_matcher = bind_context!(section, context);
     let heading_matcher = bind_context!(heading(pre_headline.star_count), context);
-    let contents_begin = remaining;
+    let (contents_begin, _) = opt(many0(blank_line))(remaining)?;
     let (remaining, maybe_section) =
         opt(map(section_matcher, DocumentElement::Section))(remaining)?;
     let (remaining, _ws) = opt(tuple((start_of_line, many0(blank_line))))(remaining)?;

From fce5b920916ab156dc7a7c83ac01b826ac01855e Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 15:30:46 -0500
Subject: [PATCH 59/78] Remove leading blank lines from document contents.

---
 src/parser/document.rs |  7 +++++++
 src/types/document.rs  | 25 ++-----------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/parser/document.rs b/src/parser/document.rs
index 0f11d88..65aabc3 100644
--- a/src/parser/document.rs
+++ b/src/parser/document.rs
@@ -181,8 +181,10 @@ fn _document<'b, 'g, 'r, 's>(
     let zeroth_section_matcher = parser_with_context!(zeroth_section)(context);
     let heading_matcher = parser_with_context!(heading(0))(context);
     let (remaining, _blank_lines) = many0(blank_line)(input)?;
+    let contents_begin = remaining;
     let (remaining, zeroth_section) = opt(zeroth_section_matcher)(remaining)?;
     let (remaining, children) = many0(heading_matcher)(remaining)?;
+    let contents = get_consumed(contents_begin, remaining);
     let source = get_consumed(input, remaining);
     Ok((
         remaining,
@@ -192,6 +194,11 @@ fn _document<'b, 'g, 'r, 's>(
             path: None,
             zeroth_section,
             children,
+            contents: if contents.len() > 0 {
+                Some(Into::<&str>::into(contents))
+            } else {
+                None
+            },
         },
     ))
 }
diff --git a/src/types/document.rs b/src/types/document.rs
index bfe0083..df27ff7 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -1,6 +1,5 @@
 use std::path::PathBuf;
 
-use super::remove_trailing::RemoveTrailing;
 use super::Element;
 use super::NodeProperty;
 use super::Object;
@@ -18,6 +17,7 @@ pub struct Document<'s> {
     pub path: Option<PathBuf>,
     pub zeroth_section: Option<Section<'s>>,
     pub children: Vec<Heading<'s>>,
+    pub contents: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -63,28 +63,7 @@ impl<'s> StandardProperties<'s> for Document<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        let post_blank = self.get_post_blank();
-        let mut content_lines = self
-            .source
-            .split_inclusive('\n')
-            .remove_trailing(post_blank);
-        let first_line = content_lines.next();
-        let last_line = content_lines.last().or(first_line);
-        match (first_line, last_line) {
-            (None, None) => None,
-            (None, Some(_)) | (Some(_), None) => unreachable!(),
-            (Some(first_line), Some(last_line)) => {
-                let first_line_offset = first_line.as_ptr() as usize;
-                let last_line_offset = last_line.as_ptr() as usize + last_line.len();
-                let source_offset = self.source.as_ptr() as usize;
-                debug_assert!(super::lesser_element::is_slice_of(self.source, first_line));
-                debug_assert!(super::lesser_element::is_slice_of(self.source, last_line));
-                Some(
-                    &self.source[(first_line_offset - source_offset)
-                        ..(last_line_offset - first_line_offset)],
-                )
-            }
-        }
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {

From 7b88a2d24877561db72d1a4618de97734fcd441d Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 15:40:17 -0500
Subject: [PATCH 60/78] Implement the new fields for broken end bullshitium.

---
 src/parser/bullshitium.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/parser/bullshitium.rs b/src/parser/bullshitium.rs
index 1757fcb..66de4c9 100644
--- a/src/parser/bullshitium.rs
+++ b/src/parser/bullshitium.rs
@@ -73,14 +73,18 @@ pub(crate) fn broken_end<'b, 'g, 'r, 's>(
         };
         Ok((remaining, paragraph))
     } else {
-        let (remaining, _trailing_ws) =
+        let (remaining, post_blank) =
             maybe_consume_trailing_whitespace_if_not_exiting(context, lead_in_remaining)?;
 
+        let body = Into::<&str>::into(input.get_until(lead_in_remaining));
+
         Ok((
             remaining,
-            Paragraph::of_text(
+            Paragraph::of_text_full(
                 input.get_until(remaining).into(),
-                input.get_until(lead_in_remaining).into(),
+                body,
+                if body.len() > 0 { Some(body) } else { None },
+                post_blank.map(Into::<&str>::into),
             ),
         ))
     }

From 022dda06ebead6a5304c30fd78541383e9afc393 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 15:52:53 -0500
Subject: [PATCH 61/78] Implement the new fields for plain list item.

---
 src/parser/plain_list.rs     | 21 +++++++++++++++++----
 src/types/greater_element.rs | 10 ++++++++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/parser/plain_list.rs b/src/parser/plain_list.rs
index b42ce1b..192647d 100644
--- a/src/parser/plain_list.rs
+++ b/src/parser/plain_list.rs
@@ -7,6 +7,7 @@ use nom::character::complete::multispace1;
 use nom::character::complete::one_of;
 use nom::character::complete::space0;
 use nom::character::complete::space1;
+use nom::combinator::consumed;
 use nom::combinator::eof;
 use nom::combinator::map;
 use nom::combinator::not;
@@ -265,7 +266,7 @@ fn plain_list_item<'b, 'g, 'r, 's>(
     let maybe_contentless_item: Res<OrgSource<'_>, ()> =
         detect_contentless_item_contents(&parser_context, remaining);
     if let Ok((_rem, _ws)) = maybe_contentless_item {
-        let (remaining, _trailing_ws) = if tuple((
+        let (remaining, post_blank) = if tuple((
             blank_line,
             bind_context!(final_item_whitespace_cutoff, context),
         ))(remaining)
@@ -291,6 +292,12 @@ fn plain_list_item<'b, 'g, 'r, 's>(
                         .unwrap_or(Vec::new()),
                     pre_blank: 0,
                     children: Vec::new(),
+                    contents: None,
+                    post_blank: if post_blank.len() > 0 {
+                        Some(Into::<&str>::into(post_blank))
+                    } else {
+                        None
+                    },
                 },
             ),
         ));
@@ -301,13 +308,13 @@ fn plain_list_item<'b, 'g, 'r, 's>(
         .filter(|b| *b == b'\n')
         .count();
 
-    let (remaining, (children, _exit_contents)) = many_till(
+    let (remaining, (contents, (children, _exit_contents))) = consumed(many_till(
         include_input(bind_context!(element(true), &parser_context)),
         bind_context!(exit_matcher_parser, &parser_context),
-    )(remaining)?;
+    ))(remaining)?;
 
     // We have to use the parser_context here to include the whitespace cut-off
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(&final_whitespace_context, remaining)?;
 
     let source = get_consumed(input, remaining);
@@ -329,6 +336,12 @@ fn plain_list_item<'b, 'g, 'r, 's>(
                 pre_blank: PlainListItemPreBlank::try_from(pre_blank)
                     .expect("pre-blank cannot be larger than 2."),
                 children: children.into_iter().map(|(_start, item)| item).collect(),
+                contents: if contents.len() > 0 {
+                    Some(contents.into())
+                } else {
+                    None
+                },
+                post_blank: post_blank.map(Into::<&str>::into),
             },
         ),
     ));
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index d3e2da1..ae6f7df 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -35,6 +35,8 @@ pub struct PlainListItem<'s> {
     pub tag: Vec<Object<'s>>,
     pub pre_blank: PlainListItemPreBlank,
     pub children: Vec<Element<'s>>,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 pub type PlainListItemCounter = u16;
@@ -154,11 +156,15 @@ impl<'s> StandardProperties<'s> for PlainListItem<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 7a4dc20dc9d03d68f2646c67f509d2d4aa09ccfb Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 15:55:36 -0500
Subject: [PATCH 62/78] Implement the new fields for plain list.

---
 src/parser/plain_list.rs     |  6 +++++-
 src/types/greater_element.rs | 10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/parser/plain_list.rs b/src/parser/plain_list.rs
index 192647d..cf1eae1 100644
--- a/src/parser/plain_list.rs
+++ b/src/parser/plain_list.rs
@@ -153,6 +153,7 @@ where
     let mut children = Vec::new();
     let mut first_item_indentation: Option<IndentationLevel> = None;
     let mut first_item_list_type: Option<PlainListType> = None;
+    let contents_begin = remaining;
     let mut remaining = remaining;
 
     // The final list item does not consume trailing blank lines (which instead get consumed by the list). We have three options here:
@@ -196,7 +197,8 @@ where
         )));
     }
 
-    let (remaining, _trailing_ws) =
+    let contents = get_consumed(contents_begin, remaining);
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -209,6 +211,8 @@ where
             ),
             list_type: first_item_list_type.expect("Plain lists require at least one element."),
             children: children.into_iter().map(|(_start, item)| item).collect(),
+            contents: Some(Into::<&str>::into(contents)),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index ae6f7df..f43cf13 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -13,6 +13,8 @@ pub struct PlainList<'s> {
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub list_type: PlainListType,
     pub children: Vec<PlainListItem<'s>>,
+    pub contents: Option<&'s str>, // TODO: Can contents ever be None?
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug, Copy, Clone)]
@@ -142,11 +144,15 @@ impl<'s> StandardProperties<'s> for PlainList<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 683c523eceb5dcdcd92523a3f06a60d88e1b3154 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 16:15:22 -0500
Subject: [PATCH 63/78] Implement the new fields for greater block.

---
 src/parser/greater_block.rs  | 52 +++++++++++++++++++++++++++---------
 src/types/greater_element.rs | 30 ++++++++++++++++-----
 2 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/src/parser/greater_block.rs b/src/parser/greater_block.rs
index c8b8d77..d8b6d8c 100644
--- a/src/parser/greater_block.rs
+++ b/src/parser/greater_block.rs
@@ -102,7 +102,7 @@ fn center_block<'b, 'g, 'r, 's, AK>(
 where
     AK: IntoIterator<Item = Keyword<'s>>,
 {
-    let (remaining, (source, children)) = greater_block_body(
+    let (remaining, body) = greater_block_body(
         context,
         input,
         pre_affiliated_keywords_input,
@@ -112,12 +112,14 @@ where
     Ok((
         remaining,
         Element::CenterBlock(CenterBlock {
-            source,
+            source: body.source,
             affiliated_keywords: parse_affiliated_keywords(
                 context.get_global_settings(),
                 affiliated_keywords,
             ),
-            children,
+            children: body.children,
+            contents: body.contents,
+            post_blank: body.post_blank,
         }),
     ))
 }
@@ -135,7 +137,7 @@ fn quote_block<'b, 'g, 'r, 's, AK>(
 where
     AK: IntoIterator<Item = Keyword<'s>>,
 {
-    let (remaining, (source, children)) = greater_block_body(
+    let (remaining, body) = greater_block_body(
         context,
         input,
         pre_affiliated_keywords_input,
@@ -145,12 +147,14 @@ where
     Ok((
         remaining,
         Element::QuoteBlock(QuoteBlock {
-            source,
+            source: body.source,
             affiliated_keywords: parse_affiliated_keywords(
                 context.get_global_settings(),
                 affiliated_keywords,
             ),
-            children,
+            children: body.children,
+            contents: body.contents,
+            post_blank: body.post_blank,
         }),
     ))
 }
@@ -196,7 +200,7 @@ where
     AK: IntoIterator<Item = Keyword<'s>>,
 {
     let (remaining, parameters) = opt(tuple((space1, parameters)))(input)?;
-    let (remaining, (source, children)) = greater_block_body(
+    let (remaining, body) = greater_block_body(
         context,
         remaining,
         pre_affiliated_keywords_input,
@@ -206,18 +210,28 @@ where
     Ok((
         remaining,
         Element::SpecialBlock(SpecialBlock {
-            source,
+            source: body.source,
             affiliated_keywords: parse_affiliated_keywords(
                 context.get_global_settings(),
                 affiliated_keywords,
             ),
-            children,
+            children: body.children,
             block_type: name,
             parameters: parameters.map(|(_, parameters)| Into::<&str>::into(parameters)),
+            contents: body.contents,
+            post_blank: body.post_blank,
         }),
     ))
 }
 
+#[derive(Debug)]
+struct GreaterBlockBody<'s> {
+    source: &'s str,
+    children: Vec<Element<'s>>,
+    contents: Option<&'s str>,
+    post_blank: Option<&'s str>,
+}
+
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))
@@ -228,7 +242,7 @@ fn greater_block_body<'c, 'b, 'g, 'r, 's>(
     pre_affiliated_keywords_input: OrgSource<'s>,
     name: &'c str,
     context_name: &'c str,
-) -> Res<OrgSource<'s>, (&'s str, Vec<Element<'s>>)> {
+) -> Res<OrgSource<'s>, GreaterBlockBody<'s>> {
     if in_section(context, context_name) {
         return Err(nom::Err::Error(CustomError::Static(
             "Cannot nest objects of the same element",
@@ -250,6 +264,7 @@ fn greater_block_body<'c, 'b, 'g, 'r, 's>(
     let element_matcher = parser_with_context!(element(true))(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
     not(exit_matcher)(remaining)?;
+    let contents_begin = remaining;
     let (remaining, leading_blank_lines) = opt(consumed(tuple((
         blank_line,
         many0(preceded(not(exit_matcher), blank_line)),
@@ -263,15 +278,28 @@ fn greater_block_body<'c, 'b, 'g, 'r, 's>(
     if let Some(lines) = leading_blank_lines {
         children.insert(0, lines);
     }
+    let contents = get_consumed(contents_begin, remaining);
 
     let (remaining, _end) = exit_with_name(&parser_context, remaining)?;
 
     // Not checking if parent exit matcher is causing exit because the greater_block_end matcher asserts we matched a full greater block
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(pre_affiliated_keywords_input, remaining);
-    Ok((remaining, (Into::<&str>::into(source), children)))
+    Ok((
+        remaining,
+        GreaterBlockBody {
+            source: Into::<&str>::into(source),
+            children,
+            contents: if contents.len() > 0 {
+                Some(Into::<&str>::into(contents))
+            } else {
+                None
+            },
+            post_blank: post_blank.map(Into::<&str>::into),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index f43cf13..bb848d9 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -56,6 +56,8 @@ pub struct CenterBlock<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub children: Vec<Element<'s>>,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -63,6 +65,8 @@ pub struct QuoteBlock<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub children: Vec<Element<'s>>,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -72,6 +76,8 @@ pub struct SpecialBlock<'s> {
     pub block_type: &'s str,
     pub parameters: Option<&'s str>,
     pub children: Vec<Element<'s>>,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -180,11 +186,15 @@ impl<'s> StandardProperties<'s> for CenterBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -194,11 +204,15 @@ impl<'s> StandardProperties<'s> for QuoteBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -208,11 +222,15 @@ impl<'s> StandardProperties<'s> for SpecialBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From cce9ca87fad7b7a2298757397aac550da15d4de5 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 16:54:15 -0500
Subject: [PATCH 64/78] Fix handling of leading blank lines in greater blocks.

---
 src/parser/greater_block.rs | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/parser/greater_block.rs b/src/parser/greater_block.rs
index d8b6d8c..65f0747 100644
--- a/src/parser/greater_block.rs
+++ b/src/parser/greater_block.rs
@@ -5,22 +5,21 @@ use nom::character::complete::anychar;
 use nom::character::complete::line_ending;
 use nom::character::complete::space0;
 use nom::character::complete::space1;
-use nom::combinator::consumed;
 use nom::combinator::eof;
 use nom::combinator::not;
 use nom::combinator::opt;
 use nom::combinator::peek;
 use nom::combinator::recognize;
 use nom::combinator::verify;
-use nom::multi::many0;
 use nom::multi::many_till;
-use nom::sequence::preceded;
 use nom::sequence::tuple;
 
 use super::affiliated_keyword::parse_affiliated_keywords;
 use super::org_source::OrgSource;
+use super::paragraph::empty_paragraph;
 use super::util::in_section;
 use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
+use crate::context::bind_context;
 use crate::context::parser_with_context;
 use crate::context::ContextElement;
 use crate::context::ContextMatcher;
@@ -37,7 +36,6 @@ use crate::parser::util::start_of_line;
 use crate::types::CenterBlock;
 use crate::types::Element;
 use crate::types::Keyword;
-use crate::types::Paragraph;
 use crate::types::QuoteBlock;
 use crate::types::SpecialBlock;
 
@@ -265,18 +263,19 @@ fn greater_block_body<'c, 'b, 'g, 'r, 's>(
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
     not(exit_matcher)(remaining)?;
     let contents_begin = remaining;
-    let (remaining, leading_blank_lines) = opt(consumed(tuple((
-        blank_line,
-        many0(preceded(not(exit_matcher), blank_line)),
-    ))))(remaining)?;
-    let leading_blank_lines =
-        leading_blank_lines.map(|(source, (first_line, _remaining_lines))| {
-            Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()))
-        });
+
+    let blank_line_context = ContextElement::ExitMatcherNode(ExitMatcherNode {
+        class: ExitClass::Alpha,
+        exit_matcher: &leading_blank_lines_end,
+    });
+    let blank_line_context = parser_context.with_additional_node(&blank_line_context);
+
+    let (remaining, leading_blank_lines) =
+        opt(bind_context!(empty_paragraph, &blank_line_context))(remaining)?;
     let (remaining, (mut children, _exit_contents)) =
         many_till(element_matcher, exit_matcher)(remaining)?;
     if let Some(lines) = leading_blank_lines {
-        children.insert(0, lines);
+        children.insert(0, Element::Paragraph(lines));
     }
     let contents = get_consumed(contents_begin, remaining);
 
@@ -335,3 +334,14 @@ fn _greater_block_end<'b, 'g, 'r, 's, 'c>(
     let source = get_consumed(input, remaining);
     Ok((remaining, source))
 }
+
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(ret, level = "debug", skip(_context))
+)]
+fn leading_blank_lines_end<'b, 'g, 'r, 's, 'c>(
+    _context: RefContext<'b, 'g, 'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
+    recognize(not(blank_line))(input)
+}

From 565978225a57d0dcd11aaafc3d74abf403a1bffa Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 17:11:22 -0500
Subject: [PATCH 65/78] Implement the new fields for table.

---
 src/parser/table.rs          | 24 +++++++++++++++++-------
 src/types/greater_element.rs | 15 +++++++++++----
 src/types/lesser_element.rs  |  5 +++--
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/parser/table.rs b/src/parser/table.rs
index 775b4c6..0d294e7 100644
--- a/src/parser/table.rs
+++ b/src/parser/table.rs
@@ -3,6 +3,7 @@ use nom::bytes::complete::is_not;
 use nom::bytes::complete::tag;
 use nom::character::complete::line_ending;
 use nom::character::complete::space0;
+use nom::combinator::consumed;
 use nom::combinator::not;
 use nom::combinator::opt;
 use nom::combinator::peek;
@@ -67,13 +68,13 @@ where
     let org_mode_table_row_matcher = parser_with_context!(org_mode_table_row)(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
 
-    let (remaining, (children, _exit_contents)) =
-        many_till(org_mode_table_row_matcher, exit_matcher)(remaining)?;
+    let (remaining, (contents, (children, _exit_contents))) =
+        consumed(many_till(org_mode_table_row_matcher, exit_matcher))(remaining)?;
 
     let (remaining, formulas) =
         many0(parser_with_context!(table_formula_keyword)(context))(remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -87,6 +88,8 @@ where
             ),
             formulas,
             children,
+            contents: Into::<&str>::into(contents),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
@@ -150,6 +153,7 @@ fn org_mode_table_row_rule<'b, 'g, 'r, 's>(
         TableRow {
             source: source.into(),
             children: Vec::new(),
+            contents: None,
         },
     ))
 }
@@ -164,8 +168,8 @@ fn org_mode_table_row_regular<'b, 'g, 'r, 's>(
 ) -> Res<OrgSource<'s>, TableRow<'s>> {
     start_of_line(input)?;
     let (remaining, _) = tuple((space0, tag("|")))(input)?;
-    let (remaining, children) =
-        many1(parser_with_context!(org_mode_table_cell)(context))(remaining)?;
+    let (remaining, (contents, children)) =
+        consumed(many1(parser_with_context!(org_mode_table_cell)(context)))(remaining)?;
     let (remaining, _tail) = recognize(tuple((space0, org_line_ending)))(remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -173,6 +177,11 @@ fn org_mode_table_row_regular<'b, 'g, 'r, 's>(
         TableRow {
             source: source.into(),
             children,
+            contents: if contents.len() > 0 {
+                Some(Into::<&str>::into(contents))
+            } else {
+                None
+            },
         },
     ))
 }
@@ -194,12 +203,12 @@ fn org_mode_table_cell<'b, 'g, 'r, 's>(
         parser_with_context!(table_cell_set_object)(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
     let (remaining, _) = space0(input)?;
-    let (remaining, (children, _exit_contents)) = verify(
+    let (remaining, (contents, (children, _exit_contents))) = consumed(verify(
         many_till(table_cell_set_object_matcher, exit_matcher),
         |(children, exit_contents)| {
             !children.is_empty() || Into::<&str>::into(exit_contents).ends_with('|')
         },
-    )(remaining)?;
+    ))(remaining)?;
 
     let (remaining, _tail) = org_mode_table_cell_end(&parser_context, remaining)?;
 
@@ -210,6 +219,7 @@ fn org_mode_table_cell<'b, 'g, 'r, 's>(
         TableCell {
             source: source.into(),
             children,
+            contents: Into::<&str>::into(contents),
         },
     ))
 }
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index bb848d9..bbb7ccd 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -130,12 +130,15 @@ pub struct Table<'s> {
     pub affiliated_keywords: AffiliatedKeywords<'s>,
     pub formulas: Vec<Keyword<'s>>,
     pub children: Vec<TableRow<'s>>,
+    pub contents: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
 pub struct TableRow<'s> {
     pub source: &'s str,
     pub children: Vec<TableCell<'s>>,
+    pub contents: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -322,11 +325,15 @@ impl<'s> StandardProperties<'s> for Table<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 
@@ -336,11 +343,11 @@ impl<'s> StandardProperties<'s> for TableRow<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        0
     }
 }
 
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index ab696b4..32b0c81 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -42,6 +42,7 @@ pub struct Comment<'s> {
 pub struct TableCell<'s> {
     pub source: &'s str,
     pub children: Vec<Object<'s>>,
+    pub contents: &'s str,
 }
 
 #[derive(Debug)]
@@ -257,11 +258,11 @@ impl<'s> StandardProperties<'s> for TableCell<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        0
     }
 }
 

From eba4fb94cfe43f553c52ce6cd738a5c47286f0e7 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 17:26:01 -0500
Subject: [PATCH 66/78] Implement the new fields for dynamic block.

---
 src/parser/dynamic_block.rs  | 36 +++++++++++++++++++++---------------
 src/parser/greater_block.rs  |  2 +-
 src/types/greater_element.rs | 10 ++++++++--
 3 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/parser/dynamic_block.rs b/src/parser/dynamic_block.rs
index e1eb68b..1f59f9d 100644
--- a/src/parser/dynamic_block.rs
+++ b/src/parser/dynamic_block.rs
@@ -6,20 +6,20 @@ use nom::character::complete::anychar;
 use nom::character::complete::line_ending;
 use nom::character::complete::space0;
 use nom::character::complete::space1;
-use nom::combinator::consumed;
 use nom::combinator::eof;
 use nom::combinator::not;
 use nom::combinator::opt;
 use nom::combinator::peek;
 use nom::combinator::recognize;
-use nom::multi::many0;
 use nom::multi::many_till;
-use nom::sequence::preceded;
 use nom::sequence::tuple;
 
 use super::affiliated_keyword::parse_affiliated_keywords;
+use super::greater_block::leading_blank_lines_end;
 use super::org_source::OrgSource;
+use super::paragraph::empty_paragraph;
 use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
+use crate::context::bind_context;
 use crate::context::parser_with_context;
 use crate::context::ContextElement;
 use crate::context::ExitClass;
@@ -28,7 +28,6 @@ use crate::context::RefContext;
 use crate::error::CustomError;
 use crate::error::Res;
 use crate::parser::element_parser::element;
-use crate::parser::util::blank_line;
 use crate::parser::util::exit_matcher_parser;
 use crate::parser::util::get_consumed;
 use crate::parser::util::immediate_in_section;
@@ -36,7 +35,6 @@ use crate::parser::util::start_of_line;
 use crate::types::DynamicBlock;
 use crate::types::Element;
 use crate::types::Keyword;
-use crate::types::Paragraph;
 
 #[cfg_attr(
     feature = "tracing",
@@ -81,23 +79,25 @@ where
     let element_matcher = parser_with_context!(element(true))(&parser_context);
     let exit_matcher = parser_with_context!(exit_matcher_parser)(&parser_context);
     not(exit_matcher)(remaining)?;
-    let (remaining, leading_blank_lines) = opt(consumed(tuple((
-        blank_line,
-        many0(preceded(not(exit_matcher), blank_line)),
-    ))))(remaining)?;
-    let leading_blank_lines =
-        leading_blank_lines.map(|(source, (first_line, _remaining_lines))| {
-            Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()))
-        });
+    let contents_begin = remaining;
+    let blank_line_context = ContextElement::ExitMatcherNode(ExitMatcherNode {
+        class: ExitClass::Alpha,
+        exit_matcher: &leading_blank_lines_end,
+    });
+    let blank_line_context = parser_context.with_additional_node(&blank_line_context);
+
+    let (remaining, leading_blank_lines) =
+        opt(bind_context!(empty_paragraph, &blank_line_context))(remaining)?;
     let (remaining, (mut children, _exit_contents)) =
         many_till(element_matcher, exit_matcher)(remaining)?;
     if let Some(lines) = leading_blank_lines {
-        children.insert(0, lines);
+        children.insert(0, Element::Paragraph(lines));
     }
+    let contents = get_consumed(contents_begin, remaining);
 
     let (remaining, _end) = dynamic_block_end(&parser_context, remaining)?;
 
-    let (remaining, _trailing_ws) =
+    let (remaining, post_blank) =
         maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
     Ok((
@@ -111,6 +111,12 @@ where
             block_name: name.into(),
             parameters: parameters.map(|val| val.into()),
             children,
+            contents: if contents.len() > 0 {
+                Some(Into::<&str>::into(contents))
+            } else {
+                None
+            },
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/parser/greater_block.rs b/src/parser/greater_block.rs
index 65f0747..c1b52c9 100644
--- a/src/parser/greater_block.rs
+++ b/src/parser/greater_block.rs
@@ -339,7 +339,7 @@ fn _greater_block_end<'b, 'g, 'r, 's, 'c>(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(_context))
 )]
-fn leading_blank_lines_end<'b, 'g, 'r, 's, 'c>(
+pub(crate) fn leading_blank_lines_end<'b, 'g, 'r, 's, 'c>(
     _context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, OrgSource<'s>> {
diff --git a/src/types/greater_element.rs b/src/types/greater_element.rs
index bbb7ccd..7b5b8bf 100644
--- a/src/types/greater_element.rs
+++ b/src/types/greater_element.rs
@@ -87,6 +87,8 @@ pub struct DynamicBlock<'s> {
     pub block_name: &'s str,
     pub parameters: Option<&'s str>,
     pub children: Vec<Element<'s>>,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -243,11 +245,15 @@ impl<'s> StandardProperties<'s> for DynamicBlock<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        self.contents
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 969054590117200b1de4ceb13ec3df1865f9b26c Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 17:40:08 -0500
Subject: [PATCH 67/78] Fix setting contents for broken end bullshitium when
 there is a paragraph present.

---
 src/parser/bullshitium.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/parser/bullshitium.rs b/src/parser/bullshitium.rs
index 66de4c9..1e7768e 100644
--- a/src/parser/bullshitium.rs
+++ b/src/parser/bullshitium.rs
@@ -63,6 +63,7 @@ pub(crate) fn broken_end<'b, 'g, 'r, 's>(
         match paragraph.children.first_mut() {
             Some(Object::PlainText(plain_text)) => {
                 plain_text.source = input.get_until_end_of_str(plain_text.source).into();
+                paragraph.contents = Some(input.get_until_end_of_str(plain_text.source).into());
             }
             Some(obj) => {
                 panic!("Unhandled first object type inside bullshitium {:?}", obj);

From c28d8ccea47ab2c95955797b39c15d9821834edb Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 17:59:47 -0500
Subject: [PATCH 68/78] Fix post-blank for headlines containing only
 whitespace.

---
 src/parser/headline.rs | 9 ++++++++-
 src/types/document.rs  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/parser/headline.rs b/src/parser/headline.rs
index 6af4336..a836f3c 100644
--- a/src/parser/headline.rs
+++ b/src/parser/headline.rs
@@ -67,6 +67,7 @@ fn _heading<'b, 'g, 'r, 's>(
     let section_matcher = bind_context!(section, context);
     let heading_matcher = bind_context!(heading(pre_headline.star_count), context);
     let (contents_begin, _) = opt(many0(blank_line))(remaining)?;
+    let maybe_post_blank = get_consumed(remaining, contents_begin);
     let (remaining, maybe_section) =
         opt(map(section_matcher, DocumentElement::Section))(remaining)?;
     let (remaining, _ws) = opt(tuple((start_of_line, many0(blank_line))))(remaining)?;
@@ -83,7 +84,8 @@ fn _heading<'b, 'g, 'r, 's>(
         }
         children.insert(0, section);
     }
-    let remaining = if children.is_empty() {
+    let has_children = !children.is_empty();
+    let remaining = if !has_children {
         // Support empty headings
         let (remain, _ws) = many0(blank_line)(remaining)?;
         remain
@@ -119,6 +121,11 @@ fn _heading<'b, 'g, 'r, 's>(
             } else {
                 None
             },
+            post_blank: if has_children {
+                None
+            } else {
+                Some(Into::<&str>::into(maybe_post_blank))
+            },
         },
     ))
 }
diff --git a/src/types/document.rs b/src/types/document.rs
index df27ff7..9015adc 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -36,6 +36,7 @@ pub struct Heading<'s> {
     pub deadline: Option<Timestamp<'s>>,
     pub closed: Option<Timestamp<'s>>,
     pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -105,7 +106,13 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
         self.children
             .last()
             .map(|child| child.get_post_blank())
-            .unwrap_or(0)
+            .unwrap_or(
+                self.post_blank
+                    .map(|text| text.lines().count())
+                    .unwrap_or(0)
+                    .try_into()
+                    .expect("Too much post-blank to fit into a PostBlank."),
+            )
     }
 }
 

From f5280a309041f8fe00fc164787a319366059e302 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 18:04:42 -0500
Subject: [PATCH 69/78] Implement the new fields for bullshitium broken dynamic
 block.

---
 src/parser/bullshitium.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/parser/bullshitium.rs b/src/parser/bullshitium.rs
index 1e7768e..f31a158 100644
--- a/src/parser/bullshitium.rs
+++ b/src/parser/bullshitium.rs
@@ -124,6 +124,7 @@ pub(crate) fn broken_dynamic_block<'b, 'g, 'r, 's>(
         match paragraph.children.first_mut() {
             Some(Object::PlainText(plain_text)) => {
                 plain_text.source = input.get_until_end_of_str(plain_text.source).into();
+                paragraph.contents = Some(input.get_until_end_of_str(plain_text.source).into());
             }
             Some(obj) => {
                 panic!("Unhandled first object type inside bullshitium {:?}", obj);
@@ -134,14 +135,18 @@ pub(crate) fn broken_dynamic_block<'b, 'g, 'r, 's>(
         };
         Ok((remaining, paragraph))
     } else {
-        let (remaining, _trailing_ws) =
+        let (remaining, post_blank) =
             maybe_consume_trailing_whitespace_if_not_exiting(context, lead_in_remaining)?;
 
+        let body = Into::<&str>::into(input.get_until(lead_in_remaining));
+
         Ok((
             remaining,
-            Paragraph::of_text(
+            Paragraph::of_text_full(
                 input.get_until(remaining).into(),
-                input.get_until(lead_in_remaining).into(),
+                body,
+                if body.len() > 0 { Some(body) } else { None },
+                post_blank.map(Into::<&str>::into),
             ),
         ))
     }

From 33ca43ca408844ccc495e5f6a027dd3ebdbea446 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 18:06:48 -0500
Subject: [PATCH 70/78] Remove the old Paragraph::of_text function.

---
 src/parser/bullshitium.rs   |  4 ++--
 src/parser/paragraph.rs     |  4 ++--
 src/types/lesser_element.rs | 16 +---------------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/parser/bullshitium.rs b/src/parser/bullshitium.rs
index f31a158..52e97d0 100644
--- a/src/parser/bullshitium.rs
+++ b/src/parser/bullshitium.rs
@@ -81,7 +81,7 @@ pub(crate) fn broken_end<'b, 'g, 'r, 's>(
 
         Ok((
             remaining,
-            Paragraph::of_text_full(
+            Paragraph::of_text(
                 input.get_until(remaining).into(),
                 body,
                 if body.len() > 0 { Some(body) } else { None },
@@ -142,7 +142,7 @@ pub(crate) fn broken_dynamic_block<'b, 'g, 'r, 's>(
 
         Ok((
             remaining,
-            Paragraph::of_text_full(
+            Paragraph::of_text(
                 input.get_until(remaining).into(),
                 body,
                 if body.len() > 0 { Some(body) } else { None },
diff --git a/src/parser/paragraph.rs b/src/parser/paragraph.rs
index 237dce1..0223fef 100644
--- a/src/parser/paragraph.rs
+++ b/src/parser/paragraph.rs
@@ -101,7 +101,7 @@ pub(crate) fn empty_paragraph<'b, 'g, 'r, 's>(
         let source = get_consumed(input, remaining);
         Ok((
             remaining,
-            Paragraph::of_text_full(
+            Paragraph::of_text(
                 Into::<&str>::into(source),
                 Into::<&str>::into(first_line_with_spaces),
                 Some(Into::<&str>::into(first_line_with_spaces)),
@@ -116,7 +116,7 @@ pub(crate) fn empty_paragraph<'b, 'g, 'r, 's>(
         let source = get_consumed(input, remaining);
         Ok((
             remaining,
-            Paragraph::of_text_full(
+            Paragraph::of_text(
                 Into::<&str>::into(source),
                 Into::<&str>::into(first_line),
                 Some(Into::<&str>::into(first_line)),
diff --git a/src/types/lesser_element.rs b/src/types/lesser_element.rs
index 32b0c81..660eb43 100644
--- a/src/types/lesser_element.rs
+++ b/src/types/lesser_element.rs
@@ -204,21 +204,7 @@ impl<'s> Paragraph<'s> {
     /// Generate a paragraph of the passed in text with no additional properties.
     ///
     /// This is used for elements that support an "empty" content like greater blocks.
-    pub(crate) fn of_text(source: &'s str, body: &'s str) -> Self {
-        // TODO: This should be replaced with of_text_full.
-        Paragraph {
-            source,
-            contents: None,
-            post_blank: None,
-            affiliated_keywords: AffiliatedKeywords::default(),
-            children: vec![Object::PlainText(PlainText { source: body })],
-        }
-    }
-
-    /// Generate a paragraph of the passed in text with no additional properties.
-    ///
-    /// This is used for elements that support an "empty" content like greater blocks.
-    pub(crate) fn of_text_full(
+    pub(crate) fn of_text(
         source: &'s str,
         body: &'s str,
         contents: Option<&'s str>,

From 6b802d36bfc01477152ffc5421540a008d7ab535 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 18:57:19 -0500
Subject: [PATCH 71/78] Implement the new fields for target.

---
 org_mode_samples/object/target/simple.org | 3 +++
 src/parser/target.rs                      | 3 ++-
 src/types/object.rs                       | 9 +++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 org_mode_samples/object/target/simple.org

diff --git a/org_mode_samples/object/target/simple.org b/org_mode_samples/object/target/simple.org
new file mode 100644
index 0000000..2a5e00b
--- /dev/null
+++ b/org_mode_samples/object/target/simple.org
@@ -0,0 +1,3 @@
+<<FOO>> bar
+
+[[FOO][baz]]
diff --git a/src/parser/target.rs b/src/parser/target.rs
index d91fa2f..10dde09 100644
--- a/src/parser/target.rs
+++ b/src/parser/target.rs
@@ -46,7 +46,7 @@ pub(crate) fn target<'b, 'g, 'r, 's>(
         )));
     }
     let (remaining, _) = tag(">>")(remaining)?;
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -55,6 +55,7 @@ pub(crate) fn target<'b, 'g, 'r, 's>(
         Target {
             source: source.into(),
             value: body.into(),
+            post_blank: post_blank.map(Into::<&str>::into),
         },
     ))
 }
diff --git a/src/types/object.rs b/src/types/object.rs
index b4a8095..05bf888 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -266,6 +266,7 @@ pub struct LineBreak<'s> {
 pub struct Target<'s> {
     pub source: &'s str,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -923,11 +924,15 @@ impl<'s> StandardProperties<'s> for Target<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        None
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        self.post_blank
+            .map(|post_blank| post_blank.chars().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From 99b74095e67a560094790fab6103420d3a26107c Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 19:10:14 -0500
Subject: [PATCH 72/78] Fix heading post-blank.

---
 .../heading_with_subheading_post_blank.org        |  5 +++++
 src/types/document.rs                             | 15 +++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 org_mode_samples/sections_and_headings/heading_with_subheading_post_blank.org

diff --git a/org_mode_samples/sections_and_headings/heading_with_subheading_post_blank.org b/org_mode_samples/sections_and_headings/heading_with_subheading_post_blank.org
new file mode 100644
index 0000000..e60807f
--- /dev/null
+++ b/org_mode_samples/sections_and_headings/heading_with_subheading_post_blank.org
@@ -0,0 +1,5 @@
+* foo
+
+** bar
+
+* baz
diff --git a/src/types/document.rs b/src/types/document.rs
index 9015adc..837b741 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -103,16 +103,11 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        self.children
-            .last()
-            .map(|child| child.get_post_blank())
-            .unwrap_or(
-                self.post_blank
-                    .map(|text| text.lines().count())
-                    .unwrap_or(0)
-                    .try_into()
-                    .expect("Too much post-blank to fit into a PostBlank."),
-            )
+        self.post_blank
+            .map(|text| text.lines().count())
+            .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

From e846c85188662b28573f8521adca806ed2f4f3cb Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 19:17:16 -0500
Subject: [PATCH 73/78] Fix handling fixed width areas with empty lines in the
 middle.

---
 .../lesser_element/fixed_width_area/blank_line_in_middle.org  | 3 +++
 src/parser/fixed_width_area.rs                                | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 org_mode_samples/lesser_element/fixed_width_area/blank_line_in_middle.org

diff --git a/org_mode_samples/lesser_element/fixed_width_area/blank_line_in_middle.org b/org_mode_samples/lesser_element/fixed_width_area/blank_line_in_middle.org
new file mode 100644
index 0000000..589a196
--- /dev/null
+++ b/org_mode_samples/lesser_element/fixed_width_area/blank_line_in_middle.org
@@ -0,0 +1,3 @@
+: foo
+:
+: bar
diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs
index 9631ac8..10abff2 100644
--- a/src/parser/fixed_width_area.rs
+++ b/src/parser/fixed_width_area.rs
@@ -72,8 +72,8 @@ where
 fn fixed_width_area_line<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(input)?;
     let (remaining, _) = tuple((space0, tag(":")))(input)?;
-    if let Ok((remain, _line_break)) = org_line_ending(remaining) {
-        return Ok((remain, remaining.take(0)));
+    if let Ok((_remain, _line_break)) = org_line_ending(remaining) {
+        return Ok((remaining, remaining.take(0)));
     }
     let (remaining, _) = tag(" ")(remaining)?;
     let (remaining, value) = recognize(many_till(anychar, peek(org_line_ending)))(remaining)?;

From 30412361e1447b2c0b74aa1cb2c452a200db68ad Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 19:19:58 -0500
Subject: [PATCH 74/78] Fix handling fixed width area post-blank inside a list.

---
 .../fixed_width_area/list_post_blank.org      |  6 +++++
 src/parser/fixed_width_area.rs                | 15 ++++++++----
 src/parser/util.rs                            | 23 -------------------
 3 files changed, 17 insertions(+), 27 deletions(-)
 create mode 100644 org_mode_samples/lesser_element/fixed_width_area/list_post_blank.org

diff --git a/org_mode_samples/lesser_element/fixed_width_area/list_post_blank.org b/org_mode_samples/lesser_element/fixed_width_area/list_post_blank.org
new file mode 100644
index 0000000..1d5bb9d
--- /dev/null
+++ b/org_mode_samples/lesser_element/fixed_width_area/list_post_blank.org
@@ -0,0 +1,6 @@
+1. foo
+   #+begin_src text
+
+   #+end_src
+
+2. baz
diff --git a/src/parser/fixed_width_area.rs b/src/parser/fixed_width_area.rs
index 10abff2..bbd44b0 100644
--- a/src/parser/fixed_width_area.rs
+++ b/src/parser/fixed_width_area.rs
@@ -14,7 +14,7 @@ use nom::InputTake;
 
 use super::affiliated_keyword::parse_affiliated_keywords;
 use super::org_source::OrgSource;
-use super::util::maybe_consume_trailing_whitespace_if_not_exiting_mid_line;
+use super::util::maybe_consume_trailing_whitespace_if_not_exiting;
 use super::util::org_line_ending;
 use crate::context::parser_with_context;
 use crate::context::RefContext;
@@ -48,8 +48,11 @@ where
         ),
     ))(remaining)?;
 
-    let (remaining, post_blank) =
-        maybe_consume_trailing_whitespace_if_not_exiting_mid_line(context, remaining)?;
+    let post_blank_begin = remaining;
+    let (remaining, _first_line_break) = org_line_ending(remaining)?;
+    let (remaining, _additional_post_blank) =
+        maybe_consume_trailing_whitespace_if_not_exiting(context, remaining)?;
+    let post_blank = get_consumed(post_blank_begin, remaining);
     let source = get_consumed(input, remaining);
     let mut value = Vec::with_capacity(remaining_lines.len() + 1);
     value.push(Into::<&str>::into(first_line));
@@ -63,7 +66,11 @@ where
                 affiliated_keywords,
             ),
             value,
-            post_blank: post_blank.map(Into::<&str>::into),
+            post_blank: if post_blank.len() > 0 {
+                Some(Into::<&str>::into(post_blank))
+            } else {
+                None
+            },
         },
     ))
 }
diff --git a/src/parser/util.rs b/src/parser/util.rs
index 3ed86d2..29523f2 100644
--- a/src/parser/util.rs
+++ b/src/parser/util.rs
@@ -72,13 +72,6 @@ fn element_trailing_whitespace<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, O
     alt((eof, recognize(many0(blank_line))))(input)
 }
 
-#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn element_trailing_whitespace_mid_line<'s>(
-    input: OrgSource<'s>,
-) -> Res<OrgSource<'s>, OrgSource<'s>> {
-    alt((eof, recognize(many0(blank_line))))(input)
-}
-
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))
@@ -121,22 +114,6 @@ pub(crate) fn maybe_consume_trailing_whitespace_if_not_exiting<'b, 'g, 'r, 's>(
     }
 }
 
-#[cfg_attr(
-    feature = "tracing",
-    tracing::instrument(ret, level = "debug", skip(context))
-)]
-pub(crate) fn maybe_consume_trailing_whitespace_if_not_exiting_mid_line<'b, 'g, 'r, 's>(
-    context: RefContext<'b, 'g, 'r, 's>,
-    input: OrgSource<'s>,
-) -> Res<OrgSource<'s>, Option<OrgSource<'s>>> {
-    if context.should_consume_trailing_whitespace() && exit_matcher_parser(context, input).is_err()
-    {
-        Ok(opt(element_trailing_whitespace_mid_line)(input)?)
-    } else {
-        Ok((input, None))
-    }
-}
-
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(context))

From 2046603d01f2b313319f1881cfb04154bafc92b5 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 19:42:43 -0500
Subject: [PATCH 75/78] Fix handling post blank for org documents.

---
 .../sections_and_headings/document_post_blank.org            | 5 +++++
 src/types/document.rs                                        | 5 +----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 org_mode_samples/sections_and_headings/document_post_blank.org

diff --git a/org_mode_samples/sections_and_headings/document_post_blank.org b/org_mode_samples/sections_and_headings/document_post_blank.org
new file mode 100644
index 0000000..a473d61
--- /dev/null
+++ b/org_mode_samples/sections_and_headings/document_post_blank.org
@@ -0,0 +1,5 @@
+* foo
+
+
+
+
diff --git a/src/types/document.rs b/src/types/document.rs
index 837b741..e39e19c 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -68,10 +68,7 @@ impl<'s> StandardProperties<'s> for Document<'s> {
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        self.into_iter()
-            .last()
-            .map(|child| child.get_post_blank())
-            .unwrap_or(0)
+        0
     }
 }
 

From 4b94dc60d2e3177504621fcca590a82bfcdd6f74 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 19:49:12 -0500
Subject: [PATCH 76/78] Fix handling of documents containing only whitespace.

---
 org_mode_samples/document/empty.org                          | 0
 org_mode_samples/document/only_line_breaks.org               | 4 ++++
 .../document_post_blank.org => document/post_blank.org}      | 0
 src/parser/document.rs                                       | 5 +++--
 src/types/document.rs                                        | 4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 org_mode_samples/document/empty.org
 create mode 100644 org_mode_samples/document/only_line_breaks.org
 rename org_mode_samples/{sections_and_headings/document_post_blank.org => document/post_blank.org} (100%)

diff --git a/org_mode_samples/document/empty.org b/org_mode_samples/document/empty.org
new file mode 100644
index 0000000..e69de29
diff --git a/org_mode_samples/document/only_line_breaks.org b/org_mode_samples/document/only_line_breaks.org
new file mode 100644
index 0000000..fd40910
--- /dev/null
+++ b/org_mode_samples/document/only_line_breaks.org
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/org_mode_samples/sections_and_headings/document_post_blank.org b/org_mode_samples/document/post_blank.org
similarity index 100%
rename from org_mode_samples/sections_and_headings/document_post_blank.org
rename to org_mode_samples/document/post_blank.org
diff --git a/src/parser/document.rs b/src/parser/document.rs
index 65aabc3..8c783cc 100644
--- a/src/parser/document.rs
+++ b/src/parser/document.rs
@@ -3,6 +3,7 @@ use std::path::Path;
 use nom::combinator::all_consuming;
 use nom::combinator::opt;
 use nom::multi::many0;
+use nom::InputTake;
 
 use super::headline::heading;
 use super::in_buffer_settings::apply_in_buffer_settings;
@@ -195,9 +196,9 @@ fn _document<'b, 'g, 'r, 's>(
             zeroth_section,
             children,
             contents: if contents.len() > 0 {
-                Some(Into::<&str>::into(contents))
+                Into::<&str>::into(contents)
             } else {
-                None
+                Into::<&str>::into(remaining.take(0))
             },
         },
     ))
diff --git a/src/types/document.rs b/src/types/document.rs
index e39e19c..e926940 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -17,7 +17,7 @@ pub struct Document<'s> {
     pub path: Option<PathBuf>,
     pub zeroth_section: Option<Section<'s>>,
     pub children: Vec<Heading<'s>>,
-    pub contents: Option<&'s str>,
+    pub contents: &'s str,
 }
 
 #[derive(Debug)]
@@ -64,7 +64,7 @@ impl<'s> StandardProperties<'s> for Document<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        self.contents
+        Some(self.contents)
     }
 
     fn get_post_blank(&self) -> PostBlank {

From e24fcb9ded32e8fa92de9c3411810412c511d28c Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 19:54:03 -0500
Subject: [PATCH 77/78] Add dummy values for new fields for plaintext.

---
 src/types/object.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/types/object.rs b/src/types/object.rs
index 05bf888..b2f5f33 100644
--- a/src/types/object.rs
+++ b/src/types/object.rs
@@ -1014,11 +1014,13 @@ impl<'s> StandardProperties<'s> for PlainText<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        todo!()
+        // This field does not actually exist in emacs for plaintext
+        Some(self.source)
     }
 
     fn get_post_blank(&self) -> PostBlank {
-        todo!()
+        // This field does not actually exist in emacs for plaintext
+        0
     }
 }
 

From 5a8159eed73327df95fb16a219d4608fa6070cf3 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Fri, 15 Dec 2023 19:57:35 -0500
Subject: [PATCH 78/78] Fix clippy.

---
 src/compare/util.rs         | 2 +-
 src/event_count/database.rs | 2 +-
 src/parser/bullshitium.rs   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compare/util.rs b/src/compare/util.rs
index 79cefcd..9029b24 100644
--- a/src/compare/util.rs
+++ b/src/compare/util.rs
@@ -285,7 +285,7 @@ where
 pub(crate) fn compare_children<'b, 's, 'x, RC>(
     source: &'s str,
     emacs: &'b Token<'s>,
-    rust_children: &'x Vec<RC>,
+    rust_children: &'x [RC],
     child_status: &mut Vec<DiffEntry<'b, 's>>,
     this_status: &mut DiffStatus,
     message: &mut Option<String>,
diff --git a/src/event_count/database.rs b/src/event_count/database.rs
index 1b763e0..c9adbcf 100644
--- a/src/event_count/database.rs
+++ b/src/event_count/database.rs
@@ -27,7 +27,7 @@ pub(crate) fn record_event(event_type: EventType, input: OrgSource<'_>) {
 pub fn report(original_document: &str) {
     let mut db = GLOBAL_DATA.lock().unwrap();
     let db = db.get_or_insert_with(HashMap::new);
-    let mut results: Vec<_> = db.iter().map(|(k, v)| (k, v)).collect();
+    let mut results: Vec<_> = db.iter().collect();
     results.sort_by_key(|(_k, v)| *v);
     // This would put the most common at the top, but that is a pain when there is already a lot of output from the parser.
     // results.sort_by(|(_ak, av), (_bk, bv)| bv.cmp(av));
diff --git a/src/parser/bullshitium.rs b/src/parser/bullshitium.rs
index 52e97d0..597d433 100644
--- a/src/parser/bullshitium.rs
+++ b/src/parser/bullshitium.rs
@@ -84,7 +84,7 @@ pub(crate) fn broken_end<'b, 'g, 'r, 's>(
             Paragraph::of_text(
                 input.get_until(remaining).into(),
                 body,
-                if body.len() > 0 { Some(body) } else { None },
+                if !body.is_empty() { Some(body) } else { None },
                 post_blank.map(Into::<&str>::into),
             ),
         ))
@@ -145,7 +145,7 @@ pub(crate) fn broken_dynamic_block<'b, 'g, 'r, 's>(
             Paragraph::of_text(
                 input.get_until(remaining).into(),
                 body,
-                if body.len() > 0 { Some(body) } else { None },
+                if !body.is_empty() { Some(body) } else { None },
                 post_blank.map(Into::<&str>::into),
             ),
         ))