Publish version 0.1.15.

serde_wasm_bindgen was silently dropping many attributes (I suspect it is triggered by serde flatten) so this switches to serializing to JSON for passing values from wasm to js.

.lighthouse/pipeline-rust-build.yaml

@@ -192,6 +192,54 @@ spec:
               ]
           - name: docker-image
             value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
+      - name: run-image-wasm
+        taskRef:
+          name: run-docker-image
+        workspaces:
+          - name: source
+            workspace: git-source
+          - name: cargo-cache
+            workspace: cargo-cache
+        runAfter:
+          - run-image-all
+        params:
+          - name: args
+            value:
+              [
+                "--target",
+                "wasm32-unknown-unknown",
+                "--profile",
+                "wasm",
+                "--bin",
+                "wasm",
+                "--no-default-features",
+                "--features",
+                "wasm",
+              ]
+          - name: docker-image
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
+      - name: run-image-wasm-test
+        taskRef:
+          name: run-docker-image
+        workspaces:
+          - name: source
+            workspace: git-source
+          - name: cargo-cache
+            workspace: cargo-cache
+        runAfter:
+          - run-image-wasm
+        params:
+          - name: args
+            value:
+              [
+                "--bin",
+                "wasm_test",
+                "--no-default-features",
+                "--features",
+                "wasm_test",
+              ]
+          - name: docker-image
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     finally:
       - name: report-success
         when:

.lighthouse/pipeline-rust-test.yaml

@@ -115,7 +115,7 @@ spec:
               [
                 --no-default-features,
                 --features,
-                compare,
+                "compare,wasm_test",
                 --no-fail-fast,
                 --lib,
                 --test,

.lighthouse/pipeline-rustfmt.yaml

@@ -127,7 +127,7 @@ spec:
           - name: command
             value: ["cargo", "fix"]
           - name: args
-            value: ["--allow-dirty"]
+            value: ["--all-targets", "--all-features", "--allow-dirty"]
           - name: docker-image
             value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       - name: commit-changes

Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "organic"
-version = "0.1.12"
+version = "0.1.15"
 authors = ["Tom Alexander <tom@fizz.buzz>"]
 description = "An org-mode parser."
 edition = "2021"
@@ -39,17 +39,33 @@ path = "src/lib.rs"
   path = "src/bin_foreign_document_test.rs"
   required-features = ["foreign_document_test"]
 
+[[bin]]
+  name = "wasm"
+  path = "src/bin_wasm.rs"
+  required-features = ["wasm"]
+
+[[bin]]
+  # This bin exists for development purposes only. The real target of this crate is the library.
+  name = "wasm_test"
+  path = "src/bin_wasm_test.rs"
+  required-features = ["wasm_test"]
+
 [dependencies]
 futures = { version = "0.3.28", optional = true }
+gloo-utils = "0.2.0"
 nom = "7.1.1"
 opentelemetry = { version = "0.20.0", optional = true, default-features = false, features = ["trace", "rt-tokio"] }
 opentelemetry-otlp = { version = "0.13.0", optional = true }
 opentelemetry-semantic-conventions = { version = "0.12.0", optional = true }
+serde = { version = "1.0.193", optional = true, features = ["derive"] }
+serde-wasm-bindgen = { version = "0.6.3", optional = true }
+serde_json = { version = "1.0.108", optional = true }
 tokio = { version = "1.30.0", optional = true, default-features = false, features = ["rt", "rt-multi-thread"] }
 tracing = { version = "0.1.37", optional = true }
 tracing-opentelemetry = { version = "0.20.0", optional = true }
 tracing-subscriber = { version = "0.3.17", optional = true, features = ["env-filter"] }
 walkdir = { version = "2.3.3", optional = true }
+wasm-bindgen = { version = "0.2.89", optional = true }
 
 [build-dependencies]
 walkdir = "2.3.3"
@@ -60,6 +76,8 @@ compare = ["tokio/process", "tokio/macros"]
 foreign_document_test = ["compare", "dep:futures", "tokio/sync", "dep:walkdir", "tokio/process"]
 tracing = ["dep:opentelemetry", "dep:opentelemetry-otlp", "dep:opentelemetry-semantic-conventions", "dep:tokio", "dep:tracing", "dep:tracing-opentelemetry", "dep:tracing-subscriber"]
 event_count = []
+wasm = ["dep:serde", "dep:wasm-bindgen", "dep:serde-wasm-bindgen"]
+wasm_test = ["wasm", "dep:serde_json", "tokio/process", "tokio/macros"]
 
 # Optimized build for any sort of release.
 [profile.release-lto]
@@ -79,3 +97,8 @@ strip = "symbols"
 inherits = "release"
 lto = true
 debug = true
+
+[profile.wasm]
+inherits = "release"
+lto = true
+strip = true

Makefile

@@ -7,6 +7,7 @@ MAKEFLAGS += --no-builtin-rules
 TESTJOBS := 4
 OS:=$(shell uname -s)
 RELEASEFLAGS :=
+WASMTARGET := bundler # or web
 
 ifeq ($(OS),Linux)
   TESTJOBS:=$(shell nproc)
@@ -29,6 +30,11 @@ build:
 release:
 > cargo build --release $(RELEASEFLAGS)
 
+.PHONY: wasm
+wasm:
+> cargo build --target=wasm32-unknown-unknown --profile wasm --bin wasm --features wasm
+> wasm-bindgen --target $(WASMTARGET) --out-dir target/wasm32-unknown-unknown/js target/wasm32-unknown-unknown/wasm/wasm.wasm
+
 .PHONY: clean
 clean:
 > cargo clean
@@ -49,11 +55,20 @@ clippy:
 test:
 > cargo test --no-default-features --features compare --no-fail-fast --lib --test test_loader -- --test-threads $(TESTJOBS)
 
+.PHONY: doc
+doc:
+> cargo doc --no-deps --open --lib --release --all-features
+
 .PHONY: dockertest
 dockertest:
 > $(MAKE) -C docker/organic_test
 > docker run --init --rm -i -t --read-only -v "$$(readlink -f ./):/source:ro" --mount type=tmpfs,destination=/tmp --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source organic-test --no-default-features --features compare --no-fail-fast --lib --test test_loader -- --test-threads $(TESTJOBS)
 
+.PHONY: dockerwasmtest
+dockerwasmtest:
+> $(MAKE) -C docker/organic_test
+> docker run --init --rm -i -t --read-only -v "$$(readlink -f ./):/source:ro" --mount type=tmpfs,destination=/tmp --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source organic-test --no-default-features --features compare,wasm_test --no-fail-fast --lib --test test_loader autogen_wasm_ -- --test-threads $(TESTJOBS)
+
 .PHONY: buildtest
 buildtest:
 > cargo build --no-default-features
@@ -62,6 +77,8 @@ buildtest:
 > cargo build --no-default-features --features compare,tracing
 > cargo build --no-default-features --features compare,foreign_document_test
 > cargo build --no-default-features --features compare,tracing,foreign_document_test
+> cargo build --target wasm32-unknown-unknown --profile wasm --bin wasm --no-default-features --features wasm
+> cargo build --bin wasm_test --no-default-features --features wasm_test
 
 .PHONY: foreign_document_test
 foreign_document_test:

README.md

@@ -10,17 +10,16 @@ Currently, Organic parses most documents the same as the official org-mode parse
 
 ### Project Goals
 - We aim to provide perfect parity with the emacs org-mode parser. In that regard, any document that parses differently between Emacs and Organic is considered a bug.
-- The parser should have minimal dependencies. This should reduce effort w.r.t.: security audits, legal compliance, portability.
+- The parser should have minimal dependencies.
-- The parser should be usable everywhere. In the interest of getting org-mode used in as many places as possible, this parser should be usable by everyone everywhere. This means:
+- The parser should be usable everywhere. In the interest of getting org used in as many places as possible, this parser should be usable by everyone everywhere. This means:
   - It must have a permissive license.
-  - We will investigate compiling to WASM. This is an important goal of the project and will definitely happen, but only after the parser has a more stable API.
+  - It compiles to both natively and to wasm.
   - We will investigate compiling to a C library for native linking to other code. This is more of a maybe-goal for the project.
 ### Project Non-Goals
 - This project will not include an elisp engine since that would drastically increase the complexity of the code. Any features requiring an elisp engine will not be implemented (for example, Emacs supports embedded eval expressions in documents but this parser will never support that).
 - This project is exclusively an org-mode **parser**. This limits its scope to roughly the output of `(org-element-parse-buffer)`. It will not render org-mode documents in other formats like HTML or LaTeX.
 ### Project Maybe-Goals
 - table.el support. Currently we support org-mode tables but org-mode also allows table.el tables. So far, their use in org-mode documents seems rather uncommon so this is a low-priority feature.
-- Document editing support. I do not anticipate any advanced editing features to make editing ergonomic, but it should be relatively easy to be able to parse an org-mode document and serialize it back into org-mode. This would enable cool features to be built on top of the library like auto-formatters. To accomplish this feature, We'd have to capture all of the various separators and whitespace that we are currently simply throwing away. This would add many additional fields to the parsed structs and it would add more noise to the parsers themselves, so I do not want to approach this feature until the parser is more complete since it would make modifications and refactoring more difficult.
 ### Supported Versions
 This project targets the version of Emacs and Org-mode that are built into the [organic-test docker image](docker/organic_test/Dockerfile). This is newer than the version of Org-mode that shipped with Emacs 29.1. The parser itself does not depend on Emacs or Org-mode though, so this only matters for development purposes when running the automated tests that compare against upstream Org-mode.
 

docker/organic_build/Dockerfile

@@ -2,5 +2,6 @@ FROM rustlang/rust:nightly-alpine3.17
 
 RUN apk add --no-cache musl-dev
 RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache
+RUN rustup target add wasm32-unknown-unknown
 
 ENTRYPOINT ["cargo", "build"]

docker/organic_clippy/Makefile

@@ -30,7 +30,7 @@ endif
 # NOTE: This target will write to folders underneath the git-root
 .PHONY: run
 run: build
-	docker run --rm --init --read-only --mount type=tmpfs,destination=/tmp -v "$$(readlink -f ../../):/source:ro" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target $(IMAGE_NAME)
+	docker run --rm --init -t --read-only --mount type=tmpfs,destination=/tmp -v "$$(readlink -f ../../):/source:ro" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target $(IMAGE_NAME)
 
 .PHONY: shell
 shell: build

org_mode_samples/document/only_line_breaks.org

@@ -0,0 +1,4 @@
+
+
+
+

org_mode_samples/document/post_blank.org

@@ -0,0 +1,5 @@
+* foo
+
+
+
+

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:

org_mode_samples/lesser_element/babel_call/simple.org

@@ -5,3 +5,5 @@
 #+call: dolar cat(dog)
 
 #+call: (bat)
+
+#+call:

org_mode_samples/lesser_element/fixed_width_area/blank_line_in_middle.org

@@ -0,0 +1,3 @@
+: foo
+:
+: bar

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

org_mode_samples/object/target/simple.org

@@ -0,0 +1,3 @@
+<<FOO>> bar
+
+[[FOO][baz]]

org_mode_samples/sections_and_headings/heading_with_subheading_post_blank.org

@@ -0,0 +1,5 @@
+* foo
+
+** bar
+
+* baz

scripts/build_all_feature_flag_combinations.bash

@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+#
+# Time running a single parse without invoking a compare with emacs.
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+: ${PROFILE:="debug"}
+
+############## Setup #########################
+
+function cleanup {
+    for f in "${folders[@]}"; do
+        log "Deleting $f"
+        rm -rf "$f"
+    done
+}
+folders=()
+for sig in EXIT INT QUIT HUP TERM; do
+  trap "set +e; cleanup" "$sig"
+done
+
+function die {
+    local status_code="$1"
+    shift
+    (>&2 echo "${@}")
+    exit "$status_code"
+}
+
+function log {
+    (>&2 echo "${@}")
+}
+
+############## Program #########################
+
+function main {
+    if [ "$#" -gt 0 ]; then
+        export CARGO_TARGET_DIR="$1"
+    else
+        local work_directory=$(mktemp -d -t 'organic.XXXXXX')
+        folders+=("$work_directory")
+        export CARGO_TARGET_DIR="$work_directory"
+    fi
+    local features=(compare foreign_document_test tracing event_count wasm wasm_test)
+    ENABLED_FEATURES= for_each_combination "${features[@]}"
+}
+
+function for_each_combination {
+    local additional_flags=()
+    if [ "$PROFILE" = "dev" ] || [ "$PROFILE" = "debug" ]; then
+        PROFILE="debug"
+    else
+        additional_flags+=(--profile "$PROFILE")
+    fi
+
+
+    local flag=$1
+    shift
+
+    if [ "$#" -gt 0 ]; then
+        ENABLED_FEATURES="$ENABLED_FEATURES" for_each_combination "${@}"
+    elif [ -z "$ENABLED_FEATURES" ]; then
+        (cd "$DIR/../" && printf "\n\n\n========== no features ==========\n\n\n" && set -x && cargo build "${additional_flags[@]}" --no-default-features)
+    else
+        (cd "$DIR/../" && printf "\n\n\n========== %s ==========\n\n\n" "${ENABLED_FEATURES:1}" && set -x && cargo build "${additional_flags[@]}" --no-default-features --features "${ENABLED_FEATURES:1}")
+    fi
+
+    ENABLED_FEATURES="$ENABLED_FEATURES,$flag"
+    if [ "$#" -gt 0 ]; then
+        ENABLED_FEATURES="$ENABLED_FEATURES" for_each_combination "${@}"
+    else
+        (cd "$DIR/../" && printf "\n\n\n========== %s ==========\n\n\n" "${ENABLED_FEATURES:1}" && set -x && cargo build "${additional_flags[@]}" --no-default-features --features "${ENABLED_FEATURES:1}")
+    fi
+}
+
+main "${@}"

scripts/run_docker_wasm_compare.bash

@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+#
+set -euo pipefail
+IFS=$'\n\t'
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+: ${SHELL:="NO"} # or YES to launch a shell instead of running the test
+: ${TRACE:="NO"} # or YES to send traces to jaeger
+: ${BACKTRACE:="NO"} # or YES to print a rust backtrace when panicking
+: ${NO_COLOR:=""} # Set to anything to disable color output
+: ${PROFILE:="debug"}
+
+REALPATH=$(command -v uu-realpath || command -v realpath)
+MAKE=$(command -v gmake || command -v make)
+
+############## Setup #########################
+
+function die {
+    local status_code="$1"
+    shift
+    (>&2 echo "${@}")
+    exit "$status_code"
+}
+
+function log {
+    (>&2 echo "${@}")
+}
+
+############## Program #########################
+
+function main {
+    build_container
+    launch_container "${@}"
+}
+
+function build_container {
+    $MAKE -C "$DIR/../docker/organic_test"
+}
+
+function launch_container {
+    local additional_flags=()
+    local features=(wasm_test)
+
+    if [ "$NO_COLOR" != "" ]; then
+        additional_flags+=(--env "NO_COLOR=$NO_COLOR")
+    fi
+
+    if [ "$TRACE" = "YES" ]; then
+        # We use the host network so it can talk to jaeger hosted at 127.0.0.1
+        additional_flags+=(--network=host --env RUST_LOG=debug)
+        features+=(tracing)
+    fi
+
+    if [ "$SHELL" != "YES" ]; then
+        additional_flags+=(--read-only)
+    else
+        additional_flags+=(-t)
+    fi
+
+    if [ "$BACKTRACE" = "YES" ]; then
+        additional_flags+=(--env RUST_BACKTRACE=full)
+    fi
+
+    if [ "$SHELL" = "YES" ]; then
+        exec docker run "${additional_flags[@]}" --init --rm -i --mount type=tmpfs,destination=/tmp -v "/:/input:ro" -v "$($REALPATH "$DIR/../"):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test /bin/sh
+    fi
+
+    local features_joined
+    features_joined=$(IFS=","; echo "${features[*]}")
+
+    local build_flags=()
+    if [ "$PROFILE" = "dev" ] || [ "$PROFILE" = "debug" ]; then
+        PROFILE="debug"
+    else
+        build_flags+=(--profile "$PROFILE")
+    fi
+
+
+    if [ $# -gt 0 ]; then
+        # If we passed in args, we need to forward them along
+        for path in "${@}"; do
+            local full_path
+            full_path=$($REALPATH "$path")
+            init_script=$(cat <<EOF
+set -euo pipefail
+IFS=\$'\n\t'
+
+cargo build --bin wasm_test --no-default-features --features "$features_joined" ${build_flags[@]}
+exec /target/${PROFILE}/wasm_test "/input${full_path}"
+EOF
+                       )
+            docker run "${additional_flags[@]}" --init --rm -i --mount type=tmpfs,destination=/tmp -v "/:/input:ro"  -v "$($REALPATH "$DIR/../"):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test sh -c "$init_script"
+        done
+    else
+        local current_directory init_script
+        current_directory=$(pwd)
+        init_script=$(cat <<EOF
+set -euo pipefail
+IFS=\$'\n\t'
+
+cargo build --bin wasm_test --no-default-features --features "$features_joined" ${build_flags[@]}
+cd /input${current_directory}
+exec /target/${PROFILE}/wasm_test
+EOF
+                       )
+
+        docker run "${additional_flags[@]}" --init --rm -i --mount type=tmpfs,destination=/tmp -v "/:/input:ro" -v "$($REALPATH "$DIR/../"):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test sh -c "$init_script"
+    fi
+}
+
+main "${@}"

src/bin_compare.rs

@@ -1,3 +1,4 @@
+#![feature(exit_status_error)]
 #![feature(round_char_boundary)]
 #![feature(exact_size_is_empty)]
 use std::io::Read;

src/bin_wasm.rs

@@ -0,0 +1,10 @@
+use wasm_bindgen::prelude::wasm_bindgen;
+
+#[wasm_bindgen]
+pub fn parse_org(org_contents: &str) -> wasm_bindgen::JsValue {
+    organic::wasm_cli::parse_org(org_contents)
+}
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    Ok(())
+}

src/bin_wasm_test.rs

@@ -0,0 +1,62 @@
+#![feature(exact_size_is_empty)]
+#![feature(exit_status_error)]
+use std::io::Read;
+
+use organic::wasm_test::wasm_run_anonymous_compare;
+use organic::wasm_test::wasm_run_compare_on_file;
+
+#[cfg(feature = "tracing")]
+use crate::init_tracing::init_telemetry;
+#[cfg(feature = "tracing")]
+use crate::init_tracing::shutdown_telemetry;
+#[cfg(feature = "tracing")]
+mod init_tracing;
+
+#[cfg(not(feature = "tracing"))]
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let rt = tokio::runtime::Runtime::new()?;
+    rt.block_on(async {
+        let main_body_result = main_body().await;
+        main_body_result
+    })
+}
+
+#[cfg(feature = "tracing")]
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let rt = tokio::runtime::Runtime::new()?;
+    rt.block_on(async {
+        init_telemetry()?;
+        let main_body_result = main_body().await;
+        shutdown_telemetry()?;
+        main_body_result
+    })
+}
+
+#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
+async fn main_body() -> Result<(), Box<dyn std::error::Error>> {
+    let args = std::env::args().skip(1);
+    if args.is_empty() {
+        let org_contents = read_stdin_to_string()?;
+        if wasm_run_anonymous_compare(org_contents).await? {
+        } else {
+            Err("Diff results do not match.")?;
+        }
+        Ok(())
+    } else {
+        for arg in args {
+            if wasm_run_compare_on_file(arg).await? {
+            } else {
+                Err("Diff results do not match.")?;
+            }
+        }
+        Ok(())
+    }
+}
+
+fn read_stdin_to_string() -> Result<String, Box<dyn std::error::Error>> {
+    let mut stdin_contents = String::new();
+    std::io::stdin()
+        .lock()
+        .read_to_string(&mut stdin_contents)?;
+    Ok(stdin_contents)
+}

src/compare/compare.rs

@@ -1,16 +1,16 @@
 use std::path::Path;
 
 use crate::compare::diff::compare_document;
-use crate::compare::diff::DiffResult;
-use crate::compare::parse::emacs_parse_anonymous_org_document;
-use crate::compare::parse::emacs_parse_file_org_document;
-use crate::compare::parse::get_emacs_version;
-use crate::compare::parse::get_org_mode_version;
-use crate::compare::sexp::sexp;
 use crate::context::GlobalSettings;
 use crate::context::LocalFileAccessInterface;
 use crate::parser::parse_file_with_settings;
 use crate::parser::parse_with_settings;
+use crate::util::cli::emacs_parse_anonymous_org_document;
+use crate::util::cli::emacs_parse_file_org_document;
+use crate::util::cli::print_versions;
+use crate::util::elisp::sexp;
+use crate::util::terminal::foreground_color;
+use crate::util::terminal::reset_color;
 
 pub async fn run_anonymous_compare<P: AsRef<str>>(
     org_contents: P,
@@ -68,8 +68,8 @@ pub async fn run_anonymous_compare_with_settings<'g, 's, P: AsRef<str>>(
     } else if !silent {
         println!(
             "{color}Entire document passes.{reset}",
-            color = DiffResult::foreground_color(0, 255, 0),
+            color = foreground_color(0, 255, 0),
-            reset = DiffResult::reset_color(),
+            reset = reset_color(),
         );
     }
 
@@ -121,19 +121,10 @@ pub async fn run_compare_on_file_with_settings<'g, 's, P: AsRef<Path>>(
     } else if !silent {
         println!(
             "{color}Entire document passes.{reset}",
-            color = DiffResult::foreground_color(0, 255, 0),
+            color = foreground_color(0, 255, 0),
-            reset = DiffResult::reset_color(),
+            reset = reset_color(),
         );
     }
 
     Ok(true)
 }
-
-async fn print_versions() -> Result<(), Box<dyn std::error::Error>> {
-    eprintln!("Using emacs version: {}", get_emacs_version().await?.trim());
-    eprintln!(
-        "Using org-mode version: {}",
-        get_org_mode_version().await?.trim()
-    );
-    Ok(())
-}

src/compare/compare_field.rs

@@ -9,8 +9,6 @@ use super::diff::artificial_owned_diff_scope;
 use super::diff::compare_ast_node;
 use super::diff::DiffEntry;
 use super::diff::DiffStatus;
-use super::sexp::unquote;
-use super::sexp::Token;
 use super::util::get_property;
 use super::util::get_property_numeric;
 use super::util::get_property_quoted_string;
@@ -20,6 +18,8 @@ use crate::types::CharOffsetInLine;
 use crate::types::LineNumber;
 use crate::types::RetainLabels;
 use crate::types::SwitchNumberLines;
+use crate::util::elisp::unquote;
+use crate::util::elisp::Token;
 
 #[derive(Debug)]
 pub(crate) enum EmacsField<'s> {

src/compare/diff.rs

@@ -16,10 +16,6 @@ use super::compare_field::compare_property_retain_labels;
 use super::compare_field::compare_property_set_of_quoted_string;
 use super::compare_field::compare_property_single_ast_node;
 use super::compare_field::compare_property_unquoted_atom;
-use super::elisp_fact::ElispFact;
-use super::elisp_fact::GetElispFact;
-use super::sexp::unquote;
-use super::sexp::Token;
 use super::util::affiliated_keywords_names;
 use super::util::assert_no_children;
 use super::util::compare_additional_properties;
@@ -109,6 +105,12 @@ use crate::types::Verbatim;
 use crate::types::VerseBlock;
 use crate::types::WarningDelayType;
 use crate::types::Year;
+use crate::util::elisp::unquote;
+use crate::util::elisp::Token;
+use crate::util::elisp_fact::ElispFact;
+use crate::util::elisp_fact::GetElispFact;
+use crate::util::terminal::foreground_color;
+use crate::util::terminal::reset_color;
 
 #[derive(Debug)]
 pub enum DiffEntry<'b, 's> {
@@ -200,21 +202,21 @@ impl<'b, 's> DiffResult<'b, 's> {
                     if self.has_bad_children() {
                         format!(
                             "{color}BADCHILD{reset}",
-                            color = DiffResult::foreground_color(255, 255, 0),
+                            color = foreground_color(255, 255, 0),
-                            reset = DiffResult::reset_color(),
+                            reset = reset_color(),
                         )
                     } else {
                         format!(
                             "{color}GOOD{reset}",
-                            color = DiffResult::foreground_color(0, 255, 0),
+                            color = foreground_color(0, 255, 0),
-                            reset = DiffResult::reset_color(),
+                            reset = reset_color(),
                         )
                     }
                 }
                 DiffStatus::Bad => format!(
                     "{color}BAD{reset}",
-                    color = DiffResult::foreground_color(255, 0, 0),
+                    color = foreground_color(255, 0, 0),
-                    reset = DiffResult::reset_color(),
+                    reset = reset_color(),
                 ),
             }
         };
@@ -239,45 +241,6 @@ impl<'b, 's> DiffResult<'b, 's> {
             .iter()
             .any(|child| child.is_immediately_bad() || child.has_bad_children())
     }
-
-    pub(crate) fn foreground_color(red: u8, green: u8, blue: u8) -> String {
-        if DiffResult::should_use_color() {
-            format!(
-                "\x1b[38;2;{red};{green};{blue}m",
-                red = red,
-                green = green,
-                blue = blue
-            )
-        } else {
-            String::new()
-        }
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn background_color(red: u8, green: u8, blue: u8) -> String {
-        if DiffResult::should_use_color() {
-            format!(
-                "\x1b[48;2;{red};{green};{blue}m",
-                red = red,
-                green = green,
-                blue = blue
-            )
-        } else {
-            String::new()
-        }
-    }
-
-    pub(crate) fn reset_color() -> &'static str {
-        if DiffResult::should_use_color() {
-            "\x1b[0m"
-        } else {
-            ""
-        }
-    }
-
-    fn should_use_color() -> bool {
-        !std::env::var("NO_COLOR").is_ok_and(|val| !val.is_empty())
-    }
 }
 
 impl<'b, 's> DiffLayer<'b, 's> {
@@ -295,14 +258,14 @@ impl<'b, 's> DiffLayer<'b, 's> {
         let status_text = if self.has_bad_children() {
             format!(
                 "{color}BADCHILD{reset}",
-                color = DiffResult::foreground_color(255, 255, 0),
+                color = foreground_color(255, 255, 0),
-                reset = DiffResult::reset_color(),
+                reset = reset_color(),
             )
         } else {
             format!(
                 "{color}GOOD{reset}",
-                color = DiffResult::foreground_color(0, 255, 0),
+                color = foreground_color(0, 255, 0),
-                reset = DiffResult::reset_color(),
+                reset = reset_color(),
             )
         };
         println!(

src/compare/mod.rs

@@ -2,10 +2,7 @@
 mod compare;
 mod compare_field;
 mod diff;
-mod elisp_fact;
 mod macros;
-mod parse;
-mod sexp;
 mod util;
 pub use compare::run_anonymous_compare;
 pub use compare::run_anonymous_compare_with_settings;

src/compare/util.rs

@@ -8,14 +8,15 @@ use super::compare_field::compare_property_quoted_string;
 use super::compare_field::ComparePropertiesResult;
 use super::diff::DiffEntry;
 use super::diff::DiffStatus;
-use super::elisp_fact::GetElispFact;
-use super::sexp::Token;
 use crate::compare::diff::compare_ast_node;
-use crate::compare::sexp::unquote;
 use crate::types::AffiliatedKeywordValue;
 use crate::types::AstNode;
 use crate::types::GetAffiliatedKeywords;
 use crate::types::StandardProperties;
+use crate::util::elisp::get_emacs_standard_properties;
+use crate::util::elisp::unquote;
+use crate::util::elisp::Token;
+use crate::util::elisp_fact::GetElispFact;
 
 /// Check if the child string slice is a slice of the parent string slice.
 fn is_slice_of(parent: &str, child: &str) -> bool {
@@ -139,86 +140,12 @@ 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(())
 }
 
-struct EmacsStandardProperties {
-    begin: Option<usize>,
-    #[allow(dead_code)]
-    post_affiliated: Option<usize>,
-    #[allow(dead_code)]
-    contents_begin: Option<usize>,
-    #[allow(dead_code)]
-    contents_end: Option<usize>,
-    end: Option<usize>,
-    #[allow(dead_code)]
-    post_blank: Option<usize>,
-}
-
-fn get_emacs_standard_properties(
-    emacs: &Token<'_>,
-) -> Result<EmacsStandardProperties, Box<dyn std::error::Error>> {
-    let children = emacs.as_list()?;
-    let attributes_child = children.get(1).ok_or("Should have an attributes child.")?;
-    let attributes_map = attributes_child.as_map()?;
-    let standard_properties = attributes_map.get(":standard-properties");
-    Ok(if standard_properties.is_some() {
-        let mut std_props = standard_properties
-            .expect("if statement proves its Some")
-            .as_vector()?
-            .iter();
-        let begin = maybe_token_to_usize(std_props.next())?;
-        let post_affiliated = maybe_token_to_usize(std_props.next())?;
-        let contents_begin = maybe_token_to_usize(std_props.next())?;
-        let contents_end = maybe_token_to_usize(std_props.next())?;
-        let end = maybe_token_to_usize(std_props.next())?;
-        let post_blank = maybe_token_to_usize(std_props.next())?;
-        EmacsStandardProperties {
-            begin,
-            post_affiliated,
-            contents_begin,
-            contents_end,
-            end,
-            post_blank,
-        }
-    } else {
-        let begin = maybe_token_to_usize(attributes_map.get(":begin").copied())?;
-        let end = maybe_token_to_usize(attributes_map.get(":end").copied())?;
-        let contents_begin = maybe_token_to_usize(attributes_map.get(":contents-begin").copied())?;
-        let contents_end = maybe_token_to_usize(attributes_map.get(":contents-end").copied())?;
-        let post_blank = maybe_token_to_usize(attributes_map.get(":post-blank").copied())?;
-        let post_affiliated =
-            maybe_token_to_usize(attributes_map.get(":post-affiliated").copied())?;
-        EmacsStandardProperties {
-            begin,
-            post_affiliated,
-            contents_begin,
-            contents_end,
-            end,
-            post_blank,
-        }
-    })
-}
-
-fn maybe_token_to_usize(
-    token: Option<&Token<'_>>,
-) -> Result<Option<usize>, Box<dyn std::error::Error>> {
-    Ok(token
-        .map(|token| token.as_atom())
-        .map_or(Ok(None), |r| r.map(Some))?
-        .and_then(|val| {
-            if val == "nil" {
-                None
-            } else {
-                Some(val.parse::<usize>())
-            }
-        })
-        .map_or(Ok(None), |r| r.map(Some))?)
-}
-
 /// Get a named property from the emacs token.
 ///
 /// Returns Ok(None) if value is nil or absent.
@@ -285,7 +212,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>,

src/event_count/database.rs

@@ -24,10 +24,10 @@ pub(crate) fn record_event(event_type: EventType, input: OrgSource<'_>) {
     *db.entry(key).or_insert(0) += 1;
 }
 
-pub fn report(original_document: &str) {
+pub(crate) 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));

src/event_count/mod.rs

@@ -2,5 +2,5 @@ mod database;
 mod event_type;
 
 pub(crate) use database::record_event;
-pub use database::report;
+pub(crate) use database::report;
 pub(crate) use event_type::EventType;

src/lib.rs

@@ -3,6 +3,8 @@
 #![feature(path_file_prefix)]
 #![feature(is_sorted)]
 #![feature(test)]
+#![feature(iter_intersperse)]
+#![feature(exact_size_is_empty)]
 // TODO: #![warn(missing_docs)]
 #![allow(clippy::bool_assert_comparison)] // Sometimes you want the long form because its easier to see at a glance.
 
@@ -10,11 +12,20 @@ extern crate test;
 
 #[cfg(feature = "compare")]
 pub mod compare;
+pub mod parse_cli;
+#[cfg(any(feature = "compare", feature = "wasm", feature = "wasm_test"))]
+mod util;
+#[cfg(any(feature = "wasm", feature = "wasm_test"))]
+mod wasm;
+#[cfg(any(feature = "wasm", feature = "wasm_test"))]
+pub mod wasm_cli;
+#[cfg(feature = "wasm_test")]
+pub mod wasm_test;
 
 mod context;
 mod error;
 #[cfg(feature = "event_count")]
-pub mod event_count;
+mod event_count;
 mod iter;
 pub mod parser;
 pub mod types;

src/main.rs

@@ -1,12 +1,4 @@
-#![feature(round_char_boundary)]
+use organic::parse_cli::main_body;
-#![feature(exact_size_is_empty)]
-use std::io::Read;
-use std::path::Path;
-
-use ::organic::parser::parse;
-use organic::parser::parse_with_settings;
-use organic::settings::GlobalSettings;
-use organic::settings::LocalFileAccessInterface;
 
 #[cfg(feature = "tracing")]
 use crate::init_tracing::init_telemetry;
@@ -30,55 +22,3 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         main_body_result
     })
 }
-
-#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn main_body() -> Result<(), Box<dyn std::error::Error>> {
-    let args = std::env::args().skip(1);
-    if args.is_empty() {
-        let org_contents = read_stdin_to_string()?;
-        run_anonymous_parse(org_contents)
-    } else {
-        for arg in args {
-            run_parse_on_file(arg)?
-        }
-        Ok(())
-    }
-}
-
-fn read_stdin_to_string() -> Result<String, Box<dyn std::error::Error>> {
-    let mut stdin_contents = String::new();
-    std::io::stdin()
-        .lock()
-        .read_to_string(&mut stdin_contents)?;
-    Ok(stdin_contents)
-}
-
-fn run_anonymous_parse<P: AsRef<str>>(org_contents: P) -> Result<(), Box<dyn std::error::Error>> {
-    let org_contents = org_contents.as_ref();
-    let rust_parsed = parse(org_contents)?;
-    println!("{:#?}", rust_parsed);
-    #[cfg(feature = "event_count")]
-    organic::event_count::report(org_contents);
-    Ok(())
-}
-
-fn run_parse_on_file<P: AsRef<Path>>(org_path: P) -> Result<(), Box<dyn std::error::Error>> {
-    let org_path = org_path.as_ref();
-    let parent_directory = org_path
-        .parent()
-        .ok_or("Should be contained inside a directory.")?;
-    let org_contents = std::fs::read_to_string(org_path)?;
-    let org_contents = org_contents.as_str();
-    let file_access_interface = LocalFileAccessInterface {
-        working_directory: Some(parent_directory.to_path_buf()),
-    };
-    let global_settings = GlobalSettings {
-        file_access: &file_access_interface,
-        ..Default::default()
-    };
-    let rust_parsed = parse_with_settings(org_contents, &global_settings)?;
-    println!("{:#?}", rust_parsed);
-    #[cfg(feature = "event_count")]
-    organic::event_count::report(org_contents);
-    Ok(())
-}

src/parse_cli/mod.rs

@@ -0,0 +1,59 @@
+use std::io::Read;
+use std::path::Path;
+
+use crate::parser::parse;
+use crate::parser::parse_with_settings;
+use crate::settings::GlobalSettings;
+use crate::settings::LocalFileAccessInterface;
+
+#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
+pub fn main_body() -> Result<(), Box<dyn std::error::Error>> {
+    let args = std::env::args().skip(1);
+    if args.is_empty() {
+        let org_contents = read_stdin_to_string()?;
+        run_anonymous_parse(org_contents)
+    } else {
+        for arg in args {
+            run_parse_on_file(arg)?
+        }
+        Ok(())
+    }
+}
+
+fn read_stdin_to_string() -> Result<String, Box<dyn std::error::Error>> {
+    let mut stdin_contents = String::new();
+    std::io::stdin()
+        .lock()
+        .read_to_string(&mut stdin_contents)?;
+    Ok(stdin_contents)
+}
+
+fn run_anonymous_parse<P: AsRef<str>>(org_contents: P) -> Result<(), Box<dyn std::error::Error>> {
+    let org_contents = org_contents.as_ref();
+    let rust_parsed = parse(org_contents)?;
+    println!("{:#?}", rust_parsed);
+    #[cfg(feature = "event_count")]
+    crate::event_count::report(org_contents);
+    Ok(())
+}
+
+fn run_parse_on_file<P: AsRef<Path>>(org_path: P) -> Result<(), Box<dyn std::error::Error>> {
+    let org_path = org_path.as_ref();
+    let parent_directory = org_path
+        .parent()
+        .ok_or("Should be contained inside a directory.")?;
+    let org_contents = std::fs::read_to_string(org_path)?;
+    let org_contents = org_contents.as_str();
+    let file_access_interface = LocalFileAccessInterface {
+        working_directory: Some(parent_directory.to_path_buf()),
+    };
+    let global_settings = GlobalSettings {
+        file_access: &file_access_interface,
+        ..Default::default()
+    };
+    let rust_parsed = parse_with_settings(org_contents, &global_settings)?;
+    println!("{:#?}", rust_parsed);
+    #[cfg(feature = "event_count")]
+    crate::event_count::report(org_contents);
+    Ok(())
+}

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),
         },
     ))
 }

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, babel_call_value) = babel_call_value(remaining)?;
-    let (remaining, _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);
 
@@ -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)?;
+    alt((
-    let (remaining, inside_header) = opt(inside_header)(remaining)?;
+        babel_call_value_without_headers,
-    let (remaining, arguments) = opt(arguments)(remaining)?;
+        babel_call_value_with_headers,
-    let (remaining, end_header) = opt(end_header)(remaining)?;
+    ))(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(alt((
-                peek(recognize(one_of("[("))),
+                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(())
-    }
-}

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);
@@ -73,14 +74,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(
                 input.get_until(remaining).into(),
-                input.get_until(lead_in_remaining).into(),
+                body,
+                if !body.is_empty() { Some(body) } else { None },
+                post_blank.map(Into::<&str>::into),
             ),
         ))
     }
@@ -119,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);
@@ -129,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(
                 input.get_until(remaining).into(),
-                input.get_until(lead_in_remaining).into(),
+                body,
+                if !body.is_empty() { Some(body) } else { None },
+                post_blank.map(Into::<&str>::into),
             ),
         ))
     }

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),
         },
     ))
 }

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),
         },
     ))
 }
@@ -81,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)

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),
         },
     ))
 }

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),
         },
     ))
 }

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;
@@ -181,8 +182,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 +195,11 @@ fn _document<'b, 'g, 'r, 's>(
             path: None,
             zeroth_section,
             children,
+            contents: if contents.len() > 0 {
+                Into::<&str>::into(contents)
+            } else {
+                Into::<&str>::into(remaining.take(0))
+            },
         },
     ))
 }

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;
@@ -12,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;
@@ -21,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;
@@ -30,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",
@@ -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,34 @@ 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);
+
+    if let Ok((remaining, (_not_exit, empty_para))) =
+        tuple((not(exit_matcher), bind_context!(empty_paragraph, context)))(input)
+    {
+        return Ok((remaining, vec![Element::Paragraph(empty_para)]));
+    }
+
+    let (remaining, (children, _exit_contents)) = many_till(element_matcher, exit_matcher)(input)?;
+
+    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)

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((
+    let contents_begin = remaining;
-        blank_line,
+    let blank_line_context = ContextElement::ExitMatcherNode(ExitMatcherNode {
-        many0(preceded(not(exit_matcher), blank_line)),
+        class: ExitClass::Alpha,
-    ))))(remaining)?;
+        exit_matcher: &leading_blank_lines_end,
-    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 = 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),
         },
     ))
 }

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),
         },
     ))
 }

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),
         },
     ))
 }

src/parser/fixed_width_area.rs

@@ -2,12 +2,15 @@ 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;
@@ -35,28 +38,25 @@ 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, first_line) = fixed_width_area_line(remaining)?;
-    let (remaining, mut remaining_lines) =
+    let (remaining, remaining_lines) = many0(preceded(
-        many0(preceded(not(exit_matcher), fixed_width_area_line_matcher))(remaining)?;
+        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, _trailing_ws) =
+    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);
-    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)])
-    }
     Ok((
         remaining,
         FixedWidthArea {
@@ -66,25 +66,24 @@ where
                 affiliated_keywords,
             ),
             value,
+            post_blank: if post_blank.len() > 0 {
+                Some(Into::<&str>::into(post_blank))
+            } else {
+                None
+            },
         },
     ))
 }
 
-#[cfg_attr(
+#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-    feature = "tracing",
+fn fixed_width_area_line<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
-    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>> {
     start_of_line(input)?;
     let (remaining, _) = tuple((space0, tag(":")))(input)?;
-    if let Ok((remaining, line_break)) = org_line_ending(remaining) {
+    if let Ok((_remain, _line_break)) = org_line_ending(remaining) {
-        return Ok((remaining, line_break));
+        return Ok((remaining, 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))
 }
 

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;
 
@@ -102,7 +100,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 +110,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 +135,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 +145,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 +198,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 +208,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 +240,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,28 +262,43 @@ 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 (remaining, leading_blank_lines) = opt(consumed(tuple((
+    let contents_begin = remaining;
-        blank_line,
+
-        many0(preceded(not(exit_matcher), blank_line)),
+    let blank_line_context = ContextElement::ExitMatcherNode(ExitMatcherNode {
-    ))))(remaining)?;
+        class: ExitClass::Alpha,
-    let leading_blank_lines =
+        exit_matcher: &leading_blank_lines_end,
-        leading_blank_lines.map(|(source, (first_line, _remaining_lines))| {
-            Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()))
     });
+    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) = 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"))]
@@ -307,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))
+)]
+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>> {
+    recognize(not(blank_line))(input)
+}

src/parser/headline.rs

@@ -66,6 +66,8 @@ 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, _) = 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)?;
@@ -82,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
@@ -91,6 +94,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 +116,16 @@ fn _heading<'b, 'g, 'r, 's>(
             scheduled,
             deadline,
             closed,
+            contents: if contents.len() > 0 {
+                Some(Into::<&str>::into(contents))
+            } else {
+                None
+            },
+            post_blank: if has_children {
+                None
+            } else {
+                Some(Into::<&str>::into(maybe_post_blank))
+            },
         },
     ))
 }

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),
         },
     ))
 }

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),
         },
     ))
 }

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),
         },
     ))
 }

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),
         },
     ))
 }

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),
         },
     ))
 }

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) {
+    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, (children, _exit_contents)) =
+                let (remaining, (contents, (children, _exit_contents))) =
-                many_till(object_matcher, exit_matcher)(remaining)?;
+                    consumed(many_till(object_matcher, exit_matcher))(remaining)?;
-            (remaining, children)
+                (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),
         },
     ))
 }

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),
         },
     ))
 }

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(
+                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(
+                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"));
+    }
 }

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),
         },
     ))
 }

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;
@@ -152,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:
@@ -195,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((
@@ -208,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),
         },
     ))
 }
@@ -265,7 +270,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 +296,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 +312,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 +340,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),
             },
         ),
     ));

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),
         },
     ))
 }

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 (remaining, (contents, children)) =
-    let node_property_matcher = parser_with_context!(node_property)(&parser_context);
+        consumed(parser_with_context!(children)(&parser_context))(remaining)?;
-    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, _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,31 @@ pub(crate) fn property_drawer<'b, 'g, 'r, 's>(
         PropertyDrawer {
             source: source.into(),
             children,
+            contents: if contents.len() > 0 {
+                Some(contents.into())
+            } else {
+                None
+            },
+            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))

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
+                    },
                 },
             ));
         }

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,
         },

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),
         },
     ))
 }

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)) =
+    let (remaining, (contents, (children, _exit_contents))) =
-        many_till(org_mode_table_row_matcher, exit_matcher)(remaining)?;
+        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) =
+    let (remaining, (contents, children)) =
-        many1(parser_with_context!(org_mode_table_cell)(context))(remaining)?;
+        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),
         },
     ))
 }

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),
         },
     ))
 }

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!(active_timestamp(true))(context),
-        parser_with_context!(inactive_timestamp)(context),
+        parser_with_context!(inactive_timestamp(true))(context),
     ))(input)
 }
 
@@ -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),
         },
     ))
 }
@@ -125,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)?;
@@ -159,8 +170,11 @@ fn active_timestamp<'b, 'g, 'r, 's>(
     )))(remaining)?;
     let (remaining, _) = tag(">")(remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) = if allow_post_blank {
-        maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
+        maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?
+    } else {
+        (remaining, None)
+    };
     let source = get_consumed(input, remaining);
 
     Ok((
@@ -175,17 +189,28 @@ 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),
         },
     ))
 }
 
+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)?;
@@ -213,8 +238,11 @@ pub(crate) fn inactive_timestamp<'b, 'g, 'r, 's>(
     )))(remaining)?;
     let (remaining, _) = tag("]")(remaining)?;
 
-    let (remaining, _trailing_whitespace) =
+    let (remaining, post_blank) = if allow_post_blank {
-        maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
+        maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?
+    } else {
+        (remaining, None)
+    };
     let source = get_consumed(input, remaining);
 
     Ok((
@@ -229,6 +257,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),
         },
     ))
 }
@@ -241,12 +270,12 @@ 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, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -264,6 +293,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 +332,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 +348,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),
         },
     ))
 }
@@ -330,12 +361,12 @@ 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, _trailing_whitespace) =
+    let (remaining, post_blank) =
         maybe_consume_object_trailing_whitespace_if_not_exiting(context, remaining)?;
     let source = get_consumed(input, remaining);
 
@@ -354,6 +385,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 +424,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 +440,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),
         },
     ))
 }

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: &'s str,
 }
 
 #[derive(Debug)]
@@ -35,12 +35,13 @@ pub struct Heading<'s> {
     pub scheduled: Option<Timestamp<'s>>,
     pub deadline: Option<Timestamp<'s>>,
     pub closed: Option<Timestamp<'s>>,
+    pub contents: Option<&'s str>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[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>>,
 }
@@ -63,35 +64,11 @@ impl<'s> StandardProperties<'s> for Document<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        let post_blank = self.get_post_blank();
+        Some(self.contents)
-        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 {
-        self.into_iter()
+        0
-            .last()
-            .map(|child| child.get_post_blank())
-            .unwrap_or(0)
     }
 }
 
@@ -101,7 +78,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 {
@@ -119,39 +96,15 @@ impl<'s> StandardProperties<'s> for Heading<'s> {
     }
 
     fn get_contents<'b>(&'b self) -> Option<&'s str> {
-        let first_child = self.children.first();
+        self.contents
-        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 {
-        self.children
+        self.post_blank
-            .last()
+            .map(|text| text.lines().count())
-            .map(|child| child.get_post_blank())
             .unwrap_or(0)
+            .try_into()
+            .expect("Too much post-blank to fit into a PostBlank.")
     }
 }
 

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)]
@@ -35,6 +37,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;
@@ -52,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)]
@@ -59,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)]
@@ -68,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)]
@@ -77,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)]
@@ -95,12 +107,16 @@ 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)]
 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)]
@@ -116,12 +132,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)]
@@ -136,11 +155,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.")
     }
 }
 
@@ -150,11 +173,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.")
     }
 }
 
@@ -164,11 +191,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.")
     }
 }
 
@@ -178,11 +209,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.")
     }
 }
 
@@ -192,11 +227,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.")
     }
 }
 
@@ -206,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.")
     }
 }
 
@@ -238,11 +281,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.")
     }
 }
 
@@ -252,11 +299,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.")
     }
 }
 
@@ -266,11 +317,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
     }
 }
 
@@ -280,11 +331,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.")
     }
 }
 
@@ -294,11 +349,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
     }
 }
 

src/types/lesser_element.rs

@@ -35,12 +35,14 @@ 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)]
 pub struct TableCell<'s> {
     pub source: &'s str,
     pub children: Vec<Object<'s>>,
+    pub contents: &'s str,
 }
 
 #[derive(Debug)]
@@ -49,6 +51,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)]
@@ -56,6 +60,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;
@@ -79,6 +84,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)]
@@ -88,6 +94,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)]
@@ -103,6 +110,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)]
@@ -117,6 +125,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)]
@@ -124,6 +133,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)]
@@ -132,6 +142,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)]
@@ -139,12 +150,14 @@ 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)]
 pub struct HorizontalRule<'s> {
     pub source: &'s str,
     pub affiliated_keywords: AffiliatedKeywords<'s>,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -165,6 +178,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)]
@@ -172,6 +186,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.
@@ -189,11 +204,16 @@ 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 {
+    pub(crate) fn of_text(
+        source: &'s str,
+        body: &'s str,
+        contents: Option<&'s str>,
+        post_blank: Option<&'s str>,
+    ) -> Self {
         Paragraph {
             source,
-            contents: None,   // TODO
+            contents,
-            post_blank: None, // TODO
+            post_blank,
             affiliated_keywords: AffiliatedKeywords::default(),
             children: vec![Object::PlainText(PlainText { source: body })],
         }
@@ -224,11 +244,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
     }
 }
 
@@ -242,7 +262,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.")
     }
 }
 
@@ -252,11 +276,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> {
@@ -265,11 +293,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> {
@@ -278,11 +310,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> {
@@ -291,11 +327,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> {
@@ -304,11 +344,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.")
     }
 }
 
@@ -318,11 +362,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.")
     }
 }
 
@@ -332,11 +380,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.")
     }
 }
 
@@ -346,11 +398,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.")
     }
 }
 
@@ -360,11 +416,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.")
     }
 }
 
@@ -374,11 +434,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.")
     }
 }
 
@@ -406,11 +470,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.")
     }
 }
 
@@ -420,11 +488,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.")
     }
 }
 
@@ -442,13 +514,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();
+        self.value.join("\n")
-        let mut ret = String::with_capacity(final_size);
-        for line in &self.value {
-            ret.push_str(line);
-        }
-
-        ret
     }
 }
 

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>>,
 }
 
@@ -139,6 +140,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)]
@@ -157,6 +159,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)]
@@ -174,6 +177,7 @@ pub struct OrgMacro<'s> {
     pub args: Vec<&'s str>,
 
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -187,12 +191,14 @@ 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)]
 pub struct LatexFragment<'s> {
     pub source: &'s str,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -200,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)]
@@ -218,6 +225,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)]
@@ -236,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)]
@@ -244,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)]
@@ -255,12 +266,14 @@ pub struct LineBreak<'s> {
 pub struct Target<'s> {
     pub source: &'s str,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
 pub struct StatisticsCookie<'s> {
     pub source: &'s str,
     pub value: &'s str,
+    pub post_blank: Option<&'s str>,
 }
 
 #[derive(Debug)]
@@ -293,6 +306,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)]
@@ -318,19 +332,19 @@ pub type HourInner = u8;
 pub type MinuteInner = u8;
 
 #[derive(Debug, Clone)]
-pub struct Year(YearInner);
+pub struct Year(pub YearInner);
 
 #[derive(Debug, Clone)]
-pub struct Month(MonthInner);
+pub struct Month(pub MonthInner);
 
 #[derive(Debug, Clone)]
-pub struct DayOfMonth(DayOfMonthInner);
+pub struct DayOfMonth(pub DayOfMonthInner);
 
 #[derive(Debug, Clone)]
-pub struct Hour(HourInner);
+pub struct Hour(pub HourInner);
 
 #[derive(Debug, Clone)]
-pub struct Minute(MinuteInner);
+pub struct Minute(pub MinuteInner);
 
 impl Year {
     // TODO: Make a real error type instead of a boxed any error.
@@ -666,11 +680,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.")
     }
 }
 
@@ -698,11 +716,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.")
     }
 }
 
@@ -712,11 +734,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.")
     }
 }
 
@@ -726,11 +752,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.")
     }
 }
 
@@ -740,11 +770,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.")
     }
 }
 
@@ -754,11 +788,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.")
     }
 }
 
@@ -768,11 +806,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.")
     }
 }
 
@@ -800,11 +842,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.")
     }
 }
 
@@ -814,11 +860,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
     }
 }
 
@@ -828,11 +874,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.")
     }
 }
 
@@ -842,11 +892,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.")
     }
 }
 
@@ -870,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.")
     }
 }
 
@@ -884,11 +942,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.")
     }
 }
 
@@ -934,11 +996,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.")
     }
 }
 
@@ -948,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
     }
 }
 

src/util/cli.rs

@@ -2,28 +2,53 @@ use std::path::Path;
 
 use tokio::process::Command;
 
-use crate::context::HeadlineLevelFilter;
 use crate::settings::GlobalSettings;
+use crate::settings::HeadlineLevelFilter;
 
-/// Generate elisp to configure org-mode parsing settings
+pub async fn print_versions() -> Result<(), Box<dyn std::error::Error>> {
-///
+    eprintln!("Using emacs version: {}", get_emacs_version().await?.trim());
-/// Currently only org-list-allow-alphabetical is supported.
+    eprintln!(
-fn global_settings_elisp(global_settings: &GlobalSettings) -> String {
+        "Using org-mode version: {}",
-    // This string concatenation is wildly inefficient but its only called in tests 🤷.
+        get_org_mode_version().await?.trim()
-    let mut ret = "".to_owned();
+    );
-    if global_settings.list_allow_alphabetical {
+    Ok(())
-        ret += "(setq org-list-allow-alphabetical t)\n"
 }
-    if global_settings.tab_width != crate::settings::DEFAULT_TAB_WIDTH {
+
-        ret += format!("(setq-default tab-width {})", global_settings.tab_width).as_str();
+pub(crate) async fn get_emacs_version() -> Result<String, Box<dyn std::error::Error>> {
+    let elisp_script = r#"(progn
+     (message "%s" (version))
+)"#;
+    let mut cmd = Command::new("emacs");
+    let cmd = cmd
+        .arg("-q")
+        .arg("--no-site-file")
+        .arg("--no-splash")
+        .arg("--batch")
+        .arg("--eval")
+        .arg(elisp_script);
+
+    let out = cmd.output().await?;
+    out.status.exit_ok()?;
+    Ok(String::from_utf8(out.stderr)?)
 }
-    if global_settings.odd_levels_only != HeadlineLevelFilter::default() {
+
-        ret += match global_settings.odd_levels_only {
+pub(crate) async fn get_org_mode_version() -> Result<String, Box<dyn std::error::Error>> {
-            HeadlineLevelFilter::Odd => "(setq org-odd-levels-only t)\n",
+    let elisp_script = r#"(progn
-            HeadlineLevelFilter::OddEven => "(setq org-odd-levels-only nil)\n",
+     (org-mode)
-        };
+     (message "%s" (org-version nil t nil))
-    }
+)"#;
-    ret
+    let mut cmd = Command::new("emacs");
+    let cmd = cmd
+        .arg("-q")
+        .arg("--no-site-file")
+        .arg("--no-splash")
+        .arg("--batch")
+        .arg("--eval")
+        .arg(elisp_script);
+
+    let out = cmd.output().await?;
+    out.status.exit_ok()?;
+    Ok(String::from_utf8(out.stderr)?)
 }
 
 pub(crate) async fn emacs_parse_anonymous_org_document<'g, 's, C>(
@@ -144,39 +169,23 @@ where
     output
 }
 
-pub async fn get_emacs_version() -> Result<String, Box<dyn std::error::Error>> {
+/// Generate elisp to configure org-mode parsing settings
-    let elisp_script = r#"(progn
+///
-     (message "%s" (version))
+/// Currently only org-list-allow-alphabetical is supported.
-)"#;
+fn global_settings_elisp(global_settings: &GlobalSettings) -> String {
-    let mut cmd = Command::new("emacs");
+    // This string concatenation is wildly inefficient but its only called in tests 🤷.
-    let cmd = cmd
+    let mut ret = "".to_owned();
-        .arg("-q")
+    if global_settings.list_allow_alphabetical {
-        .arg("--no-site-file")
+        ret += "(setq org-list-allow-alphabetical t)\n"
-        .arg("--no-splash")
-        .arg("--batch")
-        .arg("--eval")
-        .arg(elisp_script);
-
-    let out = cmd.output().await?;
-    out.status.exit_ok()?;
-    Ok(String::from_utf8(out.stderr)?)
     }
-
+    if global_settings.tab_width != crate::settings::DEFAULT_TAB_WIDTH {
-pub async fn get_org_mode_version() -> Result<String, Box<dyn std::error::Error>> {
+        ret += format!("(setq-default tab-width {})", global_settings.tab_width).as_str();
-    let elisp_script = r#"(progn
+    }
-     (org-mode)
+    if global_settings.odd_levels_only != HeadlineLevelFilter::default() {
-     (message "%s" (org-version nil t nil))
+        ret += match global_settings.odd_levels_only {
-)"#;
+            HeadlineLevelFilter::Odd => "(setq org-odd-levels-only t)\n",
-    let mut cmd = Command::new("emacs");
+            HeadlineLevelFilter::OddEven => "(setq org-odd-levels-only nil)\n",
-    let cmd = cmd
+        };
-        .arg("-q")
+    }
-        .arg("--no-site-file")
+    ret
-        .arg("--no-splash")
-        .arg("--batch")
-        .arg("--eval")
-        .arg(elisp_script);
-
-    let out = cmd.output().await?;
-    out.status.exit_ok()?;
-    Ok(String::from_utf8(out.stderr)?)
 }

src/util/elisp/mod.rs

@@ -0,0 +1,14 @@
+mod sexp;
+mod util;
+
+pub use sexp::sexp;
+pub(crate) use sexp::unquote;
+#[cfg(feature = "wasm_test")]
+pub(crate) use sexp::TextWithProperties;
+pub use sexp::Token;
+#[cfg(feature = "compare")]
+pub(crate) use util::get_emacs_standard_properties;
+#[cfg(feature = "wasm_test")]
+pub(crate) use util::maybe_token_to_usize;
+#[cfg(feature = "wasm_test")]
+pub(crate) use util::EmacsStandardProperties;

src/util/elisp/sexp.rs

@@ -61,6 +61,7 @@ impl<'s> Token<'s> {
         }?)
     }
 
+    #[cfg(feature = "compare")]
     pub(crate) fn as_text<'p>(
         &'p self,
     ) -> Result<&'p TextWithProperties<'s>, Box<dyn std::error::Error>> {

src/util/elisp/util.rs

@@ -0,0 +1,76 @@
+use super::Token;
+
+pub(crate) fn maybe_token_to_usize(
+    token: Option<&Token<'_>>,
+) -> Result<Option<usize>, Box<dyn std::error::Error>> {
+    Ok(token
+        .map(|token| token.as_atom())
+        .map_or(Ok(None), |r| r.map(Some))?
+        .and_then(|val| {
+            if val == "nil" {
+                None
+            } else {
+                Some(val.parse::<usize>())
+            }
+        })
+        .map_or(Ok(None), |r| r.map(Some))?)
+}
+
+pub(crate) struct EmacsStandardProperties {
+    pub(crate) begin: Option<usize>,
+    #[allow(dead_code)]
+    pub(crate) post_affiliated: Option<usize>,
+    #[allow(dead_code)]
+    pub(crate) contents_begin: Option<usize>,
+    #[allow(dead_code)]
+    pub(crate) contents_end: Option<usize>,
+    pub(crate) end: Option<usize>,
+    #[allow(dead_code)]
+    pub(crate) post_blank: Option<usize>,
+}
+
+#[cfg(feature = "compare")]
+pub(crate) fn get_emacs_standard_properties(
+    emacs: &Token<'_>,
+) -> Result<EmacsStandardProperties, Box<dyn std::error::Error>> {
+    let children = emacs.as_list()?;
+    let attributes_child = children.get(1).ok_or("Should have an attributes child.")?;
+    let attributes_map = attributes_child.as_map()?;
+    let standard_properties = attributes_map.get(":standard-properties");
+    Ok(if standard_properties.is_some() {
+        let mut std_props = standard_properties
+            .expect("if statement proves its Some")
+            .as_vector()?
+            .iter();
+        let begin = maybe_token_to_usize(std_props.next())?;
+        let post_affiliated = maybe_token_to_usize(std_props.next())?;
+        let contents_begin = maybe_token_to_usize(std_props.next())?;
+        let contents_end = maybe_token_to_usize(std_props.next())?;
+        let end = maybe_token_to_usize(std_props.next())?;
+        let post_blank = maybe_token_to_usize(std_props.next())?;
+        EmacsStandardProperties {
+            begin,
+            post_affiliated,
+            contents_begin,
+            contents_end,
+            end,
+            post_blank,
+        }
+    } else {
+        let begin = maybe_token_to_usize(attributes_map.get(":begin").copied())?;
+        let end = maybe_token_to_usize(attributes_map.get(":end").copied())?;
+        let contents_begin = maybe_token_to_usize(attributes_map.get(":contents-begin").copied())?;
+        let contents_end = maybe_token_to_usize(attributes_map.get(":contents-end").copied())?;
+        let post_blank = maybe_token_to_usize(attributes_map.get(":post-blank").copied())?;
+        let post_affiliated =
+            maybe_token_to_usize(attributes_map.get(":post-affiliated").copied())?;
+        EmacsStandardProperties {
+            begin,
+            post_affiliated,
+            contents_begin,
+            contents_end,
+            end,
+            post_blank,
+        }
+    })
+}

src/util/mod.rs

@@ -0,0 +1,8 @@
+#[cfg(any(feature = "compare", feature = "wasm_test"))]
+pub mod cli;
+#[cfg(any(feature = "compare", feature = "wasm_test"))]
+pub mod elisp;
+#[cfg(any(feature = "compare", feature = "wasm", feature = "wasm_test"))]
+pub mod elisp_fact;
+#[cfg(any(feature = "compare", feature = "wasm_test"))]
+pub mod terminal;

src/util/terminal.rs

@@ -0,0 +1,42 @@
+use std::borrow::Cow;
+
+fn should_use_color() -> bool {
+    !std::env::var("NO_COLOR").is_ok_and(|val| !val.is_empty())
+}
+
+pub(crate) fn foreground_color(red: u8, green: u8, blue: u8) -> Cow<'static, str> {
+    if should_use_color() {
+        format!(
+            "\x1b[38;2;{red};{green};{blue}m",
+            red = red,
+            green = green,
+            blue = blue
+        )
+        .into()
+    } else {
+        Cow::from("")
+    }
+}
+
+#[allow(dead_code)]
+pub(crate) fn background_color(red: u8, green: u8, blue: u8) -> Cow<'static, str> {
+    if should_use_color() {
+        format!(
+            "\x1b[48;2;{red};{green};{blue}m",
+            red = red,
+            green = green,
+            blue = blue
+        )
+        .into()
+    } else {
+        Cow::from("")
+    }
+}
+
+pub(crate) fn reset_color() -> &'static str {
+    if should_use_color() {
+        "\x1b[0m"
+    } else {
+        ""
+    }
+}

src/wasm/additional_property.rs

@@ -0,0 +1,95 @@
+use std::collections::HashMap;
+
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::WasmAstNode;
+use crate::types::AffiliatedKeywordValue;
+use crate::types::AffiliatedKeywords;
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum AdditionalPropertyValue {
+    SingleString(String),
+    ListOfStrings(Vec<String>),
+    OptionalPair {
+        optval: Option<String>,
+        val: String,
+    },
+    ObjectTree {
+        #[serde(rename = "object-tree")]
+        object_tree: Vec<(Option<Vec<WasmAstNode>>, Vec<WasmAstNode>)>,
+    },
+}
+
+#[derive(Debug, Serialize, Deserialize, Default)]
+pub struct AdditionalProperties {
+    #[serde(flatten)]
+    pub(crate) properties: HashMap<String, AdditionalPropertyValue>,
+}
+
+to_wasm!(
+    AdditionalProperties,
+    AffiliatedKeywords<'s>,
+    original,
+    wasm_context,
+    {
+        let mut additional_properties = AdditionalProperties::default();
+        for (name, val) in original.keywords.iter() {
+            let converted_val = match val {
+                AffiliatedKeywordValue::SingleString(val) => {
+                    AdditionalPropertyValue::SingleString((*val).to_owned())
+                }
+                AffiliatedKeywordValue::ListOfStrings(val) => {
+                    AdditionalPropertyValue::ListOfStrings(
+                        val.iter().map(|s| (*s).to_owned()).collect(),
+                    )
+                }
+                AffiliatedKeywordValue::OptionalPair { optval, val } => {
+                    AdditionalPropertyValue::OptionalPair {
+                        optval: optval.map(|s| (*s).to_owned()),
+                        val: (*val).to_owned(),
+                    }
+                }
+                AffiliatedKeywordValue::ObjectTree(val) => {
+                    let mut ret = Vec::with_capacity(val.len());
+
+                    for (optval, value) in val {
+                        let converted_optval = if let Some(optval) = optval {
+                            Some(
+                                optval
+                                    .iter()
+                                    .map(|child| {
+                                        child
+                                            .to_wasm(wasm_context.clone())
+                                            .map(Into::<WasmAstNode>::into)
+                                    })
+                                    .collect::<Result<Vec<_>, _>>()?,
+                            )
+                        } else {
+                            None
+                        };
+                        let converted_value = value
+                            .iter()
+                            .map(|child| {
+                                child
+                                    .to_wasm(wasm_context.clone())
+                                    .map(Into::<WasmAstNode>::into)
+                            })
+                            .collect::<Result<Vec<_>, _>>()?;
+
+                        ret.push((converted_optval, converted_value));
+                    }
+
+                    AdditionalPropertyValue::ObjectTree { object_tree: ret }
+                }
+            };
+            additional_properties
+                .properties
+                .insert(name.clone(), converted_val);
+        }
+        Ok(additional_properties)
+    }
+);

src/wasm/angle_link.rs

@@ -0,0 +1,54 @@
+use std::borrow::Cow;
+
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::AngleLink;
+use crate::types::LinkType;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(tag = "format")]
+#[serde(rename = "angle")]
+pub struct WasmAngleLink {
+    #[serde(rename = "type")]
+    pub(crate) link_type: String,
+    pub(crate) path: String,
+    #[serde(rename = "raw-link")]
+    pub(crate) raw_link: String,
+    pub(crate) application: Option<String>,
+    #[serde(rename = "search-option")]
+    pub(crate) search_option: Option<String>,
+}
+
+to_wasm!(
+    WasmAngleLink,
+    AngleLink<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::AngleLink(original) },
+    { "link".into() },
+    {
+        Ok((
+            Vec::new(),
+            WasmAngleLink {
+                link_type: match &original.link_type {
+                    LinkType::File => "file".to_owned(),
+                    LinkType::Protocol(protocol) => protocol.clone().into_owned(),
+                    LinkType::Id => "id".to_owned(),
+                    LinkType::CustomId => "custom-id".to_owned(),
+                    LinkType::CodeRef => "coderef".to_owned(),
+                    LinkType::Fuzzy => "fuzzy".to_owned(),
+                },
+                path: original.get_path().into_owned(),
+                raw_link: original.raw_link.to_owned(),
+                application: original.application.map(|c| c.to_owned()),
+                search_option: original.get_search_option().map(Cow::into_owned),
+            },
+        ))
+    }
+);

src/wasm/ast_node.rs

@@ -0,0 +1,142 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::angle_link::WasmAngleLink;
+use super::babel_call::WasmBabelCall;
+use super::bold::WasmBold;
+use super::center_block::WasmCenterBlock;
+use super::citation::WasmCitation;
+use super::citation_reference::WasmCitationReference;
+use super::clock::WasmClock;
+use super::code::WasmCode;
+use super::comment::WasmComment;
+use super::comment_block::WasmCommentBlock;
+use super::diary_sexp::WasmDiarySexp;
+use super::document::WasmDocument;
+use super::drawer::WasmDrawer;
+use super::dynamic_block::WasmDynamicBlock;
+use super::entity::WasmEntity;
+use super::example_block::WasmExampleBlock;
+use super::export_block::WasmExportBlock;
+use super::export_snippet::WasmExportSnippet;
+use super::fixed_width_area::WasmFixedWidthArea;
+use super::footnote_definition::WasmFootnoteDefinition;
+use super::footnote_reference::WasmFootnoteReference;
+use super::headline::WasmHeadline;
+use super::horizontal_rule::WasmHorizontalRule;
+use super::inline_babel_call::WasmInlineBabelCall;
+use super::inline_source_block::WasmInlineSourceBlock;
+use super::italic::WasmItalic;
+use super::keyword::WasmKeyword;
+use super::latex_environment::WasmLatexEnvironment;
+use super::latex_fragment::WasmLatexFragment;
+use super::line_break::WasmLineBreak;
+use super::node_property::WasmNodeProperty;
+use super::org_macro::WasmOrgMacro;
+use super::paragraph::WasmParagraph;
+use super::plain_link::WasmPlainLink;
+use super::plain_list::WasmPlainList;
+use super::plain_list_item::WasmPlainListItem;
+use super::plain_text::WasmPlainText;
+use super::planning::WasmPlanning;
+use super::property_drawer::WasmPropertyDrawer;
+use super::quote_block::WasmQuoteBlock;
+use super::radio_link::WasmRadioLink;
+use super::radio_target::WasmRadioTarget;
+use super::regular_link::WasmRegularLink;
+use super::section::WasmSection;
+use super::special_block::WasmSpecialBlock;
+use super::src_block::WasmSrcBlock;
+use super::statistics_cookie::WasmStatisticsCookie;
+use super::strike_through::WasmStrikeThrough;
+use super::subscript::WasmSubscript;
+use super::superscript::WasmSuperscript;
+use super::table::WasmTable;
+use super::table_cell::WasmTableCell;
+use super::table_row::WasmTableRow;
+use super::target::WasmTarget;
+use super::timestamp::WasmTimestamp;
+use super::underline::WasmUnderline;
+use super::verbatim::WasmVerbatim;
+use super::verse_block::WasmVerseBlock;
+use super::WasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmAstNodeWrapper<I> {
+    #[serde(rename = "ast-node")]
+    pub(crate) ast_node: String,
+    #[serde(rename = "standard-properties")]
+    pub(crate) standard_properties: WasmStandardProperties,
+    #[serde(rename = "children")]
+    pub(crate) children: Vec<WasmAstNode>,
+    #[serde(rename = "properties")]
+    pub(crate) properties: I,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum WasmAstNode {
+    // Document Nodes
+    Document(WasmAstNodeWrapper<WasmDocument>),
+    Headline(WasmAstNodeWrapper<WasmHeadline>),
+    Section(WasmAstNodeWrapper<WasmSection>),
+    // Elements
+    Paragraph(WasmAstNodeWrapper<WasmParagraph>),
+    PlainList(WasmAstNodeWrapper<WasmPlainList>),
+    PlainListItem(WasmAstNodeWrapper<WasmPlainListItem>),
+    CenterBlock(WasmAstNodeWrapper<WasmCenterBlock>),
+    QuoteBlock(WasmAstNodeWrapper<WasmQuoteBlock>),
+    SpecialBlock(WasmAstNodeWrapper<WasmSpecialBlock>),
+    DynamicBlock(WasmAstNodeWrapper<WasmDynamicBlock>),
+    FootnoteDefinition(WasmAstNodeWrapper<WasmFootnoteDefinition>),
+    Comment(WasmAstNodeWrapper<WasmComment>),
+    Drawer(WasmAstNodeWrapper<WasmDrawer>),
+    PropertyDrawer(WasmAstNodeWrapper<WasmPropertyDrawer>),
+    NodeProperty(WasmAstNodeWrapper<WasmNodeProperty>),
+    Table(WasmAstNodeWrapper<WasmTable>),
+    TableRow(WasmAstNodeWrapper<WasmTableRow>),
+    VerseBlock(WasmAstNodeWrapper<WasmVerseBlock>),
+    CommentBlock(WasmAstNodeWrapper<WasmCommentBlock>),
+    ExampleBlock(WasmAstNodeWrapper<WasmExampleBlock>),
+    ExportBlock(WasmAstNodeWrapper<WasmExportBlock>),
+    SrcBlock(WasmAstNodeWrapper<WasmSrcBlock>),
+    Clock(WasmAstNodeWrapper<WasmClock>),
+    DiarySexp(WasmAstNodeWrapper<WasmDiarySexp>),
+    Planning(WasmAstNodeWrapper<WasmPlanning>),
+    FixedWidthArea(WasmAstNodeWrapper<WasmFixedWidthArea>),
+    HorizontalRule(WasmAstNodeWrapper<WasmHorizontalRule>),
+    Keyword(WasmAstNodeWrapper<WasmKeyword>),
+    BabelCall(WasmAstNodeWrapper<WasmBabelCall>),
+    LatexEnvironment(WasmAstNodeWrapper<WasmLatexEnvironment>),
+    // Objects
+    Bold(WasmAstNodeWrapper<WasmBold>),
+    Italic(WasmAstNodeWrapper<WasmItalic>),
+    Underline(WasmAstNodeWrapper<WasmUnderline>),
+    StrikeThrough(WasmAstNodeWrapper<WasmStrikeThrough>),
+    Code(WasmAstNodeWrapper<WasmCode>),
+    Verbatim(WasmAstNodeWrapper<WasmVerbatim>),
+    PlainText(WasmAstNodeWrapper<WasmPlainText>),
+    RegularLink(WasmAstNodeWrapper<WasmRegularLink>),
+    RadioLink(WasmAstNodeWrapper<WasmRadioLink>),
+    RadioTarget(WasmAstNodeWrapper<WasmRadioTarget>),
+    PlainLink(WasmAstNodeWrapper<WasmPlainLink>),
+    AngleLink(WasmAstNodeWrapper<WasmAngleLink>),
+    OrgMacro(WasmAstNodeWrapper<WasmOrgMacro>),
+    Entity(WasmAstNodeWrapper<WasmEntity>),
+    LatexFragment(WasmAstNodeWrapper<WasmLatexFragment>),
+    ExportSnippet(WasmAstNodeWrapper<WasmExportSnippet>),
+    FootnoteReference(WasmAstNodeWrapper<WasmFootnoteReference>),
+    Citation(WasmAstNodeWrapper<WasmCitation>),
+    CitationReference(WasmAstNodeWrapper<WasmCitationReference>),
+    InlineBabelCall(WasmAstNodeWrapper<WasmInlineBabelCall>),
+    InlineSourceBlock(WasmAstNodeWrapper<WasmInlineSourceBlock>),
+    LineBreak(WasmAstNodeWrapper<WasmLineBreak>),
+    Target(WasmAstNodeWrapper<WasmTarget>),
+    StatisticsCookie(WasmAstNodeWrapper<WasmStatisticsCookie>),
+    Subscript(WasmAstNodeWrapper<WasmSubscript>),
+    Superscript(WasmAstNodeWrapper<WasmSuperscript>),
+    TableCell(WasmAstNodeWrapper<WasmTableCell>),
+    Timestamp(WasmAstNodeWrapper<WasmTimestamp>),
+}
+
+impl WasmAstNode {}

src/wasm/babel_call.rs

@@ -0,0 +1,50 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::BabelCall;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmBabelCall {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    pub(crate) call: Option<String>,
+    #[serde(rename = "inside-header")]
+    pub(crate) inside_header: Option<String>,
+    pub(crate) arguments: Option<String>,
+    #[serde(rename = "end-header")]
+    pub(crate) end_header: Option<String>,
+    pub(crate) value: String,
+}
+
+to_wasm!(
+    WasmBabelCall,
+    BabelCall<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::BabelCall(original) },
+    { "babel-call".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        Ok((
+            Vec::new(),
+            WasmBabelCall {
+                additional_properties,
+                call: original.call.map(|s| s.to_owned()),
+                inside_header: original.inside_header.map(|s| s.to_owned()),
+                arguments: original.arguments.map(|s| s.to_owned()),
+                end_header: original.end_header.map(|s| s.to_owned()),
+                value: original.value.to_owned(),
+            },
+        ))
+    }
+);

src/wasm/bold.rs

@@ -0,0 +1,34 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::Bold;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmBold {}
+
+to_wasm!(
+    WasmBold,
+    Bold<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Bold(original) },
+    { "bold".into() },
+    {
+        let children = original
+            .children
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((children, WasmBold {}))
+    }
+);

src/wasm/center_block.rs

@@ -0,0 +1,48 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::CenterBlock;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmCenterBlock {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+}
+
+to_wasm!(
+    WasmCenterBlock,
+    CenterBlock<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::CenterBlock(original) },
+    { "center-block".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        let children = original
+            .children
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            children,
+            WasmCenterBlock {
+                additional_properties,
+            },
+        ))
+    }
+);

src/wasm/citation.rs

@@ -0,0 +1,71 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::Citation;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmCitation {
+    pub(crate) style: Option<String>,
+    pub(crate) prefix: Option<Vec<WasmAstNode>>,
+    pub(crate) suffix: Option<Vec<WasmAstNode>>,
+}
+
+to_wasm!(
+    WasmCitation,
+    Citation<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Citation(original) },
+    { "citation".into() },
+    {
+        let children = original
+            .children
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+        let prefix = original
+            .prefix
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+        let suffix = original
+            .suffix
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            children,
+            WasmCitation {
+                style: original.style.map(|s| s.to_owned()),
+                prefix: if prefix.is_empty() {
+                    None
+                } else {
+                    Some(prefix)
+                },
+                suffix: if suffix.is_empty() {
+                    None
+                } else {
+                    Some(suffix)
+                },
+            },
+        ))
+    }
+);

src/wasm/citation_reference.rs

@@ -0,0 +1,62 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::CitationReference;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmCitationReference {
+    pub(crate) key: String,
+    pub(crate) prefix: Option<Vec<WasmAstNode>>,
+    pub(crate) suffix: Option<Vec<WasmAstNode>>,
+}
+
+to_wasm!(
+    WasmCitationReference,
+    CitationReference<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::CitationReference(original) },
+    { "citation-reference".into() },
+    {
+        let prefix = original
+            .prefix
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+        let suffix = original
+            .suffix
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            Vec::new(),
+            WasmCitationReference {
+                key: original.key.to_owned(),
+                prefix: if prefix.is_empty() {
+                    None
+                } else {
+                    Some(prefix)
+                },
+                suffix: if suffix.is_empty() {
+                    None
+                } else {
+                    Some(suffix)
+                },
+            },
+        ))
+    }
+);

src/wasm/clock.rs

@@ -0,0 +1,43 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::Clock;
+use crate::types::ClockStatus;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmClock {
+    #[serde(rename = "value")]
+    pub(crate) timestamp: Box<WasmAstNode>,
+    pub(crate) duration: Option<String>,
+    pub(crate) status: String,
+}
+
+to_wasm!(
+    WasmClock,
+    Clock<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Clock(original) },
+    { "clock".into() },
+    {
+        Ok((
+            Vec::new(),
+            WasmClock {
+                timestamp: Box::new(Into::<WasmAstNode>::into(
+                    original.timestamp.to_wasm(wasm_context.clone())?,
+                )),
+                duration: original.duration.map(|s| s.to_owned()),
+                status: match original.status {
+                    ClockStatus::Running => "running",
+                    ClockStatus::Closed => "closed",
+                }
+                .to_owned(),
+            },
+        ))
+    }
+);

src/wasm/code.rs

@@ -0,0 +1,31 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::Code;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmCode {
+    pub(crate) value: String,
+}
+
+to_wasm!(
+    WasmCode,
+    Code<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Code(original) },
+    { "code".into() },
+    {
+        Ok((
+            Vec::new(),
+            WasmCode {
+                value: original.contents.to_owned(),
+            },
+        ))
+    }
+);

src/wasm/comment.rs

@@ -0,0 +1,31 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::Comment;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmComment {
+    pub(crate) value: String,
+}
+
+to_wasm!(
+    WasmComment,
+    Comment<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Comment(original) },
+    { "comment".into() },
+    {
+        Ok((
+            Vec::new(),
+            WasmComment {
+                value: original.get_value(),
+            },
+        ))
+    }
+);

src/wasm/comment_block.rs

@@ -0,0 +1,40 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::CommentBlock;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmCommentBlock {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    pub(crate) value: String,
+}
+
+to_wasm!(
+    WasmCommentBlock,
+    CommentBlock<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::CommentBlock(original) },
+    { "comment-block".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        Ok((
+            Vec::new(),
+            WasmCommentBlock {
+                additional_properties,
+                value: original.contents.to_owned(),
+            },
+        ))
+    }
+);

src/wasm/diary_sexp.rs

@@ -0,0 +1,40 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::DiarySexp;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmDiarySexp {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    pub(crate) value: String,
+}
+
+to_wasm!(
+    WasmDiarySexp,
+    DiarySexp<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::DiarySexp(original) },
+    { "diary-sexp".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        Ok((
+            Vec::new(),
+            WasmDiarySexp {
+                additional_properties,
+                value: original.value.to_owned(),
+            },
+        ))
+    }
+);

src/wasm/document.rs

@@ -0,0 +1,69 @@
+use std::path::PathBuf;
+
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::additional_property::AdditionalProperties;
+use super::additional_property::AdditionalPropertyValue;
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::Document;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmDocument {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    #[serde(rename = "CATEGORY")]
+    pub(crate) category: Option<String>,
+    pub(crate) path: Option<PathBuf>,
+}
+
+to_wasm!(
+    WasmDocument,
+    Document<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Document(original) },
+    { "org-data".into() },
+    {
+        let category = original.category.as_deref();
+        let path = original.path.clone();
+
+        let mut additional_properties = AdditionalProperties::default();
+        for (name, val) in original.get_additional_properties().map(|node_property| {
+            (
+                node_property.property_name.to_uppercase(),
+                AdditionalPropertyValue::SingleString(node_property.value.unwrap_or("").to_owned()),
+            )
+        }) {
+            additional_properties.properties.insert(name, val);
+        }
+
+        let children = original
+            .zeroth_section
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .chain(original.children.iter().map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            }))
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            children,
+            WasmDocument {
+                additional_properties,
+                category: category.map(str::to_owned),
+                path,
+            },
+        ))
+    }
+);

src/wasm/drawer.rs

@@ -0,0 +1,51 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::Drawer;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmDrawer {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    #[serde(rename = "drawer-name")]
+    pub(crate) drawer_name: String,
+}
+
+to_wasm!(
+    WasmDrawer,
+    Drawer<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Drawer(original) },
+    { "drawer".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        let children = original
+            .children
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            children,
+            WasmDrawer {
+                additional_properties,
+                drawer_name: original.drawer_name.to_owned(),
+            },
+        ))
+    }
+);

src/wasm/dynamic_block.rs

@@ -0,0 +1,53 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::DynamicBlock;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmDynamicBlock {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    #[serde(rename = "block-name")]
+    pub(crate) block_name: String,
+    pub(crate) arguments: Option<String>,
+}
+
+to_wasm!(
+    WasmDynamicBlock,
+    DynamicBlock<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::DynamicBlock(original) },
+    { "dynamic-block".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        let children = original
+            .children
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            children,
+            WasmDynamicBlock {
+                additional_properties,
+                block_name: original.block_name.to_owned(),
+                arguments: original.parameters.map(|s| s.to_owned()),
+            },
+        ))
+    }
+);

src/wasm/entity.rs

@@ -0,0 +1,49 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::headline::Noop;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::Entity;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmEntity {
+    pub(crate) name: String,
+    pub(crate) latex: String,
+    #[serde(rename = "latex-math-p")]
+    pub(crate) latex_math_mode: bool,
+    pub(crate) html: String,
+    pub(crate) ascii: String,
+    pub(crate) latin1: Noop,
+    #[serde(rename = "utf-8")]
+    pub(crate) utf8: String,
+    #[serde(rename = "use-brackets-p")]
+    pub(crate) use_brackets: bool,
+}
+
+to_wasm!(
+    WasmEntity,
+    Entity<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Entity(original) },
+    { "entity".into() },
+    {
+        Ok((
+            Vec::new(),
+            WasmEntity {
+                name: original.name.to_owned(),
+                latex: original.latex.to_owned(),
+                latex_math_mode: original.latex_math_mode,
+                html: original.html.to_owned(),
+                ascii: original.ascii.to_owned(),
+                latin1: Noop {},
+                utf8: original.utf8.to_owned(),
+                use_brackets: original.use_brackets,
+            },
+        ))
+    }
+);

src/wasm/example_block.rs

@@ -0,0 +1,75 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::src_block::WasmNumberLines;
+use super::src_block::WasmNumberLinesWrapper;
+use super::src_block::WasmRetainLabels;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::CharOffsetInLine;
+use crate::types::ExampleBlock;
+use crate::types::GetAffiliatedKeywords;
+use crate::types::RetainLabels;
+use crate::types::SwitchNumberLines;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmExampleBlock {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    pub(crate) value: String,
+    pub(crate) switches: Option<String>,
+    #[serde(rename = "number-lines")]
+    pub(crate) number_lines: Option<WasmNumberLinesWrapper>,
+    #[serde(rename = "preserve-indent")]
+    pub(crate) preserve_indent: Option<CharOffsetInLine>,
+    #[serde(rename = "retain-labels")]
+    pub(crate) retain_labels: WasmRetainLabels,
+    #[serde(rename = "use-labels")]
+    pub(crate) use_labels: bool,
+    #[serde(rename = "label-fmt")]
+    pub(crate) label_format: Option<String>,
+}
+
+to_wasm!(
+    WasmExampleBlock,
+    ExampleBlock<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::ExampleBlock(original) },
+    { "example-block".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        Ok((
+            Vec::new(),
+            WasmExampleBlock {
+                additional_properties,
+                value: original.get_value().into_owned(),
+                switches: original.switches.map(|s| s.to_owned()),
+                number_lines: match original.number_lines {
+                    None => None,
+                    Some(SwitchNumberLines::New(n)) => Some(WasmNumberLinesWrapper {
+                        inner: WasmNumberLines::New(n),
+                    }),
+                    Some(SwitchNumberLines::Continued(n)) => Some(WasmNumberLinesWrapper {
+                        inner: WasmNumberLines::Continued(n),
+                    }),
+                },
+                preserve_indent: original.preserve_indent,
+                retain_labels: match original.retain_labels {
+                    RetainLabels::No => WasmRetainLabels::YesNo(false),
+                    RetainLabels::Yes => WasmRetainLabels::YesNo(true),
+                    RetainLabels::Keep(n) => WasmRetainLabels::Keep(n),
+                },
+                use_labels: original.use_labels,
+                label_format: original.label_format.map(|s| s.to_owned()),
+            },
+        ))
+    }
+);

src/wasm/export_block.rs

@@ -0,0 +1,43 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::ExportBlock;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmExportBlock {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    #[serde(rename = "type")]
+    pub(crate) export_type: Option<String>,
+    pub(crate) value: String,
+}
+
+to_wasm!(
+    WasmExportBlock,
+    ExportBlock<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::ExportBlock(original) },
+    { "export-block".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        Ok((
+            Vec::new(),
+            WasmExportBlock {
+                additional_properties,
+                export_type: original.get_export_type(),
+                value: original.get_value().into_owned(),
+            },
+        ))
+    }
+);

src/wasm/export_snippet.rs

@@ -0,0 +1,34 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::ExportSnippet;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmExportSnippet {
+    #[serde(rename = "back-end")]
+    pub(crate) backend: String,
+    pub(crate) value: Option<String>,
+}
+
+to_wasm!(
+    WasmExportSnippet,
+    ExportSnippet<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::ExportSnippet(original) },
+    { "export-snippet".into() },
+    {
+        Ok((
+            Vec::new(),
+            WasmExportSnippet {
+                backend: original.backend.to_owned(),
+                value: original.contents.map(|s| s.to_owned()),
+            },
+        ))
+    }
+);

src/wasm/fixed_width_area.rs

@@ -0,0 +1,42 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::FixedWidthArea;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmFixedWidthArea {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    pub(crate) value: String,
+}
+
+to_wasm!(
+    WasmFixedWidthArea,
+    FixedWidthArea<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::FixedWidthArea(original) },
+    { "fixed-width".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        let value = original.get_value();
+
+        Ok((
+            Vec::new(),
+            WasmFixedWidthArea {
+                additional_properties,
+                value,
+            },
+        ))
+    }
+);

src/wasm/footnote_definition.rs

@@ -0,0 +1,54 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::headline::Noop;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use crate::types::FootnoteDefinition;
+use crate::types::GetAffiliatedKeywords;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmFootnoteDefinition {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    pub(crate) label: String,
+    #[serde(rename = "pre-blank")]
+    pub(crate) pre_blank: Noop,
+}
+
+to_wasm!(
+    WasmFootnoteDefinition,
+    FootnoteDefinition<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::FootnoteDefinition(original) },
+    { "footnote-definition".into() },
+    {
+        let additional_properties = original
+            .get_affiliated_keywords()
+            .to_wasm(wasm_context.clone())?;
+
+        let children = original
+            .children
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            children,
+            WasmFootnoteDefinition {
+                additional_properties,
+                label: original.label.to_owned(),
+                pre_blank: Noop {},
+            },
+        ))
+    }
+);

src/wasm/footnote_reference.rs

@@ -0,0 +1,49 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use crate::types::FootnoteReference;
+use crate::types::FootnoteReferenceType;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmFootnoteReference {
+    pub(crate) label: Option<String>,
+    #[serde(rename = "type")]
+    pub(crate) footnote_reference_type: String,
+}
+
+to_wasm!(
+    WasmFootnoteReference,
+    FootnoteReference<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::FootnoteReference(original) },
+    { "footnote-reference".into() },
+    {
+        let children = original
+            .definition
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            children,
+            WasmFootnoteReference {
+                label: original.label.map(|s| s.to_owned()),
+                footnote_reference_type: match original.get_type() {
+                    FootnoteReferenceType::Standard => "standard",
+                    FootnoteReferenceType::Inline => "inline",
+                }
+                .to_owned(),
+            },
+        ))
+    }
+);

src/wasm/headline.rs

@@ -0,0 +1,140 @@
+use serde::Deserialize;
+use serde::Serialize;
+
+use super::ast_node::WasmAstNode;
+use super::macros::to_wasm;
+use super::to_wasm::ToWasm;
+use super::AdditionalProperties;
+use super::AdditionalPropertyValue;
+use crate::types::Heading;
+use crate::types::HeadlineLevel;
+use crate::types::PriorityCookie;
+use crate::types::TodoKeywordType;
+use crate::util::elisp_fact::ElispFact;
+use crate::wasm::to_wasm::ToWasmStandardProperties;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct WasmHeadline {
+    #[serde(flatten)]
+    pub(crate) additional_properties: AdditionalProperties,
+    pub(crate) level: HeadlineLevel,
+    pub(crate) tags: Vec<String>,
+    #[serde(rename = "todo-keyword")]
+    pub(crate) todo_keyword: Option<String>,
+    #[serde(rename = "todo-type")]
+    pub(crate) todo_type: Option<String>,
+    pub(crate) title: Vec<WasmAstNode>,
+    pub(crate) priority: Option<PriorityCookie>,
+    #[serde(rename = "archivedp")]
+    pub(crate) is_archived: bool,
+    #[serde(rename = "commentedp")]
+    pub(crate) is_comment: bool,
+    #[serde(rename = "raw-value")]
+    pub(crate) raw_value: String,
+    #[serde(rename = "footnote-section-p")]
+    pub(crate) is_footnote_section: bool,
+    pub(crate) scheduled: Option<Box<WasmAstNode>>,
+    pub(crate) deadline: Option<Box<WasmAstNode>>,
+    pub(crate) closed: Option<Box<WasmAstNode>>,
+    #[serde(rename = "pre-blank")]
+    pub(crate) pre_blank: Noop,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(tag = "noop")]
+pub struct Noop {}
+
+to_wasm!(
+    WasmHeadline,
+    Heading<'s>,
+    original,
+    wasm_context,
+    { WasmAstNode::Headline(original) },
+    { "headline".into() },
+    {
+        let mut additional_properties = AdditionalProperties::default();
+        for (name, val) in original.get_additional_properties().map(|node_property| {
+            (
+                node_property.property_name.to_uppercase(),
+                AdditionalPropertyValue::SingleString(node_property.value.unwrap_or("").to_owned()),
+            )
+        }) {
+            additional_properties.properties.insert(name, val);
+        }
+
+        let children = original
+            .children
+            .iter()
+            .map(|child| {
+                child
+                    .to_wasm(wasm_context.clone())
+                    .map(Into::<WasmAstNode>::into)
+            })
+            .collect::<Result<Vec<_>, _>>()?;
+
+        Ok((
+            children,
+            WasmHeadline {
+                additional_properties,
+                level: original.level,
+                tags: original.tags.iter().map(|tag| (*tag).to_owned()).collect(),
+                todo_keyword: original
+                    .todo_keyword
+                    .as_ref()
+                    .map(|(_, keyword)| (*keyword).to_owned()),
+                todo_type: original
+                    .todo_keyword
+                    .as_ref()
+                    .map(|(keyword, _)| match keyword {
+                        TodoKeywordType::Done => "done".to_owned(),
+                        TodoKeywordType::Todo => "todo".to_owned(),
+                    }),
+                title: original
+                    .title
+                    .iter()
+                    .map(|child| {
+                        child
+                            .to_wasm(wasm_context.clone())
+                            .map(Into::<WasmAstNode>::into)
+                    })
+                    .collect::<Result<Vec<_>, _>>()?,
+                priority: original.priority_cookie,
+                is_archived: original.is_archived,
+                is_comment: original.is_comment,
+                raw_value: original.get_raw_value(),
+                is_footnote_section: original.is_footnote_section,
+                scheduled: original
+                    .scheduled
+                    .as_ref()
+                    .map(|child| {
+                        child
+                            .to_wasm(wasm_context.clone())
+                            .map(Into::<WasmAstNode>::into)
+                    })
+                    .map_or(Ok(None), |r| r.map(Some))?
+                    .map(Box::new),
+                deadline: original
+                    .deadline
+                    .as_ref()
+                    .map(|child| {
+                        child
+                            .to_wasm(wasm_context.clone())
+                            .map(Into::<WasmAstNode>::into)
+                    })
+                    .map_or(Ok(None), |r| r.map(Some))?
+                    .map(Box::new),
+                closed: original
+                    .closed
+                    .as_ref()
+                    .map(|child| {
+                        child
+                            .to_wasm(wasm_context.clone())
+                            .map(Into::<WasmAstNode>::into)
+                    })
+                    .map_or(Ok(None), |r| r.map(Some))?
+                    .map(Box::new),
+                pre_blank: Noop {},
+            },
+        ))
+    }
+);