From 9760847e89526c9f992ac20a285ad1ef9b09bff1 Mon Sep 17 00:00:00 2001
From: Jason Reed <jcreed@gmail.com>
Date: Tue, 30 Sep 2025 16:23:55 -0400
Subject: [PATCH 1/3] Restore parser tests

---
 .gitignore                                    |   2 +-
 src/tests/TestMain.lean                       |  34 +++-
 src/tests/parser/arg/arg_0001.expected        |   3 +
 src/tests/parser/arg/arg_0001.input           |   1 +
 src/tests/parser/arg/arg_0002.expected        |   6 +
 src/tests/parser/arg/arg_0002.input           |   1 +
 src/tests/parser/arg/arg_0003.expected        |   8 +
 src/tests/parser/arg/arg_0003.input           |   1 +
 src/tests/parser/arg/arg_0004.expected        |   5 +
 src/tests/parser/arg/arg_0004.input           |   2 +
 src/tests/parser/arg/arg_0005.expected        |   3 +
 src/tests/parser/arg/arg_0005.input           |   1 +
 src/tests/parser/arg/arg_0006.expected        |   3 +
 src/tests/parser/arg/arg_0006.input           |   1 +
 src/tests/parser/arg/arg_0007.expected        |   4 +
 src/tests/parser/arg/arg_0007.input           |   1 +
 src/tests/parser/arg/arg_0008.expected        |   9 +
 src/tests/parser/arg/arg_0008.input           |   1 +
 src/tests/parser/arg/arg_0009.expected        |   6 +
 src/tests/parser/arg/arg_0009.input           |   1 +
 src/tests/parser/arg/arg_0010.expected        |   8 +
 src/tests/parser/arg/arg_0010.input           |   1 +
 src/tests/parser/arg/arg_0011.expected        |   6 +
 src/tests/parser/arg/arg_0011.input           |   1 +
 src/tests/parser/arg/arg_0012.expected        |   7 +
 src/tests/parser/arg/arg_0012.input           |   1 +
 src/tests/parser/arg/arg_0013.expected        |  13 ++
 src/tests/parser/arg/arg_0013.input           |   1 +
 src/tests/parser/arg/arg_0014.expected        |   4 +
 src/tests/parser/arg/arg_0014.input           |   1 +
 src/tests/parser/arg/arg_0015.expected        |  17 ++
 src/tests/parser/arg/arg_0015.input           |   1 +
 src/tests/parser/arg/arg_0016.expected        |  15 ++
 src/tests/parser/arg/arg_0016.input           |   1 +
 src/tests/parser/arg/arg_0017.expected        |   9 +
 src/tests/parser/arg/arg_0017.input           |   2 +
 src/tests/parser/arg/arg_0018.expected        |   9 +
 src/tests/parser/arg/arg_0018.input           |   2 +
 src/tests/parser/args/args_0001.expected      |   5 +
 src/tests/parser/args/args_0001.input         |   2 +
 src/tests/parser/args/args_0002.expected      |   9 +
 src/tests/parser/args/args_0002.input         |   2 +
 src/tests/parser/args/args_0003.expected      |   9 +
 src/tests/parser/args/args_0003.input         |   2 +
 src/tests/parser/block/block_0001.expected    |  36 ++++
 src/tests/parser/block/block_0001.input       |   8 +
 src/tests/parser/block/block_0002.expected    |   4 +
 src/tests/parser/block/block_0002.input       |   2 +
 src/tests/parser/block/block_0003.expected    |   4 +
 src/tests/parser/block/block_0003.input       |   2 +
 src/tests/parser/block/block_0004.expected    |   4 +
 src/tests/parser/block/block_0004.input       |   2 +
 src/tests/parser/block/block_0005.expected    |   4 +
 src/tests/parser/block/block_0005.input       |   2 +
 src/tests/parser/block/block_0006.expected    |   4 +
 src/tests/parser/block/block_0006.input       |   6 +
 src/tests/parser/block/block_0007.expected    |  15 ++
 src/tests/parser/block/block_0007.input       |   3 +
 src/tests/parser/block/block_0008.expected    |  15 ++
 src/tests/parser/block/block_0008.input       |   3 +
 src/tests/parser/block/block_0009.expected    |  15 ++
 src/tests/parser/block/block_0009.input       |   4 +
 src/tests/parser/block/block_0010.expected    |  15 ++
 src/tests/parser/block/block_0010.input       |   4 +
 src/tests/parser/block/block_0011.expected    |  15 ++
 src/tests/parser/block/block_0011.input       |   6 +
 src/tests/parser/block/block_0012.expected    |  82 ++++++++
 src/tests/parser/block/block_0012.input       |  15 ++
 .../parser/block/blocks/blocks_0001.expected  |  12 ++
 .../parser/block/blocks/blocks_0001.input     |   3 +
 .../parser/block/blocks/blocks_0002.expected  |  12 ++
 .../parser/block/blocks/blocks_0002.input     |   2 +
 .../parser/block/blocks/blocks_0003.expected  |  23 +++
 .../parser/block/blocks/blocks_0003.input     |   4 +
 .../parser/block/blocks/blocks_0004.expected  |  43 +++++
 .../parser/block/blocks/blocks_0004.input     |   5 +
 .../parser/block/blocks/blocks_0005.expected  |  36 ++++
 .../parser/block/blocks/blocks_0005.input     |   5 +
 .../parser/block/blocks/blocks_0006.expected  |  36 ++++
 .../parser/block/blocks/blocks_0006.input     |   5 +
 .../parser/block/blocks/blocks_0007.expected  |  11 ++
 .../parser/block/blocks/blocks_0007.input     |   2 +
 .../parser/block/blocks/blocks_0008.expected  |  15 ++
 .../parser/block/blocks/blocks_0008.input     |   4 +
 .../parser/block/blocks/blocks_0009.expected  |  15 ++
 .../parser/block/blocks/blocks_0009.input     |   4 +
 .../parser/block/blocks/blocks_0010.expected  |  20 ++
 .../parser/block/blocks/blocks_0010.input     |   2 +
 .../parser/block/blocks/blocks_0011.expected  |  13 ++
 .../parser/block/blocks/blocks_0011.input     |   1 +
 .../parser/block/blocks/blocks_0012.expected  |  16 ++
 .../parser/block/blocks/blocks_0012.input     |   1 +
 .../parser/block/blocks/blocks_0013.expected  |  22 +++
 .../parser/block/blocks/blocks_0013.input     |   4 +
 .../parser/block/blocks/blocks_0014.expected  |  23 +++
 .../parser/block/blocks/blocks_0014.input     |   4 +
 .../parser/block/blocks/blocks_0015.expected  |  19 ++
 .../parser/block/blocks/blocks_0015.input     |   4 +
 .../parser/block/blocks/blocks_0016.expected  |  24 +++
 .../parser/block/blocks/blocks_0016.input     |   4 +
 .../parser/block/blocks/blocks_0017.expected  |  22 +++
 .../parser/block/blocks/blocks_0017.input     |   4 +
 .../parser/block/blocks/blocks_0018.expected  |  16 ++
 .../parser/block/blocks/blocks_0018.input     |   2 +
 .../parser/block/blocks/blocks_0019.expected  |  20 ++
 .../parser/block/blocks/blocks_0019.input     |   2 +
 .../parser/block/blocks/blocks_0020.expected  |  20 ++
 .../parser/block/blocks/blocks_0020.input     |   3 +
 .../parser/block/blocks/blocks_0021.expected  |  34 ++++
 .../parser/block/blocks/blocks_0021.input     |   9 +
 .../parser/block/blocks/blocks_0022.expected  |  27 +++
 .../parser/block/blocks/blocks_0022.input     |   3 +
 .../parser/block/blocks/blocks_0023.expected  |  18 ++
 .../parser/block/blocks/blocks_0023.input     |   2 +
 .../parser/block/blocks/blocks_0024.expected  |  15 ++
 .../parser/block/blocks/blocks_0024.input     |   3 +
 .../parser/block/blocks/blocks_0025.expected  |  21 +++
 .../parser/block/blocks/blocks_0025.input     |   6 +
 .../parser/block/blocks/blocks_0026.expected  |  24 +++
 .../parser/block/blocks/blocks_0026.input     |  10 +
 .../parser/block/blocks/blocks_0027.expected  |  23 +++
 .../parser/block/blocks/blocks_0027.input     |   7 +
 .../parser/block/blocks/blocks_0028.expected  |  21 +++
 .../parser/block/blocks/blocks_0028.input     |   5 +
 .../parser/block/blocks/blocks_0029.expected  |  20 ++
 .../parser/block/blocks/blocks_0029.input     |   3 +
 .../parser/block/blocks/blocks_0030.expected  |  14 ++
 .../parser/block/blocks/blocks_0030.input     |   1 +
 .../parser/block/blocks/blocks_0031.expected  |  26 +++
 .../parser/block/blocks/blocks_0031.input     |   3 +
 .../parser/block/blocks/blocks_0032.expected  |  20 ++
 .../parser/block/blocks/blocks_0032.input     |   3 +
 .../parser/block/blocks/blocks_0033.expected  |  11 ++
 .../parser/block/blocks/blocks_0033.input     |   1 +
 .../parser/block/blocks/blocks_0034.expected  |   6 +
 .../parser/block/blocks/blocks_0034.input     |   1 +
 .../parser/block/blocks/blocks_0035.expected  |  15 ++
 .../parser/block/blocks/blocks_0035.input     |   1 +
 .../parser/block/blocks/blocks_0036.expected  |   9 +
 .../parser/block/blocks/blocks_0036.input     |   1 +
 .../parser/block/blocks/blocks_0037.expected  |   9 +
 .../parser/block/blocks/blocks_0037.input     |   1 +
 .../parser/block/blocks/blocks_0038.expected  |  13 ++
 .../parser/block/blocks/blocks_0038.input     |   2 +
 .../parser/block/blocks/blocks_0039.expected  |  28 +++
 .../parser/block/blocks/blocks_0039.input     |   7 +
 .../parser/block/blocks/blocks_0040.expected  |  36 ++++
 .../parser/block/blocks/blocks_0040.input     |   9 +
 .../parser/block/blocks/blocks_0041.expected  |  36 ++++
 .../parser/block/blocks/blocks_0041.input     |   8 +
 .../parser/block/blocks/blocks_0042.expected  |  41 ++++
 .../parser/block/blocks/blocks_0042.input     |  10 +
 .../parser/block/blocks/blocks_0043.expected  |  13 ++
 .../parser/block/blocks/blocks_0043.input     |   3 +
 .../parser/block/blocks/blocks_0044.expected  |  13 ++
 .../parser/block/blocks/blocks_0044.input     |   3 +
 .../parser/block/blocks/blocks_0045.expected  |   8 +
 .../parser/block/blocks/blocks_0045.input     |   2 +
 .../parser/block/blocks/blocks_0046.expected  |  19 ++
 .../parser/block/blocks/blocks_0046.input     |   6 +
 .../parser/block/blocks/blocks_0047.expected  |   4 +
 .../parser/block/blocks/blocks_0047.input     |   2 +
 .../parser/block/blocks/blocks_0048.expected  |  20 ++
 .../parser/block/blocks/blocks_0048.input     |   4 +
 .../parser/block/blocks/blocks_0049.expected  |  22 +++
 .../parser/block/blocks/blocks_0049.input     |   1 +
 .../parser/block/blocks/blocks_0050.expected  |  18 ++
 .../parser/block/blocks/blocks_0050.input     |   3 +
 .../parser/block/blocks/blocks_0051.expected  |  19 ++
 .../parser/block/blocks/blocks_0051.input     |   2 +
 .../parser/block/blocks/blocks_0052.expected  |  22 +++
 .../parser/block/blocks/blocks_0052.input     |   4 +
 .../parser/block/blocks/blocks_0053.expected  |  16 ++
 .../parser/block/blocks/blocks_0053.input     |   3 +
 .../parser/block/blocks/blocks_0054.expected  | 177 ++++++++++++++++++
 .../parser/block/blocks/blocks_0054.input     |  26 +++
 .../parser/block/code/codeBlock_0001.expected |   8 +
 .../parser/block/code/codeBlock_0001.input    |   4 +
 .../parser/block/code/codeBlock_0002.expected |   8 +
 .../parser/block/code/codeBlock_0002.input    |   4 +
 .../parser/block/code/codeBlock_0003.expected |   8 +
 .../parser/block/code/codeBlock_0003.input    |   4 +
 .../parser/block/code/codeBlock_0004.expected |   8 +
 .../parser/block/code/codeBlock_0004.input    |   4 +
 .../parser/block/code/codeBlock_0005.expected |   8 +
 .../parser/block/code/codeBlock_0005.input    |   4 +
 .../parser/block/code/codeBlock_0006.expected |   8 +
 .../parser/block/code/codeBlock_0006.input    |   4 +
 .../parser/block/code/codeBlock_0007.expected |   9 +
 .../parser/block/code/codeBlock_0007.input    |   5 +
 .../parser/block/code/codeBlock_0008.expected |   9 +
 .../parser/block/code/codeBlock_0008.input    |   4 +
 .../parser/block/code/codeBlock_0009.expected |   9 +
 .../parser/block/code/codeBlock_0009.input    |   4 +
 .../parser/block/code/codeBlock_0010.expected |   9 +
 .../parser/block/code/codeBlock_0010.input    |   4 +
 .../parser/block/code/codeBlock_0011.expected |   9 +
 .../parser/block/code/codeBlock_0011.input    |   4 +
 .../parser/block/code/codeBlock_0012.expected |  14 ++
 .../parser/block/code/codeBlock_0012.input    |   4 +
 .../parser/block/code/codeBlock_0013.expected |  14 ++
 .../parser/block/code/codeBlock_0013.input    |   4 +
 .../parser/block/code/codeBlock_0014.expected |  15 ++
 .../parser/block/code/codeBlock_0014.input    |   4 +
 .../block/directive/directive_0001.expected   |  12 ++
 .../block/directive/directive_0001.input      |   3 +
 .../block/directive/directive_0002.expected   |  12 ++
 .../block/directive/directive_0002.input      |   5 +
 .../block/directive/directive_0003.expected   |  15 ++
 .../block/directive/directive_0003.input      |   3 +
 .../block/directive/directive_0004.expected   |  22 +++
 .../block/directive/directive_0004.input      |   7 +
 .../block/directive/directive_0005.expected   |  23 +++
 .../block/directive/directive_0005.input      |   7 +
 .../block/directive/directive_0006.expected   |  22 +++
 .../block/directive/directive_0006.input      |   5 +
 .../parser/block/header/header_0001.expected  |   9 +
 .../parser/block/header/header_0001.input     |   1 +
 ...ookaheadOrderedListIndicator_0001.expected |   6 +
 .../lookaheadOrderedListIndicator_0001.input  |   1 +
 ...ookaheadOrderedListIndicator_0002.expected |   6 +
 .../lookaheadOrderedListIndicator_0002.input  |   1 +
 ...ookaheadOrderedListIndicator_0003.expected |   4 +
 .../lookaheadOrderedListIndicator_0003.input  |   1 +
 ...ookaheadOrderedListIndicator_0004.expected |   6 +
 .../lookaheadOrderedListIndicator_0004.input  |   1 +
 ...ookaheadOrderedListIndicator_0005.expected |   4 +
 .../lookaheadOrderedListIndicator_0005.input  |   1 +
 ...ookaheadOrderedListIndicator_0006.expected |   4 +
 .../lookaheadOrderedListIndicator_0006.input  |   1 +
 ...ookaheadOrderedListIndicator_0007.expected |   4 +
 .../lookaheadOrderedListIndicator_0007.input  |   1 +
 .../block/opener/blockOpener_0001.expected    |   4 +
 .../block/opener/blockOpener_0001.input       |   1 +
 .../block/opener/blockOpener_0002.expected    |   4 +
 .../block/opener/blockOpener_0002.input       |   1 +
 .../block/opener/blockOpener_0003.expected    |   4 +
 .../block/opener/blockOpener_0003.input       |   1 +
 .../block/recover/recoverBlock_0001.expected  |  40 ++++
 .../block/recover/recoverBlock_0001.input     |   3 +
 ...kaheadUnorderedListIndicator_0001.expected |   4 +
 ...lookaheadUnorderedListIndicator_0001.input |   1 +
 ...kaheadUnorderedListIndicator_0002.expected |   4 +
 ...lookaheadUnorderedListIndicator_0002.input |   1 +
 ...kaheadUnorderedListIndicator_0003.expected |   4 +
 ...lookaheadUnorderedListIndicator_0003.input |   1 +
 ...kaheadUnorderedListIndicator_0004.expected |   4 +
 ...lookaheadUnorderedListIndicator_0004.input |   1 +
 ...kaheadUnorderedListIndicator_0005.expected |   4 +
 ...lookaheadUnorderedListIndicator_0005.input |   1 +
 ...kaheadUnorderedListIndicator_0006.expected |   5 +
 ...lookaheadUnorderedListIndicator_0006.input |   1 +
 .../recover/recoverBlocks_0001.expected       |  44 +++++
 .../blocks/recover/recoverBlocks_0001.input   |  11 ++
 .../parser/document/document_0001.expected    |  19 ++
 src/tests/parser/document/document_0001.input |   3 +
 .../parser/inline/code/code_0001.expected     |   6 +
 src/tests/parser/inline/code/code_0001.input  |   1 +
 .../parser/inline/code/code_0002.expected     |   3 +
 src/tests/parser/inline/code/code_0002.input  |   1 +
 .../parser/inline/code/code_0003.expected     |   3 +
 src/tests/parser/inline/code/code_0003.input  |   1 +
 .../parser/inline/code/code_0004.expected     |   3 +
 src/tests/parser/inline/code/code_0004.input  |   1 +
 .../parser/inline/code/code_0005.expected     |   3 +
 src/tests/parser/inline/code/code_0005.input  |   1 +
 .../parser/inline/code/code_0006.expected     |   6 +
 src/tests/parser/inline/code/code_0006.input  |   1 +
 .../parser/inline/code/code_0007.expected     |   7 +
 src/tests/parser/inline/code/code_0007.input  |   1 +
 .../parser/inline/code/code_0008.expected     |   3 +
 src/tests/parser/inline/code/code_0008.input  |   1 +
 .../parser/inline/code/code_0009.expected     |   3 +
 src/tests/parser/inline/code/code_0009.input  |   1 +
 .../parser/inline/code/code_0010.expected     |   3 +
 src/tests/parser/inline/code/code_0010.input  |   2 +
 .../parser/inline/code/code_0011.expected     |   3 +
 src/tests/parser/inline/code/code_0011.input  |   1 +
 .../parser/inline/emph/emph_0001.expected     |   6 +
 src/tests/parser/inline/emph/emph_0001.input  |   1 +
 .../parser/inline/emph/emph_0002.expected     |   7 +
 src/tests/parser/inline/emph/emph_0002.input  |   1 +
 .../parser/inline/emph/emph_0003.expected     |   4 +
 src/tests/parser/inline/emph/emph_0003.input  |   1 +
 .../parser/inline/oneInline_0001.expected     |   6 +
 src/tests/parser/inline/oneInline_0001.input  |   1 +
 .../parser/inline/oneInline_0002.expected     |   6 +
 src/tests/parser/inline/oneInline_0002.input  |   1 +
 .../parser/inline/oneInline_0003.expected     |   7 +
 src/tests/parser/inline/oneInline_0003.input  |   1 +
 .../parser/inline/oneInline_0004.expected     |   3 +
 src/tests/parser/inline/oneInline_0004.input  |   1 +
 .../parser/inline/oneInline_0005.expected     |   3 +
 src/tests/parser/inline/oneInline_0005.input  |   1 +
 .../parser/inline/oneInline_0006.expected     |   3 +
 src/tests/parser/inline/oneInline_0006.input  |   2 +
 .../parser/inline/oneInline_0007.expected     |   7 +
 src/tests/parser/inline/oneInline_0007.input  |   2 +
 .../parser/inline/oneInline_0008.expected     |  10 +
 src/tests/parser/inline/oneInline_0008.input  |   2 +
 .../parser/inline/oneInline_0009.expected     |   4 +
 src/tests/parser/inline/oneInline_0009.input  |   1 +
 .../parser/inline/oneInline_0010.expected     |  10 +
 src/tests/parser/inline/oneInline_0010.input  |   1 +
 .../parser/inline/oneInline_0011.expected     |  10 +
 src/tests/parser/inline/oneInline_0011.input  |   1 +
 .../parser/inline/oneInline_0012.expected     |  11 ++
 src/tests/parser/inline/oneInline_0012.input  |   2 +
 .../parser/inline/oneInline_0013.expected     |   7 +
 src/tests/parser/inline/oneInline_0013.input  |   2 +
 .../parser/inline/oneInline_0014.expected     |  10 +
 src/tests/parser/inline/oneInline_0014.input  |   1 +
 .../parser/inline/oneInline_0015.expected     |   8 +
 src/tests/parser/inline/oneInline_0015.input  |   1 +
 .../parser/inline/oneInline_0016.expected     |   3 +
 src/tests/parser/inline/oneInline_0016.input  |   1 +
 .../parser/inline/oneInline_0017.expected     |   8 +
 src/tests/parser/inline/oneInline_0017.input  |   1 +
 .../parser/inline/oneInline_0018.expected     |   8 +
 src/tests/parser/inline/oneInline_0018.input  |   6 +
 .../parser/inline/oneInline_0019.expected     |   8 +
 src/tests/parser/inline/oneInline_0019.input  |   1 +
 .../parser/inline/oneInline_0020.expected     |   3 +
 src/tests/parser/inline/oneInline_0020.input  |   1 +
 .../parser/inline/oneInline_0021.expected     |   4 +
 src/tests/parser/inline/oneInline_0021.input  |   1 +
 .../parser/inline/oneInline_0022.expected     |   3 +
 src/tests/parser/inline/oneInline_0022.input  |   1 +
 .../parser/inline/role/role_0001.expected     |  13 ++
 src/tests/parser/inline/role/role_0001.input  |   1 +
 .../parser/inline/role/role_0002.expected     |  10 +
 src/tests/parser/inline/role/role_0002.input  |   1 +
 .../parser/inline/role/role_0003.expected     |  19 ++
 src/tests/parser/inline/role/role_0003.input  |   1 +
 .../parser/inline/role/role_0004.expected     |  13 ++
 src/tests/parser/inline/role/role_0004.input  |   1 +
 .../parser/inline/role/role_0005.expected     |  23 +++
 src/tests/parser/inline/role/role_0005.input  |   1 +
 .../parser/inline/text/text_0001.expected     |   4 +
 src/tests/parser/inline/text/text_0001.input  |   1 +
 .../inlineTextChar_0001.expected              |   4 +
 .../inlineTextChar/inlineTextChar_0001.input  |   0
 .../inlineTextChar_0002.expected              |   3 +
 .../inlineTextChar/inlineTextChar_0002.input  |   1 +
 .../inlineTextChar_0003.expected              |   4 +
 .../inlineTextChar/inlineTextChar_0003.input  |   1 +
 .../inlineTextChar_0004.expected              |   4 +
 .../inlineTextChar/inlineTextChar_0004.input  |   1 +
 .../inlineTextChar_0005.expected              |   4 +
 .../inlineTextChar/inlineTextChar_0005.input  |   1 +
 .../manyInlineTextChar_0001.expected          |   4 +
 .../manyInlineTextChar_0001.input             |   1 +
 .../manyInlineTextChar_0002.expected          |   4 +
 .../manyInlineTextChar_0002.input             |   1 +
 .../manyInlineTextChar_0003.expected          |   4 +
 .../manyInlineTextChar_0003.input             |   1 +
 .../metadataBlock/metadataBlock_0001.expected |   6 +
 .../metadataBlock/metadataBlock_0001.input    |   2 +
 .../metadataBlock/metadataBlock_0002.expected |  12 ++
 .../metadataBlock/metadataBlock_0002.input    |   4 +
 .../metadataBlock/metadataBlock_0003.expected |  16 ++
 .../metadataBlock/metadataBlock_0003.input    |   4 +
 .../nameAndArgs/nameAndArgs_0001.expected     |   8 +
 .../parser/nameAndArgs/nameAndArgs_0001.input |   1 +
 .../nameAndArgs/nameAndArgs_0002.expected     |  10 +
 .../parser/nameAndArgs/nameAndArgs_0002.input |   1 +
 .../nameAndArgs/nameAndArgs_0003.expected     |  11 ++
 .../parser/nameAndArgs/nameAndArgs_0003.input |   1 +
 .../nameAndArgs/nameAndArgs_0004.expected     |  12 ++
 .../parser/nameAndArgs/nameAndArgs_0004.input |   1 +
 .../nameAndArgs/nameAndArgs_0005.expected     |  12 ++
 .../parser/nameAndArgs/nameAndArgs_0005.input |   1 +
 .../nameAndArgs/nameAndArgs_0006.expected     |  11 ++
 .../parser/nameAndArgs/nameAndArgs_0006.input |   2 +
 .../nameAndArgs/nameAndArgs_0007.expected     |   6 +
 .../parser/nameAndArgs/nameAndArgs_0007.input |   1 +
 .../nameAndArgs/nameAndArgs_0008.expected     |   8 +
 .../parser/nameAndArgs/nameAndArgs_0008.input |   1 +
 .../nameAndArgs/nameAndArgs_0009.expected     |  10 +
 .../parser/nameAndArgs/nameAndArgs_0009.input |   1 +
 .../nameAndArgs/nameAndArgs_0010.expected     |  11 ++
 .../parser/nameAndArgs/nameAndArgs_0010.input |   3 +
 src/tests/parser/val/arg_val_0001.expected    |   3 +
 src/tests/parser/val/arg_val_0001.input       |   1 +
 src/tests/parser/val/arg_val_0002.expected    |   3 +
 src/tests/parser/val/arg_val_0002.input       |   1 +
 src/tests/parser/val/arg_val_0003.expected    |   4 +
 src/tests/parser/val/arg_val_0003.input       |   0
 src/tests/parser/val/arg_val_0004.expected    |   3 +
 src/tests/parser/val/arg_val_0004.input       |   1 +
 src/tests/parser/val/arg_val_0005.expected    |   4 +
 src/tests/parser/val/arg_val_0005.input       |   1 +
 src/tests/parser/val/arg_val_0006.expected    |   4 +
 src/tests/parser/val/arg_val_0006.input       |   2 +
 src/tests/parser/val/arg_val_0007.expected    |   4 +
 src/tests/parser/val/arg_val_0007.input       |   1 +
 396 files changed, 3054 insertions(+), 2 deletions(-)
 create mode 100644 src/tests/parser/arg/arg_0001.expected
 create mode 100644 src/tests/parser/arg/arg_0001.input
 create mode 100644 src/tests/parser/arg/arg_0002.expected
 create mode 100644 src/tests/parser/arg/arg_0002.input
 create mode 100644 src/tests/parser/arg/arg_0003.expected
 create mode 100644 src/tests/parser/arg/arg_0003.input
 create mode 100644 src/tests/parser/arg/arg_0004.expected
 create mode 100644 src/tests/parser/arg/arg_0004.input
 create mode 100644 src/tests/parser/arg/arg_0005.expected
 create mode 100644 src/tests/parser/arg/arg_0005.input
 create mode 100644 src/tests/parser/arg/arg_0006.expected
 create mode 100644 src/tests/parser/arg/arg_0006.input
 create mode 100644 src/tests/parser/arg/arg_0007.expected
 create mode 100644 src/tests/parser/arg/arg_0007.input
 create mode 100644 src/tests/parser/arg/arg_0008.expected
 create mode 100644 src/tests/parser/arg/arg_0008.input
 create mode 100644 src/tests/parser/arg/arg_0009.expected
 create mode 100644 src/tests/parser/arg/arg_0009.input
 create mode 100644 src/tests/parser/arg/arg_0010.expected
 create mode 100644 src/tests/parser/arg/arg_0010.input
 create mode 100644 src/tests/parser/arg/arg_0011.expected
 create mode 100644 src/tests/parser/arg/arg_0011.input
 create mode 100644 src/tests/parser/arg/arg_0012.expected
 create mode 100644 src/tests/parser/arg/arg_0012.input
 create mode 100644 src/tests/parser/arg/arg_0013.expected
 create mode 100644 src/tests/parser/arg/arg_0013.input
 create mode 100644 src/tests/parser/arg/arg_0014.expected
 create mode 100644 src/tests/parser/arg/arg_0014.input
 create mode 100644 src/tests/parser/arg/arg_0015.expected
 create mode 100644 src/tests/parser/arg/arg_0015.input
 create mode 100644 src/tests/parser/arg/arg_0016.expected
 create mode 100644 src/tests/parser/arg/arg_0016.input
 create mode 100644 src/tests/parser/arg/arg_0017.expected
 create mode 100644 src/tests/parser/arg/arg_0017.input
 create mode 100644 src/tests/parser/arg/arg_0018.expected
 create mode 100644 src/tests/parser/arg/arg_0018.input
 create mode 100644 src/tests/parser/args/args_0001.expected
 create mode 100644 src/tests/parser/args/args_0001.input
 create mode 100644 src/tests/parser/args/args_0002.expected
 create mode 100644 src/tests/parser/args/args_0002.input
 create mode 100644 src/tests/parser/args/args_0003.expected
 create mode 100644 src/tests/parser/args/args_0003.input
 create mode 100644 src/tests/parser/block/block_0001.expected
 create mode 100644 src/tests/parser/block/block_0001.input
 create mode 100644 src/tests/parser/block/block_0002.expected
 create mode 100644 src/tests/parser/block/block_0002.input
 create mode 100644 src/tests/parser/block/block_0003.expected
 create mode 100644 src/tests/parser/block/block_0003.input
 create mode 100644 src/tests/parser/block/block_0004.expected
 create mode 100644 src/tests/parser/block/block_0004.input
 create mode 100644 src/tests/parser/block/block_0005.expected
 create mode 100644 src/tests/parser/block/block_0005.input
 create mode 100644 src/tests/parser/block/block_0006.expected
 create mode 100644 src/tests/parser/block/block_0006.input
 create mode 100644 src/tests/parser/block/block_0007.expected
 create mode 100644 src/tests/parser/block/block_0007.input
 create mode 100644 src/tests/parser/block/block_0008.expected
 create mode 100644 src/tests/parser/block/block_0008.input
 create mode 100644 src/tests/parser/block/block_0009.expected
 create mode 100644 src/tests/parser/block/block_0009.input
 create mode 100644 src/tests/parser/block/block_0010.expected
 create mode 100644 src/tests/parser/block/block_0010.input
 create mode 100644 src/tests/parser/block/block_0011.expected
 create mode 100644 src/tests/parser/block/block_0011.input
 create mode 100644 src/tests/parser/block/block_0012.expected
 create mode 100644 src/tests/parser/block/block_0012.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0001.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0001.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0002.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0002.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0003.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0003.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0004.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0004.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0005.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0005.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0006.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0006.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0007.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0007.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0008.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0008.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0009.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0009.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0010.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0010.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0011.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0011.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0012.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0012.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0013.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0013.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0014.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0014.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0015.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0015.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0016.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0016.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0017.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0017.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0018.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0018.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0019.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0019.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0020.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0020.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0021.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0021.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0022.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0022.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0023.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0023.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0024.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0024.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0025.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0025.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0026.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0026.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0027.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0027.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0028.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0028.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0029.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0029.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0030.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0030.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0031.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0031.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0032.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0032.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0033.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0033.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0034.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0034.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0035.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0035.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0036.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0036.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0037.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0037.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0038.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0038.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0039.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0039.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0040.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0040.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0041.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0041.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0042.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0042.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0043.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0043.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0044.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0044.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0045.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0045.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0046.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0046.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0047.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0047.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0048.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0048.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0049.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0049.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0050.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0050.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0051.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0051.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0052.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0052.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0053.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0053.input
 create mode 100644 src/tests/parser/block/blocks/blocks_0054.expected
 create mode 100644 src/tests/parser/block/blocks/blocks_0054.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0001.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0001.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0002.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0002.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0003.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0003.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0004.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0004.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0005.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0005.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0006.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0006.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0007.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0007.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0008.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0008.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0009.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0009.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0010.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0010.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0011.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0011.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0012.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0012.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0013.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0013.input
 create mode 100644 src/tests/parser/block/code/codeBlock_0014.expected
 create mode 100644 src/tests/parser/block/code/codeBlock_0014.input
 create mode 100644 src/tests/parser/block/directive/directive_0001.expected
 create mode 100644 src/tests/parser/block/directive/directive_0001.input
 create mode 100644 src/tests/parser/block/directive/directive_0002.expected
 create mode 100644 src/tests/parser/block/directive/directive_0002.input
 create mode 100644 src/tests/parser/block/directive/directive_0003.expected
 create mode 100644 src/tests/parser/block/directive/directive_0003.input
 create mode 100644 src/tests/parser/block/directive/directive_0004.expected
 create mode 100644 src/tests/parser/block/directive/directive_0004.input
 create mode 100644 src/tests/parser/block/directive/directive_0005.expected
 create mode 100644 src/tests/parser/block/directive/directive_0005.input
 create mode 100644 src/tests/parser/block/directive/directive_0006.expected
 create mode 100644 src/tests/parser/block/directive/directive_0006.input
 create mode 100644 src/tests/parser/block/header/header_0001.expected
 create mode 100644 src/tests/parser/block/header/header_0001.input
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0001.expected
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0001.input
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0002.expected
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0002.input
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0003.expected
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0003.input
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0004.expected
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0004.input
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0005.expected
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0005.input
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0006.expected
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0006.input
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0007.expected
 create mode 100644 src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0007.input
 create mode 100644 src/tests/parser/block/opener/blockOpener_0001.expected
 create mode 100644 src/tests/parser/block/opener/blockOpener_0001.input
 create mode 100644 src/tests/parser/block/opener/blockOpener_0002.expected
 create mode 100644 src/tests/parser/block/opener/blockOpener_0002.input
 create mode 100644 src/tests/parser/block/opener/blockOpener_0003.expected
 create mode 100644 src/tests/parser/block/opener/blockOpener_0003.input
 create mode 100644 src/tests/parser/block/recover/recoverBlock_0001.expected
 create mode 100644 src/tests/parser/block/recover/recoverBlock_0001.input
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0001.expected
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0001.input
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0002.expected
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0002.input
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0003.expected
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0003.input
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0004.expected
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0004.input
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0005.expected
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0005.input
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0006.expected
 create mode 100644 src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0006.input
 create mode 100644 src/tests/parser/blocks/recover/recoverBlocks_0001.expected
 create mode 100644 src/tests/parser/blocks/recover/recoverBlocks_0001.input
 create mode 100644 src/tests/parser/document/document_0001.expected
 create mode 100644 src/tests/parser/document/document_0001.input
 create mode 100644 src/tests/parser/inline/code/code_0001.expected
 create mode 100644 src/tests/parser/inline/code/code_0001.input
 create mode 100644 src/tests/parser/inline/code/code_0002.expected
 create mode 100644 src/tests/parser/inline/code/code_0002.input
 create mode 100644 src/tests/parser/inline/code/code_0003.expected
 create mode 100644 src/tests/parser/inline/code/code_0003.input
 create mode 100644 src/tests/parser/inline/code/code_0004.expected
 create mode 100644 src/tests/parser/inline/code/code_0004.input
 create mode 100644 src/tests/parser/inline/code/code_0005.expected
 create mode 100644 src/tests/parser/inline/code/code_0005.input
 create mode 100644 src/tests/parser/inline/code/code_0006.expected
 create mode 100644 src/tests/parser/inline/code/code_0006.input
 create mode 100644 src/tests/parser/inline/code/code_0007.expected
 create mode 100644 src/tests/parser/inline/code/code_0007.input
 create mode 100644 src/tests/parser/inline/code/code_0008.expected
 create mode 100644 src/tests/parser/inline/code/code_0008.input
 create mode 100644 src/tests/parser/inline/code/code_0009.expected
 create mode 100644 src/tests/parser/inline/code/code_0009.input
 create mode 100644 src/tests/parser/inline/code/code_0010.expected
 create mode 100644 src/tests/parser/inline/code/code_0010.input
 create mode 100644 src/tests/parser/inline/code/code_0011.expected
 create mode 100644 src/tests/parser/inline/code/code_0011.input
 create mode 100644 src/tests/parser/inline/emph/emph_0001.expected
 create mode 100644 src/tests/parser/inline/emph/emph_0001.input
 create mode 100644 src/tests/parser/inline/emph/emph_0002.expected
 create mode 100644 src/tests/parser/inline/emph/emph_0002.input
 create mode 100644 src/tests/parser/inline/emph/emph_0003.expected
 create mode 100644 src/tests/parser/inline/emph/emph_0003.input
 create mode 100644 src/tests/parser/inline/oneInline_0001.expected
 create mode 100644 src/tests/parser/inline/oneInline_0001.input
 create mode 100644 src/tests/parser/inline/oneInline_0002.expected
 create mode 100644 src/tests/parser/inline/oneInline_0002.input
 create mode 100644 src/tests/parser/inline/oneInline_0003.expected
 create mode 100644 src/tests/parser/inline/oneInline_0003.input
 create mode 100644 src/tests/parser/inline/oneInline_0004.expected
 create mode 100644 src/tests/parser/inline/oneInline_0004.input
 create mode 100644 src/tests/parser/inline/oneInline_0005.expected
 create mode 100644 src/tests/parser/inline/oneInline_0005.input
 create mode 100644 src/tests/parser/inline/oneInline_0006.expected
 create mode 100644 src/tests/parser/inline/oneInline_0006.input
 create mode 100644 src/tests/parser/inline/oneInline_0007.expected
 create mode 100644 src/tests/parser/inline/oneInline_0007.input
 create mode 100644 src/tests/parser/inline/oneInline_0008.expected
 create mode 100644 src/tests/parser/inline/oneInline_0008.input
 create mode 100644 src/tests/parser/inline/oneInline_0009.expected
 create mode 100644 src/tests/parser/inline/oneInline_0009.input
 create mode 100644 src/tests/parser/inline/oneInline_0010.expected
 create mode 100644 src/tests/parser/inline/oneInline_0010.input
 create mode 100644 src/tests/parser/inline/oneInline_0011.expected
 create mode 100644 src/tests/parser/inline/oneInline_0011.input
 create mode 100644 src/tests/parser/inline/oneInline_0012.expected
 create mode 100644 src/tests/parser/inline/oneInline_0012.input
 create mode 100644 src/tests/parser/inline/oneInline_0013.expected
 create mode 100644 src/tests/parser/inline/oneInline_0013.input
 create mode 100644 src/tests/parser/inline/oneInline_0014.expected
 create mode 100644 src/tests/parser/inline/oneInline_0014.input
 create mode 100644 src/tests/parser/inline/oneInline_0015.expected
 create mode 100644 src/tests/parser/inline/oneInline_0015.input
 create mode 100644 src/tests/parser/inline/oneInline_0016.expected
 create mode 100644 src/tests/parser/inline/oneInline_0016.input
 create mode 100644 src/tests/parser/inline/oneInline_0017.expected
 create mode 100644 src/tests/parser/inline/oneInline_0017.input
 create mode 100644 src/tests/parser/inline/oneInline_0018.expected
 create mode 100644 src/tests/parser/inline/oneInline_0018.input
 create mode 100644 src/tests/parser/inline/oneInline_0019.expected
 create mode 100644 src/tests/parser/inline/oneInline_0019.input
 create mode 100644 src/tests/parser/inline/oneInline_0020.expected
 create mode 100644 src/tests/parser/inline/oneInline_0020.input
 create mode 100644 src/tests/parser/inline/oneInline_0021.expected
 create mode 100644 src/tests/parser/inline/oneInline_0021.input
 create mode 100644 src/tests/parser/inline/oneInline_0022.expected
 create mode 100644 src/tests/parser/inline/oneInline_0022.input
 create mode 100644 src/tests/parser/inline/role/role_0001.expected
 create mode 100644 src/tests/parser/inline/role/role_0001.input
 create mode 100644 src/tests/parser/inline/role/role_0002.expected
 create mode 100644 src/tests/parser/inline/role/role_0002.input
 create mode 100644 src/tests/parser/inline/role/role_0003.expected
 create mode 100644 src/tests/parser/inline/role/role_0003.input
 create mode 100644 src/tests/parser/inline/role/role_0004.expected
 create mode 100644 src/tests/parser/inline/role/role_0004.input
 create mode 100644 src/tests/parser/inline/role/role_0005.expected
 create mode 100644 src/tests/parser/inline/role/role_0005.input
 create mode 100644 src/tests/parser/inline/text/text_0001.expected
 create mode 100644 src/tests/parser/inline/text/text_0001.input
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0001.expected
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0001.input
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0002.expected
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0002.input
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0003.expected
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0003.input
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0004.expected
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0004.input
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0005.expected
 create mode 100644 src/tests/parser/inlineTextChar/inlineTextChar_0005.input
 create mode 100644 src/tests/parser/manyInlineTextChar/manyInlineTextChar_0001.expected
 create mode 100644 src/tests/parser/manyInlineTextChar/manyInlineTextChar_0001.input
 create mode 100644 src/tests/parser/manyInlineTextChar/manyInlineTextChar_0002.expected
 create mode 100644 src/tests/parser/manyInlineTextChar/manyInlineTextChar_0002.input
 create mode 100644 src/tests/parser/manyInlineTextChar/manyInlineTextChar_0003.expected
 create mode 100644 src/tests/parser/manyInlineTextChar/manyInlineTextChar_0003.input
 create mode 100644 src/tests/parser/metadataBlock/metadataBlock_0001.expected
 create mode 100644 src/tests/parser/metadataBlock/metadataBlock_0001.input
 create mode 100644 src/tests/parser/metadataBlock/metadataBlock_0002.expected
 create mode 100644 src/tests/parser/metadataBlock/metadataBlock_0002.input
 create mode 100644 src/tests/parser/metadataBlock/metadataBlock_0003.expected
 create mode 100644 src/tests/parser/metadataBlock/metadataBlock_0003.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0001.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0001.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0002.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0003.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0004.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0005.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0006.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0007.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0007.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0008.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0008.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0009.input
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
 create mode 100644 src/tests/parser/nameAndArgs/nameAndArgs_0010.input
 create mode 100644 src/tests/parser/val/arg_val_0001.expected
 create mode 100644 src/tests/parser/val/arg_val_0001.input
 create mode 100644 src/tests/parser/val/arg_val_0002.expected
 create mode 100644 src/tests/parser/val/arg_val_0002.input
 create mode 100644 src/tests/parser/val/arg_val_0003.expected
 create mode 100644 src/tests/parser/val/arg_val_0003.input
 create mode 100644 src/tests/parser/val/arg_val_0004.expected
 create mode 100644 src/tests/parser/val/arg_val_0004.input
 create mode 100644 src/tests/parser/val/arg_val_0005.expected
 create mode 100644 src/tests/parser/val/arg_val_0005.input
 create mode 100644 src/tests/parser/val/arg_val_0006.expected
 create mode 100644 src/tests/parser/val/arg_val_0006.input
 create mode 100644 src/tests/parser/val/arg_val_0007.expected
 create mode 100644 src/tests/parser/val/arg_val_0007.input

diff --git a/.gitignore b/.gitignore
index 98d45bb4c..4b856025b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 _out
 *.olean
 /.verso/
-/src/tests/parser/*/*.output
+/src/tests/parser/**/*.output
diff --git a/src/tests/TestMain.lean b/src/tests/TestMain.lean
index 86056bf61..832634b9a 100644
--- a/src/tests/TestMain.lean
+++ b/src/tests/TestMain.lean
@@ -29,8 +29,40 @@ def testStemmer (_ : Config) : IO Unit := do
       IO.eprintln s!"{x} --> {s} (wanted '{y}')"
     throw <| IO.userError "Stemmer tests failed"
 
+def testParser (dir : System.FilePath) (fn : Lean.Parser.ParserFn) : Config → IO Unit := fun config =>
+  Verso.GoldenTest.runTests {
+    testDir := ("src/tests/parser" : System.FilePath) / dir,
+    runTest := fn.test,
+    updateExpected := config.updateExpected
+  }
+
+open Lean.Parser in
+open Verso.Parser in
 def tests := [
-  testStemmer
+  testStemmer,
+  testParser "metadataBlock" metadataBlock,
+  testParser "val" val,
+  testParser "arg" arg,
+  testParser "args" args,
+  testParser "nameAndArgs" nameAndArgs,
+  testParser "inlineTextChar" inlineTextChar,
+  testParser "manyInlineTextChar" (asStringFn (many1Fn inlineTextChar)),
+  testParser "inline/text" text,
+  testParser "inline/emph" (emph {}),
+  testParser "inline/code" code,
+  testParser "inline/role" (role {}),
+  testParser "inline" (inline {}),
+  testParser "block/code" (codeBlock {}),
+  testParser "block/header" (header {}),
+  testParser "block/blocks" (blocks {}),
+  testParser "block/recover" (recoverBlock (block {})),
+  testParser "blocks/recover" (recoverBlock (blocks {})),
+  testParser "block/directive" (directive {}),
+  testParser "block/opener" (ignoreFn blockOpener),
+  testParser "block/ulIndicator" (lookaheadUnorderedListIndicator {} (fun type => fakeAtom s! "{repr type}")),
+  testParser "block/olIndicator" (lookaheadOrderedListIndicator {} (fun type i => fakeAtom s! "{repr type} {i}")),
+  testParser "block/" (block {}),
+  testParser "document" document,
 ]
 
 def getConfig (config : Config) : List String → IO Config
diff --git a/src/tests/parser/arg/arg_0001.expected b/src/tests/parser/arg/arg_0001.expected
new file mode 100644
index 000000000..f4b58db2c
--- /dev/null
+++ b/src/tests/parser/arg/arg_0001.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.anon (Verso.Syntax.arg_ident `x))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0001.input b/src/tests/parser/arg/arg_0001.input
new file mode 100644
index 000000000..c1b0730e0
--- /dev/null
+++ b/src/tests/parser/arg/arg_0001.input
@@ -0,0 +1 @@
+x
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0002.expected b/src/tests/parser/arg/arg_0002.expected
new file mode 100644
index 000000000..3e1b83cfe
--- /dev/null
+++ b/src/tests/parser/arg/arg_0002.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.named_no_paren
+   `x
+   ":="
+   (Verso.Syntax.arg_num (num "1")))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0002.input b/src/tests/parser/arg/arg_0002.input
new file mode 100644
index 000000000..a07f3e468
--- /dev/null
+++ b/src/tests/parser/arg/arg_0002.input
@@ -0,0 +1 @@
+x:=1
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0003.expected b/src/tests/parser/arg/arg_0003.expected
new file mode 100644
index 000000000..a53d228a7
--- /dev/null
+++ b/src/tests/parser/arg/arg_0003.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.named
+   "("
+   `x
+   ":="
+   (Verso.Syntax.arg_num (num "1"))
+   ")")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0003.input b/src/tests/parser/arg/arg_0003.input
new file mode 100644
index 000000000..3ee9ce405
--- /dev/null
+++ b/src/tests/parser/arg/arg_0003.input
@@ -0,0 +1 @@
+(x:=1)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0004.expected b/src/tests/parser/arg/arg_0004.expected
new file mode 100644
index 000000000..dc143ace9
--- /dev/null
+++ b/src/tests/parser/arg/arg_0004.expected
@@ -0,0 +1,5 @@
+Failure @0 (⟨1, 0⟩): '
+'; expected '(', '+', '-', identifier or numeral
+Final stack:
+  (Verso.Syntax.arg_str <missing>)
+Remaining: "\n(x:=1)"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0004.input b/src/tests/parser/arg/arg_0004.input
new file mode 100644
index 000000000..938e7b08b
--- /dev/null
+++ b/src/tests/parser/arg/arg_0004.input
@@ -0,0 +1,2 @@
+
+(x:=1)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0005.expected b/src/tests/parser/arg/arg_0005.expected
new file mode 100644
index 000000000..9038bbd35
--- /dev/null
+++ b/src/tests/parser/arg/arg_0005.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.flag_on "+" `foo)
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0005.input b/src/tests/parser/arg/arg_0005.input
new file mode 100644
index 000000000..debda609a
--- /dev/null
+++ b/src/tests/parser/arg/arg_0005.input
@@ -0,0 +1 @@
++foo
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0006.expected b/src/tests/parser/arg/arg_0006.expected
new file mode 100644
index 000000000..647217ce0
--- /dev/null
+++ b/src/tests/parser/arg/arg_0006.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.flag_off "-" `other)
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0006.input b/src/tests/parser/arg/arg_0006.input
new file mode 100644
index 000000000..5fff7bd97
--- /dev/null
+++ b/src/tests/parser/arg/arg_0006.input
@@ -0,0 +1 @@
+-other
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0007.expected b/src/tests/parser/arg/arg_0007.expected
new file mode 100644
index 000000000..6108c6195
--- /dev/null
+++ b/src/tests/parser/arg/arg_0007.expected
@@ -0,0 +1,4 @@
+Failure @2 (⟨1, 2⟩): expected no space before
+Final stack:
+  (Verso.Syntax.flag_off "-" `other)
+Remaining: "other"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0007.input b/src/tests/parser/arg/arg_0007.input
new file mode 100644
index 000000000..88dc55e4a
--- /dev/null
+++ b/src/tests/parser/arg/arg_0007.input
@@ -0,0 +1 @@
+- other
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0008.expected b/src/tests/parser/arg/arg_0008.expected
new file mode 100644
index 000000000..2dde93014
--- /dev/null
+++ b/src/tests/parser/arg/arg_0008.expected
@@ -0,0 +1,9 @@
+Success! Final stack:
+  (Verso.Syntax.named
+   "("
+   `x
+   ":="
+   (Verso.Syntax.arg_num (num "1"))
+   ")")
+Remaining:
+"\n"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0008.input b/src/tests/parser/arg/arg_0008.input
new file mode 100644
index 000000000..0970bcbc5
--- /dev/null
+++ b/src/tests/parser/arg/arg_0008.input
@@ -0,0 +1 @@
+(x:=1)
diff --git a/src/tests/parser/arg/arg_0009.expected b/src/tests/parser/arg/arg_0009.expected
new file mode 100644
index 000000000..2989b24b8
--- /dev/null
+++ b/src/tests/parser/arg/arg_0009.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.named_no_paren
+   `x
+   ":="
+   (Verso.Syntax.arg_ident `y))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0009.input b/src/tests/parser/arg/arg_0009.input
new file mode 100644
index 000000000..14d0b3f1a
--- /dev/null
+++ b/src/tests/parser/arg/arg_0009.input
@@ -0,0 +1 @@
+x:=y
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0010.expected b/src/tests/parser/arg/arg_0010.expected
new file mode 100644
index 000000000..fbf3fe3f3
--- /dev/null
+++ b/src/tests/parser/arg/arg_0010.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.named
+   "("
+   `x
+   ":="
+   (Verso.Syntax.arg_ident `y)
+   ")")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0010.input b/src/tests/parser/arg/arg_0010.input
new file mode 100644
index 000000000..0d6154770
--- /dev/null
+++ b/src/tests/parser/arg/arg_0010.input
@@ -0,0 +1 @@
+(x:=y)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0011.expected b/src/tests/parser/arg/arg_0011.expected
new file mode 100644
index 000000000..af537342d
--- /dev/null
+++ b/src/tests/parser/arg/arg_0011.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.named_no_paren
+   `x
+   ":="
+   (Verso.Syntax.arg_str (str "\"y\"")))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0011.input b/src/tests/parser/arg/arg_0011.input
new file mode 100644
index 000000000..e90562385
--- /dev/null
+++ b/src/tests/parser/arg/arg_0011.input
@@ -0,0 +1 @@
+x:="y"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0012.expected b/src/tests/parser/arg/arg_0012.expected
new file mode 100644
index 000000000..25f56d64e
--- /dev/null
+++ b/src/tests/parser/arg/arg_0012.expected
@@ -0,0 +1,7 @@
+Failure @3 (⟨1, 3⟩): unterminated string literal; expected identifier or numeral
+Final stack:
+ • `x
+ • ":="
+ • (Verso.Syntax.arg_str <missing>)
+
+Remaining: "\"y"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0012.input b/src/tests/parser/arg/arg_0012.input
new file mode 100644
index 000000000..a94983251
--- /dev/null
+++ b/src/tests/parser/arg/arg_0012.input
@@ -0,0 +1 @@
+x:="y
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0013.expected b/src/tests/parser/arg/arg_0013.expected
new file mode 100644
index 000000000..deb8cb2dd
--- /dev/null
+++ b/src/tests/parser/arg/arg_0013.expected
@@ -0,0 +1,13 @@
+2 failures:
+  @7 (⟨1, 7⟩): expected ')'
+    ""
+  @7 (⟨1, 7⟩): unterminated string literal; expected identifier or numeral
+    ""
+
+Final stack:
+  (Verso.Syntax.named
+   "("
+   `x
+   ":="
+   (Verso.Syntax.arg_str <missing>)
+   <missing>)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0013.input b/src/tests/parser/arg/arg_0013.input
new file mode 100644
index 000000000..45cb12c92
--- /dev/null
+++ b/src/tests/parser/arg/arg_0013.input
@@ -0,0 +1 @@
+(x:="y)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0014.expected b/src/tests/parser/arg/arg_0014.expected
new file mode 100644
index 000000000..a665be094
--- /dev/null
+++ b/src/tests/parser/arg/arg_0014.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.anon
+   (Verso.Syntax.arg_num (num "42")))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0014.input b/src/tests/parser/arg/arg_0014.input
new file mode 100644
index 000000000..f70d7bba4
--- /dev/null
+++ b/src/tests/parser/arg/arg_0014.input
@@ -0,0 +1 @@
+42
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0015.expected b/src/tests/parser/arg/arg_0015.expected
new file mode 100644
index 000000000..efc95bee2
--- /dev/null
+++ b/src/tests/parser/arg/arg_0015.expected
@@ -0,0 +1,17 @@
+4 failures:
+  @4 (⟨1, 4⟩): expected ')'
+    ""
+  @4 (⟨1, 4⟩): expected ':='
+    ""
+  @4 (⟨1, 4⟩): expected argument name
+    ""
+  @4 (⟨1, 4⟩): unexpected end of input; expected identifier, numeral or string literal
+    ""
+
+Final stack:
+  (Verso.Syntax.named
+   "("
+   <missing>
+   <missing>
+   (Verso.Syntax.arg_str <missing>)
+   <missing>)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0015.input b/src/tests/parser/arg/arg_0015.input
new file mode 100644
index 000000000..93022ef3e
--- /dev/null
+++ b/src/tests/parser/arg/arg_0015.input
@@ -0,0 +1 @@
+(42)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0016.expected b/src/tests/parser/arg/arg_0016.expected
new file mode 100644
index 000000000..2f4f12ca9
--- /dev/null
+++ b/src/tests/parser/arg/arg_0016.expected
@@ -0,0 +1,15 @@
+3 failures:
+  @6 (⟨1, 6⟩): expected ')'
+    ""
+  @6 (⟨1, 6⟩): expected ':='
+    ""
+  @6 (⟨1, 6⟩): unexpected end of input; expected identifier, numeral or string literal
+    ""
+
+Final stack:
+  (Verso.Syntax.named
+   "("
+   `x
+   <missing>
+   (Verso.Syntax.arg_str <missing>)
+   <missing>)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0016.input b/src/tests/parser/arg/arg_0016.input
new file mode 100644
index 000000000..b4e4f9554
--- /dev/null
+++ b/src/tests/parser/arg/arg_0016.input
@@ -0,0 +1 @@
+(x 42)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0017.expected b/src/tests/parser/arg/arg_0017.expected
new file mode 100644
index 000000000..1b123b06a
--- /dev/null
+++ b/src/tests/parser/arg/arg_0017.expected
@@ -0,0 +1,9 @@
+Failure @8 (⟨1, 8⟩): expected ')'
+Final stack:
+  (Verso.Syntax.named
+   "("
+   `x
+   ":="
+   (Verso.Syntax.arg_num (num "42"))
+   <missing>)
+Remaining: "\n)"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0017.input b/src/tests/parser/arg/arg_0017.input
new file mode 100644
index 000000000..f4bad7dba
--- /dev/null
+++ b/src/tests/parser/arg/arg_0017.input
@@ -0,0 +1,2 @@
+(x := 42
+)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0018.expected b/src/tests/parser/arg/arg_0018.expected
new file mode 100644
index 000000000..eb16be359
--- /dev/null
+++ b/src/tests/parser/arg/arg_0018.expected
@@ -0,0 +1,9 @@
+Failure @8 (⟨1, 8⟩): expected ')'
+Final stack:
+  (Verso.Syntax.named
+   "("
+   `x
+   ":="
+   (Verso.Syntax.arg_num (num "42"))
+   <missing>)
+Remaining: "\na"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0018.input b/src/tests/parser/arg/arg_0018.input
new file mode 100644
index 000000000..50b0fa2b5
--- /dev/null
+++ b/src/tests/parser/arg/arg_0018.input
@@ -0,0 +1,2 @@
+(x := 42
+a
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0001.expected b/src/tests/parser/args/args_0001.expected
new file mode 100644
index 000000000..c03173049
--- /dev/null
+++ b/src/tests/parser/args/args_0001.expected
@@ -0,0 +1,5 @@
+Success! Final stack:
+  [(Verso.Syntax.anon
+    (Verso.Syntax.arg_num (num "43")))]
+Remaining:
+"\n\"foo\""
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0001.input b/src/tests/parser/args/args_0001.input
new file mode 100644
index 000000000..4c37dc640
--- /dev/null
+++ b/src/tests/parser/args/args_0001.input
@@ -0,0 +1,2 @@
+43
+"foo"
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0002.expected b/src/tests/parser/args/args_0002.expected
new file mode 100644
index 000000000..a74107a79
--- /dev/null
+++ b/src/tests/parser/args/args_0002.expected
@@ -0,0 +1,9 @@
+Success! Final stack:
+  [(Verso.Syntax.named_no_paren
+    `dialect
+    ":="
+    (Verso.Syntax.arg_str (str "\"chicken\"")))
+   (Verso.Syntax.anon
+    (Verso.Syntax.arg_num (num "43")))]
+Remaining:
+"\nfoo"
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0002.input b/src/tests/parser/args/args_0002.input
new file mode 100644
index 000000000..d504d62b7
--- /dev/null
+++ b/src/tests/parser/args/args_0002.input
@@ -0,0 +1,2 @@
+dialect:="chicken" 43
+foo
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0003.expected b/src/tests/parser/args/args_0003.expected
new file mode 100644
index 000000000..284274ffd
--- /dev/null
+++ b/src/tests/parser/args/args_0003.expected
@@ -0,0 +1,9 @@
+Success! Final stack:
+  [(Verso.Syntax.named_no_paren
+    `dialect
+    ":="
+    (Verso.Syntax.arg_str (str "\"chicken\"")))
+   (Verso.Syntax.anon
+    (Verso.Syntax.arg_num (num "43")))]
+Remaining:
+"\n(foo)"
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0003.input b/src/tests/parser/args/args_0003.input
new file mode 100644
index 000000000..cc8949933
--- /dev/null
+++ b/src/tests/parser/args/args_0003.input
@@ -0,0 +1,2 @@
+dialect:="chicken" 43
+(foo)
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0001.expected b/src/tests/parser/block/block_0001.expected
new file mode 100644
index 000000000..a849e7336
--- /dev/null
+++ b/src/tests/parser/block/block_0001.expected
@@ -0,0 +1,36 @@
+Success! Final stack:
+  (Verso.Syntax.ul
+   "ul{"
+   [(Verso.Syntax.li
+     "*"
+     [(Verso.Syntax.para
+       "para{"
+       [(Verso.Syntax.text
+         (str "\"Here's a bullet\""))]
+       "}")])
+    (Verso.Syntax.li
+     "*"
+     [(Verso.Syntax.para
+       "para{"
+       [(Verso.Syntax.text
+         (str
+          "\"and another with some code in it\""))]
+       "}")
+      (Verso.Syntax.codeblock
+       "````"
+       [`lean []]
+       "\n"
+       (str "\"hey\\n\\nthere\\n\"")
+       "````")])
+    (Verso.Syntax.li
+     "*"
+     [(Verso.Syntax.para
+       "para{"
+       [(Verso.Syntax.text
+         (str "\"and another one\""))
+        (Verso.Syntax.linebreak
+         "line!"
+         (str "\"\\n\""))]
+       "}")])]
+   "}")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0001.input b/src/tests/parser/block/block_0001.input
new file mode 100644
index 000000000..4df9d39f7
--- /dev/null
+++ b/src/tests/parser/block/block_0001.input
@@ -0,0 +1,8 @@
+ * Here's a bullet
+ * and another with some code in it
+    ````lean
+    hey
+
+    there
+    ````
+ * and another one
diff --git a/src/tests/parser/block/block_0002.expected b/src/tests/parser/block/block_0002.expected
new file mode 100644
index 000000000..a41d1291f
--- /dev/null
+++ b/src/tests/parser/block/block_0002.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.command "{" `test [] "}")
+Remaining:
+"Here's a paragraph."
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0002.input b/src/tests/parser/block/block_0002.input
new file mode 100644
index 000000000..fd9bf99e3
--- /dev/null
+++ b/src/tests/parser/block/block_0002.input
@@ -0,0 +1,2 @@
+{test}
+Here's a paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0003.expected b/src/tests/parser/block/block_0003.expected
new file mode 100644
index 000000000..668621f4b
--- /dev/null
+++ b/src/tests/parser/block/block_0003.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.command "{" `test [] "}")
+Remaining:
+" Here's a paragraph."
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0003.input b/src/tests/parser/block/block_0003.input
new file mode 100644
index 000000000..abea64d71
--- /dev/null
+++ b/src/tests/parser/block/block_0003.input
@@ -0,0 +1,2 @@
+{test}
+ Here's a paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0004.expected b/src/tests/parser/block/block_0004.expected
new file mode 100644
index 000000000..668621f4b
--- /dev/null
+++ b/src/tests/parser/block/block_0004.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.command "{" `test [] "}")
+Remaining:
+" Here's a paragraph."
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0004.input b/src/tests/parser/block/block_0004.input
new file mode 100644
index 000000000..abea64d71
--- /dev/null
+++ b/src/tests/parser/block/block_0004.input
@@ -0,0 +1,2 @@
+{test}
+ Here's a paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0005.expected b/src/tests/parser/block/block_0005.expected
new file mode 100644
index 000000000..a41d1291f
--- /dev/null
+++ b/src/tests/parser/block/block_0005.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.command "{" `test [] "}")
+Remaining:
+"Here's a paragraph."
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0005.input b/src/tests/parser/block/block_0005.input
new file mode 100644
index 000000000..fd9bf99e3
--- /dev/null
+++ b/src/tests/parser/block/block_0005.input
@@ -0,0 +1,2 @@
+{test}
+Here's a paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0006.expected b/src/tests/parser/block/block_0006.expected
new file mode 100644
index 000000000..8ff33eef6
--- /dev/null
+++ b/src/tests/parser/block/block_0006.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.command "{" `test [] "}")
+Remaining:
+"> Here's a blockquote\n\n with multiple paras\n\nthat ends"
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0006.input b/src/tests/parser/block/block_0006.input
new file mode 100644
index 000000000..64bb700af
--- /dev/null
+++ b/src/tests/parser/block/block_0006.input
@@ -0,0 +1,6 @@
+{test}
+> Here's a blockquote
+
+ with multiple paras
+
+that ends
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0007.expected b/src/tests/parser/block/block_0007.expected
new file mode 100644
index 000000000..d3514372b
--- /dev/null
+++ b/src/tests/parser/block/block_0007.expected
@@ -0,0 +1,15 @@
+2 failures:
+  @36 (⟨3, 28⟩): expected identifier
+    ""
+  @36 (⟨3, 28⟩): unexpected end of input; expected '![', '$$', '$', '[' or '[^'
+    ""
+
+Final stack:
+  (Verso.Syntax.para
+   "para{"
+   [(Verso.Syntax.role
+     "{"
+     <missing>
+     "["
+     [(Verso.Syntax.footnote <missing>)]
+     "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0007.input b/src/tests/parser/block/block_0007.input
new file mode 100644
index 000000000..90abe7906
--- /dev/null
+++ b/src/tests/parser/block/block_0007.input
@@ -0,0 +1,3 @@
+{
+test}
+Here's a modified paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0008.expected b/src/tests/parser/block/block_0008.expected
new file mode 100644
index 000000000..33740a7c2
--- /dev/null
+++ b/src/tests/parser/block/block_0008.expected
@@ -0,0 +1,15 @@
+2 failures:
+  @37 (⟨3, 28⟩): expected identifier
+    ""
+  @37 (⟨3, 28⟩): unexpected end of input; expected '![', '$$', '$', '[' or '[^'
+    ""
+
+Final stack:
+  (Verso.Syntax.para
+   "para{"
+   [(Verso.Syntax.role
+     "{"
+     <missing>
+     "["
+     [(Verso.Syntax.footnote <missing>)]
+     "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0008.input b/src/tests/parser/block/block_0008.input
new file mode 100644
index 000000000..997a2d049
--- /dev/null
+++ b/src/tests/parser/block/block_0008.input
@@ -0,0 +1,3 @@
+{
+ test}
+Here's a modified paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0009.expected b/src/tests/parser/block/block_0009.expected
new file mode 100644
index 000000000..df6c04797
--- /dev/null
+++ b/src/tests/parser/block/block_0009.expected
@@ -0,0 +1,15 @@
+2 failures:
+  @44 (⟨4, 28⟩): expected identifier
+    ""
+  @44 (⟨4, 28⟩): unexpected end of input; expected '![', '$$', '$', '[' or '[^'
+    ""
+
+Final stack:
+  (Verso.Syntax.para
+   "para{"
+   [(Verso.Syntax.role
+     "{"
+     <missing>
+     "["
+     [(Verso.Syntax.footnote <missing>)]
+     "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0009.input b/src/tests/parser/block/block_0009.input
new file mode 100644
index 000000000..261c6bc86
--- /dev/null
+++ b/src/tests/parser/block/block_0009.input
@@ -0,0 +1,4 @@
+{
+    test
+arg}
+Here's a modified paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0010.expected b/src/tests/parser/block/block_0010.expected
new file mode 100644
index 000000000..7261e8e79
--- /dev/null
+++ b/src/tests/parser/block/block_0010.expected
@@ -0,0 +1,15 @@
+2 failures:
+  @45 (⟨4, 28⟩): expected identifier
+    ""
+  @45 (⟨4, 28⟩): unexpected end of input; expected '![', '$$', '$', '[' or '[^'
+    ""
+
+Final stack:
+  (Verso.Syntax.para
+   "para{"
+   [(Verso.Syntax.role
+     "{"
+     <missing>
+     "["
+     [(Verso.Syntax.footnote <missing>)]
+     "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0010.input b/src/tests/parser/block/block_0010.input
new file mode 100644
index 000000000..a6bccc014
--- /dev/null
+++ b/src/tests/parser/block/block_0010.input
@@ -0,0 +1,4 @@
+{
+    test
+ arg}
+Here's a modified paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0011.expected b/src/tests/parser/block/block_0011.expected
new file mode 100644
index 000000000..1426f8d7c
--- /dev/null
+++ b/src/tests/parser/block/block_0011.expected
@@ -0,0 +1,15 @@
+2 failures:
+  @19 (⟨6, 0⟩): '{'; expected '![', '$$', '$', '[' or '[^'
+    "Here's a paragraph."
+  @19 (⟨6, 0⟩): expected identifier
+    "Here's a paragraph."
+
+Final stack:
+  (Verso.Syntax.para
+   "para{"
+   [(Verso.Syntax.role
+     "{"
+     <missing>
+     "["
+     [(Verso.Syntax.footnote <missing>)]
+     "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0011.input b/src/tests/parser/block/block_0011.input
new file mode 100644
index 000000000..7594e9a0a
--- /dev/null
+++ b/src/tests/parser/block/block_0011.input
@@ -0,0 +1,6 @@
+{
+    test
+ arg}
+
+
+Here's a paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0012.expected b/src/tests/parser/block/block_0012.expected
new file mode 100644
index 000000000..c0e0de3c3
--- /dev/null
+++ b/src/tests/parser/block/block_0012.expected
@@ -0,0 +1,82 @@
+Success! Final stack:
+  (Verso.Syntax.ul
+   "ul{"
+   [(Verso.Syntax.li
+     "*"
+     [(Verso.Syntax.para
+       "para{"
+       [(Verso.Syntax.code
+         "`"
+         (str "\"structure\"")
+         "`")
+        (Verso.Syntax.text (str "\" and \""))
+        (Verso.Syntax.code
+         "`"
+         (str "\"inductive\"")
+         "`")
+        (Verso.Syntax.text (str "\" commands\""))]
+       "}")
+      (Verso.Syntax.ul
+       "ul{"
+       [(Verso.Syntax.li
+         "*"
+         [(Verso.Syntax.para
+           "para{"
+           [(Verso.Syntax.link
+             "["
+             [(Verso.Syntax.text
+               (str "\"#5842\""))]
+             "]"
+             (Verso.Syntax.url
+              "("
+              (str
+               "\"https://github.com/leanprover/lean4/pull/5842\"")
+              ")"))
+            (Verso.Syntax.text (str "\" and \""))
+            (Verso.Syntax.link
+             "["
+             [(Verso.Syntax.text
+               (str "\"#5783\""))]
+             "]"
+             (Verso.Syntax.url
+              "("
+              (str
+               "\"https://github.com/leanprover/lean4/pull/5783\"")
+              ")"))
+            (Verso.Syntax.text
+             (str
+              "\" implement a feature where the \""))
+            (Verso.Syntax.code
+             "`"
+             (str "\"structure\"")
+             "`")
+            (Verso.Syntax.text
+             (str
+              "\" command can now define recursive inductive types:\""))]
+           "}")
+          (Verso.Syntax.codeblock
+           "```"
+           [`lean []]
+           "\n"
+           (str
+            "\"structure Tree where\\n  n : Nat\\n  children : Fin n → Tree\\n\\ndef Tree.size : Tree → Nat\\n  | {n, children} => Id.run do\\n    let mut s := 0\\n    for h : i in [0 : n] do\\n      s := s + (children ⟨i, h.2⟩).size\\n    pure s\\n\"")
+           "```")])
+        (Verso.Syntax.li
+         "*"
+         [(Verso.Syntax.para
+           "para{"
+           [(Verso.Syntax.link
+             "["
+             [(Verso.Syntax.text
+               (str "\"#5814\""))]
+             "]"
+             (Verso.Syntax.url
+              "("
+              (str
+               "\"https://github.com/leanprover/lean4/pull/5814\"")
+              ")"))
+            (Verso.Syntax.text (str "\" \""))]
+           "}")])]
+       "}")])]
+   "}")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0012.input b/src/tests/parser/block/block_0012.input
new file mode 100644
index 000000000..0262cfe75
--- /dev/null
+++ b/src/tests/parser/block/block_0012.input
@@ -0,0 +1,15 @@
+* `structure` and `inductive` commands
+  * [#5842](https://github.com/leanprover/lean4/pull/5842) and [#5783](https://github.com/leanprover/lean4/pull/5783) implement a feature where the `structure` command can now define recursive inductive types:
+    ```lean
+    structure Tree where
+      n : Nat
+      children : Fin n → Tree
+
+    def Tree.size : Tree → Nat
+      | {n, children} => Id.run do
+        let mut s := 0
+        for h : i in [0 : n] do
+          s := s + (children ⟨i, h.2⟩).size
+        pure s
+    ```
+  * [#5814](https://github.com/leanprover/lean4/pull/5814) 
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0001.expected b/src/tests/parser/block/blocks/blocks_0001.expected
new file mode 100644
index 000000000..eda419d87
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0001.expected
@@ -0,0 +1,12 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str
+       "\"This is just some textual content. How is it?\""))]
+    "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"More?\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0001.input b/src/tests/parser/block/blocks/blocks_0001.input
new file mode 100644
index 000000000..969555e23
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0001.input
@@ -0,0 +1,3 @@
+This is just some textual content. How is it?
+
+More?
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0002.expected b/src/tests/parser/block/blocks/blocks_0002.expected
new file mode 100644
index 000000000..738114201
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0002.expected
@@ -0,0 +1,12 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str "\"Newlines are preserved\""))
+     (Verso.Syntax.linebreak
+      "line!"
+      (str "\"\\n\""))
+     (Verso.Syntax.text
+      (str "\"in paragraphs.\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0002.input b/src/tests/parser/block/blocks/blocks_0002.input
new file mode 100644
index 000000000..299045673
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0002.input
@@ -0,0 +1,2 @@
+Newlines are preserved
+in paragraphs.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0003.expected b/src/tests/parser/block/blocks/blocks_0003.expected
new file mode 100644
index 000000000..4f5930df1
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0003.expected
@@ -0,0 +1,23 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str
+       "\"I can describe lists like this one:\""))]
+    "}")
+   (Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"a\""))]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"b\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0003.input b/src/tests/parser/block/blocks/blocks_0003.input
new file mode 100644
index 000000000..d6a59d7b0
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0003.input
@@ -0,0 +1,4 @@
+I can describe lists like this one:
+
+* a
+* b
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0004.expected b/src/tests/parser/block/blocks/blocks_0004.expected
new file mode 100644
index 000000000..7271e0ce7
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0004.expected
@@ -0,0 +1,43 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.ul
+        "ul{"
+        [(Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"A1\""))]
+            "}")])
+         (Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"A2\""))]
+            "}")])]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"B\""))]
+        "}")
+       (Verso.Syntax.ul
+        "ul{"
+        [(Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"B1\""))]
+            "}")])
+         (Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"B2\""))]
+            "}")])]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0004.input b/src/tests/parser/block/blocks/blocks_0004.input
new file mode 100644
index 000000000..01fd606d6
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0004.input
@@ -0,0 +1,5 @@
+* * A1
+  * A2
+* B
+ * B1
+ * B2
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0005.expected b/src/tests/parser/block/blocks/blocks_0005.expected
new file mode 100644
index 000000000..b1c550ca4
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0005.expected
@@ -0,0 +1,36 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.ul
+        "ul{"
+        [(Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"A1\""))]
+            "}")])
+         (Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"A2\""))
+             (Verso.Syntax.linebreak
+              "line!"
+              (str "\"\\n\""))]
+            "}")])]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.ul
+        "ul{"
+        [(Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"B1\""))]
+            "}")])]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0005.input b/src/tests/parser/block/blocks/blocks_0005.input
new file mode 100644
index 000000000..ec098bb68
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0005.input
@@ -0,0 +1,5 @@
+* 
+ * A1
+ * A2
+*
+ * B1
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0006.expected b/src/tests/parser/block/blocks/blocks_0006.expected
new file mode 100644
index 000000000..b1c550ca4
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0006.expected
@@ -0,0 +1,36 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.ul
+        "ul{"
+        [(Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"A1\""))]
+            "}")])
+         (Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"A2\""))
+             (Verso.Syntax.linebreak
+              "line!"
+              (str "\"\\n\""))]
+            "}")])]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.ul
+        "ul{"
+        [(Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"B1\""))]
+            "}")])]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0006.input b/src/tests/parser/block/blocks/blocks_0006.input
new file mode 100644
index 000000000..922dac70e
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0006.input
@@ -0,0 +1,5 @@
+*
+ * A1
+ * A2
+*
+ * B1
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0007.expected b/src/tests/parser/block/blocks/blocks_0007.expected
new file mode 100644
index 000000000..c6f681b28
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0007.expected
@@ -0,0 +1,11 @@
+Failure @2 (⟨2, 0⟩): ':'; expected %%% (at line beginning) or expected column at least 1
+Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.metadata_block
+        <missing>
+        <missing>)
+       <missing>])])]
+Remaining: "abc"
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0007.input b/src/tests/parser/block/blocks/blocks_0007.input
new file mode 100644
index 000000000..c869ff73c
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0007.input
@@ -0,0 +1,2 @@
+*
+abc
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0008.expected b/src/tests/parser/block/blocks/blocks_0008.expected
new file mode 100644
index 000000000..5f2ee8592
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0008.expected
@@ -0,0 +1,15 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"abc\""))]
+        "}")
+       (Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"def\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0008.input b/src/tests/parser/block/blocks/blocks_0008.input
new file mode 100644
index 000000000..3f9863c17
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0008.input
@@ -0,0 +1,4 @@
+*
+ abc
+
+ def
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0009.expected b/src/tests/parser/block/blocks/blocks_0009.expected
new file mode 100644
index 000000000..77d7094f0
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0009.expected
@@ -0,0 +1,15 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"abc\""))]
+        "}")])]
+    "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"def\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0009.input b/src/tests/parser/block/blocks/blocks_0009.input
new file mode 100644
index 000000000..c5c569ead
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0009.input
@@ -0,0 +1,4 @@
+*
+ abc
+
+def
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0010.expected b/src/tests/parser/block/blocks/blocks_0010.expected
new file mode 100644
index 000000000..e63e95469
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0010.expected
@@ -0,0 +1,20 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"foo\""))]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"bar\""))
+         (Verso.Syntax.linebreak
+          "line!"
+          (str "\"\\n\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0010.input b/src/tests/parser/block/blocks/blocks_0010.input
new file mode 100644
index 000000000..0beb3ff0d
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0010.input
@@ -0,0 +1,2 @@
+* foo
+* bar
diff --git a/src/tests/parser/block/blocks/blocks_0011.expected b/src/tests/parser/block/blocks/blocks_0011.expected
new file mode 100644
index 000000000..31f1bcb88
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0011.expected
@@ -0,0 +1,13 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.ul
+      "ul{"
+      [(Verso.Syntax.li
+        "*"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"foo\""))]
+          "}")])]
+      "}")])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0011.input b/src/tests/parser/block/blocks/blocks_0011.input
new file mode 100644
index 000000000..64c346a42
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0011.input
@@ -0,0 +1 @@
+> * foo
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0012.expected b/src/tests/parser/block/blocks/blocks_0012.expected
new file mode 100644
index 000000000..dd8f64e30
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0012.expected
@@ -0,0 +1,16 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.ol
+      "ol("
+      (num "1")
+      ")"
+      "{"
+      [(Verso.Syntax.li
+        "1."
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"foo\""))]
+          "}")])]
+      "}")])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0012.input b/src/tests/parser/block/blocks/blocks_0012.input
new file mode 100644
index 000000000..52b2693d0
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0012.input
@@ -0,0 +1 @@
+> 1. foo
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0013.expected b/src/tests/parser/block/blocks/blocks_0013.expected
new file mode 100644
index 000000000..a51fcb64a
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0013.expected
@@ -0,0 +1,22 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.ul
+      "ul{"
+      [(Verso.Syntax.li
+        "*"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"foo\""))]
+          "}")])]
+      "}")
+     (Verso.Syntax.ul
+      "ul{"
+      [(Verso.Syntax.li
+        "*"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"foo\""))]
+          "}")])]
+      "}")])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0013.input b/src/tests/parser/block/blocks/blocks_0013.input
new file mode 100644
index 000000000..d8da76684
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0013.input
@@ -0,0 +1,4 @@
+> * foo
+
+
+ * foo
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0014.expected b/src/tests/parser/block/blocks/blocks_0014.expected
new file mode 100644
index 000000000..c8cf40b3d
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0014.expected
@@ -0,0 +1,23 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text
+        (str "\"I like quotes\""))]
+      "}")
+     (Verso.Syntax.ul
+      "ul{"
+      [(Verso.Syntax.li
+        "*"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text
+            (str "\"Also with lists in them\""))]
+          "}")])]
+      "}")])
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"Abc\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0014.input b/src/tests/parser/block/blocks/blocks_0014.input
new file mode 100644
index 000000000..d79b1d807
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0014.input
@@ -0,0 +1,4 @@
+> I like quotes
+  * Also with lists in them
+
+Abc
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0015.expected b/src/tests/parser/block/blocks/blocks_0015.expected
new file mode 100644
index 000000000..ab77bea55
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0015.expected
@@ -0,0 +1,19 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.ul
+      "ul{"
+      [(Verso.Syntax.li
+        "*"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"foo\""))]
+          "}")])
+       (Verso.Syntax.li
+        "*"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"foo\""))]
+          "}")])]
+      "}")])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0015.input b/src/tests/parser/block/blocks/blocks_0015.input
new file mode 100644
index 000000000..01bc81c9d
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0015.input
@@ -0,0 +1,4 @@
+> * foo
+
+
+  * foo
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0016.expected b/src/tests/parser/block/blocks/blocks_0016.expected
new file mode 100644
index 000000000..6cdf93047
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0016.expected
@@ -0,0 +1,24 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.blockquote
+      ">"
+      [(Verso.Syntax.ul
+        "ul{"
+        [(Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"foo\""))]
+            "}")])]
+        "}")])
+     (Verso.Syntax.ul
+      "ul{"
+      [(Verso.Syntax.li
+        "*"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"foo\""))]
+          "}")])]
+      "}")])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0016.input b/src/tests/parser/block/blocks/blocks_0016.input
new file mode 100644
index 000000000..463d4206b
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0016.input
@@ -0,0 +1,4 @@
+> > * foo
+
+
+ * foo
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0017.expected b/src/tests/parser/block/blocks/blocks_0017.expected
new file mode 100644
index 000000000..69745737a
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0017.expected
@@ -0,0 +1,22 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.ul
+      "ul{"
+      [(Verso.Syntax.li
+        "*"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"foo\""))]
+          "}")])]
+      "}")])
+   (Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"foo\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0017.input b/src/tests/parser/block/blocks/blocks_0017.input
new file mode 100644
index 000000000..3c07cef11
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0017.input
@@ -0,0 +1,4 @@
+> * foo
+
+
+* foo
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0018.expected b/src/tests/parser/block/blocks/blocks_0018.expected
new file mode 100644
index 000000000..7ac7b65e6
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0018.expected
@@ -0,0 +1,16 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"foo\""))
+         (Verso.Syntax.linebreak
+          "line!"
+          (str "\"\\n\""))
+         (Verso.Syntax.text (str "\"  thing\""))]
+        "}")])]
+    "}")]
+Remaining:
+"* bar\n"
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0018.input b/src/tests/parser/block/blocks/blocks_0018.input
new file mode 100644
index 000000000..d4e4b0971
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0018.input
@@ -0,0 +1,2 @@
+* foo
+  thing* bar
diff --git a/src/tests/parser/block/blocks/blocks_0019.expected b/src/tests/parser/block/blocks/blocks_0019.expected
new file mode 100644
index 000000000..9f64cd912
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0019.expected
@@ -0,0 +1,20 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "+"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"foo\""))]
+        "}")])
+     (Verso.Syntax.li
+      "+"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"bar\""))
+         (Verso.Syntax.linebreak
+          "line!"
+          (str "\"\\n\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0019.input b/src/tests/parser/block/blocks/blocks_0019.input
new file mode 100644
index 000000000..85270e40a
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0019.input
@@ -0,0 +1,2 @@
++ foo
++ bar
diff --git a/src/tests/parser/block/blocks/blocks_0020.expected b/src/tests/parser/block/blocks/blocks_0020.expected
new file mode 100644
index 000000000..e63e95469
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0020.expected
@@ -0,0 +1,20 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"foo\""))]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"bar\""))
+         (Verso.Syntax.linebreak
+          "line!"
+          (str "\"\\n\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0020.input b/src/tests/parser/block/blocks/blocks_0020.input
new file mode 100644
index 000000000..d642871e5
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0020.input
@@ -0,0 +1,3 @@
+* foo
+
+* bar
diff --git a/src/tests/parser/block/blocks/blocks_0021.expected b/src/tests/parser/block/blocks/blocks_0021.expected
new file mode 100644
index 000000000..5f33ae54c
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0021.expected
@@ -0,0 +1,34 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"foo\""))
+         (Verso.Syntax.linebreak
+          "line!"
+          (str "\"\\n\""))
+         (Verso.Syntax.text (str "\"  stuff\""))]
+        "}")
+       (Verso.Syntax.blockquote
+        ">"
+        [(Verso.Syntax.para
+          "para{"
+          [(Verso.Syntax.text (str "\"more \""))]
+          "}")])
+       (Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"abc\""))]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"bar\""))
+         (Verso.Syntax.linebreak
+          "line!"
+          (str "\"\\n\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0021.input b/src/tests/parser/block/blocks/blocks_0021.input
new file mode 100644
index 000000000..f19eabdd3
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0021.input
@@ -0,0 +1,9 @@
+* foo
+  stuff
+
+ > more 
+
+ abc
+
+
+* bar
diff --git a/src/tests/parser/block/blocks/blocks_0022.expected b/src/tests/parser/block/blocks/blocks_0022.expected
new file mode 100644
index 000000000..1008dfbdb
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0022.expected
@@ -0,0 +1,27 @@
+Success! Final stack:
+  [(Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"foo\""))]
+        "}")
+       (Verso.Syntax.ul
+        "ul{"
+        [(Verso.Syntax.li
+          "*"
+          [(Verso.Syntax.para
+            "para{"
+            [(Verso.Syntax.text (str "\"bar\""))]
+            "}")])]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text
+          (str "\"more outer\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0022.input b/src/tests/parser/block/blocks/blocks_0022.input
new file mode 100644
index 000000000..54bc72892
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0022.input
@@ -0,0 +1,3 @@
+* foo
+  * bar
+* more outer
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0023.expected b/src/tests/parser/block/blocks/blocks_0023.expected
new file mode 100644
index 000000000..dc4a0a53b
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0023.expected
@@ -0,0 +1,18 @@
+Failure @35 (⟨2, 15⟩): unexpected end of input; expected %%% (at line beginning), '![', '$$', '$', '[', '[^', beginning of line at ⟨2, 15⟩ or beginning of line or sequence of nestable block openers at ⟨2, 15⟩
+Final stack:
+  [(Verso.Syntax.dl
+    "dl{"
+    [(Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text
+        (str "\" an excellent idea\""))
+       (Verso.Syntax.linebreak
+        "line!"
+        (str "\"\\n\""))
+       (Verso.Syntax.text
+        (str "\"Let's say more!\""))]
+      "=>"
+      [(Verso.Syntax.metadata_block <missing>)
+       <missing>])]
+    "}")]
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0023.input b/src/tests/parser/block/blocks/blocks_0023.input
new file mode 100644
index 000000000..4b00c1d1a
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0023.input
@@ -0,0 +1,2 @@
+: an excellent idea
+Let's say more!
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0024.expected b/src/tests/parser/block/blocks/blocks_0024.expected
new file mode 100644
index 000000000..9b6f82c60
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0024.expected
@@ -0,0 +1,15 @@
+Success! Final stack:
+  [(Verso.Syntax.dl
+    "dl{"
+    [(Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text
+        (str "\" an excellent idea\""))]
+      "=>"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text
+          (str "\"Let's say more!\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0024.input b/src/tests/parser/block/blocks/blocks_0024.input
new file mode 100644
index 000000000..87fb7f1ce
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0024.input
@@ -0,0 +1,3 @@
+: an excellent idea
+
+    Let's say more!
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0025.expected b/src/tests/parser/block/blocks/blocks_0025.expected
new file mode 100644
index 000000000..71b8efbe0
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0025.expected
@@ -0,0 +1,21 @@
+Failure @47 (⟨7, 0⟩): expected indentation at least 1
+Final stack:
+  [(Verso.Syntax.dl
+    "dl{"
+    [(Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text
+        (str "\" an excellent idea\""))]
+      "=>"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text
+          (str "\"Let's say more!\""))]
+        "}")])
+     (Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text (str "\" more\""))]
+      "=>"
+      <missing>)]
+    "}")]
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0025.input b/src/tests/parser/block/blocks/blocks_0025.input
new file mode 100644
index 000000000..853f9c9f1
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0025.input
@@ -0,0 +1,6 @@
+: an excellent idea
+
+ Let's say more!
+
+: more
+
diff --git a/src/tests/parser/block/blocks/blocks_0026.expected b/src/tests/parser/block/blocks/blocks_0026.expected
new file mode 100644
index 000000000..bd39b0881
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0026.expected
@@ -0,0 +1,24 @@
+Success! Final stack:
+  [(Verso.Syntax.dl
+    "dl{"
+    [(Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text
+        (str "\" an excellent idea\""))]
+      "=>"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text
+          (str "\"Let's say more!\""))]
+        "}")])
+     (Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text (str "\" more\""))]
+      "=>"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text
+          (str "\"even more!\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0026.input b/src/tests/parser/block/blocks/blocks_0026.input
new file mode 100644
index 000000000..565be32b5
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0026.input
@@ -0,0 +1,10 @@
+: an excellent idea
+
+ Let's say more!
+
+
+
+
+: more
+
+ even more!
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0027.expected b/src/tests/parser/block/blocks/blocks_0027.expected
new file mode 100644
index 000000000..532705620
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0027.expected
@@ -0,0 +1,23 @@
+Success! Final stack:
+  [(Verso.Syntax.dl
+    "dl{"
+    [(Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text
+        (str "\" an excellent idea\""))]
+      "=>"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text
+          (str "\"Let's say more!\""))]
+        "}")])
+     (Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text (str "\" more\""))]
+      "=>"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"stuff\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0027.input b/src/tests/parser/block/blocks/blocks_0027.input
new file mode 100644
index 000000000..246e961dc
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0027.input
@@ -0,0 +1,7 @@
+: an excellent idea
+
+ Let's say more!
+
+: more
+
+ stuff
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0028.expected b/src/tests/parser/block/blocks/blocks_0028.expected
new file mode 100644
index 000000000..c60221983
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0028.expected
@@ -0,0 +1,21 @@
+Failure @21 (⟨3, 0⟩): expected indentation at least 1
+Final stack:
+  [(Verso.Syntax.dl
+    "dl{"
+    [(Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text
+        (str "\" an excellent idea\""))]
+      "=>"
+      <missing>)]
+    "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str "\"Let's say more!\""))]
+    "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"hello\""))]
+    "}")]
+Remaining: "Let's say more!\n\nhello"
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0028.input b/src/tests/parser/block/blocks/blocks_0028.input
new file mode 100644
index 000000000..b57d0e425
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0028.input
@@ -0,0 +1,5 @@
+: an excellent idea
+
+Let's say more!
+
+hello
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0029.expected b/src/tests/parser/block/blocks/blocks_0029.expected
new file mode 100644
index 000000000..b2ebb4f89
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0029.expected
@@ -0,0 +1,20 @@
+Success! Final stack:
+  [(Verso.Syntax.ol
+    "ol("
+    (num "1")
+    ")"
+    "{"
+    [(Verso.Syntax.li
+      "1."
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"Hello\""))]
+        "}")])
+     (Verso.Syntax.li
+      "2."
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"World\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0029.input b/src/tests/parser/block/blocks/blocks_0029.input
new file mode 100644
index 000000000..0300bf11f
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0029.input
@@ -0,0 +1,3 @@
+1. Hello
+
+2. World
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0030.expected b/src/tests/parser/block/blocks/blocks_0030.expected
new file mode 100644
index 000000000..bc75acfe2
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0030.expected
@@ -0,0 +1,14 @@
+Success! Final stack:
+  [(Verso.Syntax.ol
+    "ol("
+    (num "1")
+    ")"
+    "{"
+    [(Verso.Syntax.li
+      "1."
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"Hello\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0030.input b/src/tests/parser/block/blocks/blocks_0030.input
new file mode 100644
index 000000000..2a0b5fc7a
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0030.input
@@ -0,0 +1 @@
+1. Hello
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0031.expected b/src/tests/parser/block/blocks/blocks_0031.expected
new file mode 100644
index 000000000..3a8db82df
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0031.expected
@@ -0,0 +1,26 @@
+Success! Final stack:
+  [(Verso.Syntax.ol
+    "ol("
+    (num "1")
+    ")"
+    "{"
+    [(Verso.Syntax.li
+      "1."
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"Hello\""))]
+        "}")])]
+    "}")
+   (Verso.Syntax.ol
+    "ol("
+    (num "2")
+    ")"
+    "{"
+    [(Verso.Syntax.li
+      "2."
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"World\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0031.input b/src/tests/parser/block/blocks/blocks_0031.input
new file mode 100644
index 000000000..67c8df282
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0031.input
@@ -0,0 +1,3 @@
+1. Hello
+
+ 2. World
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0032.expected b/src/tests/parser/block/blocks/blocks_0032.expected
new file mode 100644
index 000000000..b2ebb4f89
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0032.expected
@@ -0,0 +1,20 @@
+Success! Final stack:
+  [(Verso.Syntax.ol
+    "ol("
+    (num "1")
+    ")"
+    "{"
+    [(Verso.Syntax.li
+      "1."
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"Hello\""))]
+        "}")])
+     (Verso.Syntax.li
+      "2."
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"World\""))]
+        "}")])]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0032.input b/src/tests/parser/block/blocks/blocks_0032.input
new file mode 100644
index 000000000..78893485c
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0032.input
@@ -0,0 +1,3 @@
+ 1. Hello
+
+ 2. World
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0033.expected b/src/tests/parser/block/blocks/blocks_0033.expected
new file mode 100644
index 000000000..76d77b6b8
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0033.expected
@@ -0,0 +1,11 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"hey\""))
+       (Verso.Syntax.linebreak
+        "line!"
+        (str "\"\\n\""))]
+      "}")])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0033.input b/src/tests/parser/block/blocks/blocks_0033.input
new file mode 100644
index 000000000..5111d8b08
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0033.input
@@ -0,0 +1 @@
+> hey
diff --git a/src/tests/parser/block/blocks/blocks_0034.expected b/src/tests/parser/block/blocks/blocks_0034.expected
new file mode 100644
index 000000000..78ee349a7
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0034.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"n*k \""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0034.input b/src/tests/parser/block/blocks/blocks_0034.input
new file mode 100644
index 000000000..9885d3e1c
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0034.input
@@ -0,0 +1 @@
+n\*k 
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0035.expected b/src/tests/parser/block/blocks/blocks_0035.expected
new file mode 100644
index 000000000..f3fb9310f
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0035.expected
@@ -0,0 +1,15 @@
+Failure @16 (⟨1, 16⟩): '_'
+Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.bold
+      "*"
+      [(Verso.Syntax.text (str "\"This is \""))
+       (Verso.Syntax.emph
+        "_"
+        [(Verso.Syntax.text (str "\"strong\""))]
+        <missing>)]
+      "*")
+     (Verso.Syntax.text (str "\" not regular\""))]
+    "}")]
+Remaining: "* not regular_ emphasis"
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0035.input b/src/tests/parser/block/blocks/blocks_0035.input
new file mode 100644
index 000000000..7ffdc2355
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0035.input
@@ -0,0 +1 @@
+*This is _strong* not regular_ emphasis
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0036.expected b/src/tests/parser/block/blocks/blocks_0036.expected
new file mode 100644
index 000000000..bc3f54df6
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0036.expected
@@ -0,0 +1,9 @@
+Success! Final stack:
+  [(Verso.Syntax.header
+    "header("
+    (num "0")
+    ")"
+    "{"
+    [(Verso.Syntax.text (str "\"Header!\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0036.input b/src/tests/parser/block/blocks/blocks_0036.input
new file mode 100644
index 000000000..db23e08da
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0036.input
@@ -0,0 +1 @@
+# Header!
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0037.expected b/src/tests/parser/block/blocks/blocks_0037.expected
new file mode 100644
index 000000000..e3062d8d2
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0037.expected
@@ -0,0 +1,9 @@
+Success! Final stack:
+  [(Verso.Syntax.header
+    "header("
+    (num "1")
+    ")"
+    "{"
+    [(Verso.Syntax.text (str "\"Header!\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0037.input b/src/tests/parser/block/blocks/blocks_0037.input
new file mode 100644
index 000000000..38c82f4c9
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0037.input
@@ -0,0 +1 @@
+## Header!
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0038.expected b/src/tests/parser/block/blocks/blocks_0038.expected
new file mode 100644
index 000000000..937bd01e3
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0038.expected
@@ -0,0 +1,13 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"Quotation\""))
+       (Verso.Syntax.linebreak
+        "line!"
+        (str "\"\\n\""))
+       (Verso.Syntax.text
+        (str "\"and contained\""))]
+      "}")])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0038.input b/src/tests/parser/block/blocks/blocks_0038.input
new file mode 100644
index 000000000..2d642bff6
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0038.input
@@ -0,0 +1,2 @@
+> Quotation
+and contained
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0039.expected b/src/tests/parser/block/blocks/blocks_0039.expected
new file mode 100644
index 000000000..d14b934d2
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0039.expected
@@ -0,0 +1,28 @@
+Failure @65 (⟨4, 0⟩): expected '`' to close inline code
+Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"Attention:\""))]
+    "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str
+       "\"Here is a paragraph with an unterminated \""))
+     (Verso.Syntax.code
+      "`"
+      (str "\"code block\"")
+      <missing>)
+     (Verso.Syntax.text
+      (str
+       "\"that would be super annoying without error recovery in the\""))
+     (Verso.Syntax.linebreak
+      "line!"
+      (str "\"\\n\""))
+     (Verso.Syntax.text (str "\"parser.\""))]
+    "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"Yep.\""))]
+    "}")]
+Remaining: "that would be super annoying without error recovery in the\nparser.\n\nYep."
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0039.input b/src/tests/parser/block/blocks/blocks_0039.input
new file mode 100644
index 000000000..d1af6cc9b
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0039.input
@@ -0,0 +1,7 @@
+Attention:
+
+Here is a paragraph with an unterminated `code block
+that would be super annoying without error recovery in the
+parser.
+
+Yep.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0040.expected b/src/tests/parser/block/blocks/blocks_0040.expected
new file mode 100644
index 000000000..ac5aa9bf2
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0040.expected
@@ -0,0 +1,36 @@
+3 failures:
+  @73 (⟨9, 3⟩): expected directive name (identifier)
+    "\n"
+  @74 (⟨10, 0⟩): expected closing ':::' for directive from line 9
+    ""
+  @74 (⟨10, 0⟩): expected closing '::::' for directive from line 3
+    ""
+
+Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str
+       "\"Here's some error recovery for directives.\""))]
+    "}")
+   (Verso.Syntax.directive
+    "::::"
+    `foo
+    []
+    "\n"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"Indeed.\""))]
+      "}")
+     (Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"It is.\""))]
+      "}")
+     (Verso.Syntax.directive
+      ":::"
+      <missing>
+      []
+      "\n"
+      []
+      <missing>)]
+    <missing>)]
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0040.input b/src/tests/parser/block/blocks/blocks_0040.input
new file mode 100644
index 000000000..4fe94fa8e
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0040.input
@@ -0,0 +1,9 @@
+Here's some error recovery for directives.
+
+::::foo
+
+Indeed.
+
+It is.
+
+:::
diff --git a/src/tests/parser/block/blocks/blocks_0041.expected b/src/tests/parser/block/blocks/blocks_0041.expected
new file mode 100644
index 000000000..3281aca64
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0041.expected
@@ -0,0 +1,36 @@
+3 failures:
+  @68 (⟨8, 0⟩): expected closing ':::' from directive on line 3 at column 0, but it's at column 1
+    " :::\n"
+  @72 (⟨8, 4⟩): expected directive name (identifier)
+    "\n"
+  @73 (⟨9, 0⟩): expected closing ':::' for directive from line 8
+    ""
+
+Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str
+       "\"Here's some error recovery for directives.\""))]
+    "}")
+   (Verso.Syntax.directive
+    ":::"
+    `foo
+    []
+    "\n"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"Indeed.\""))]
+      "}")
+     (Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"It is.\""))]
+      "}")]
+    <missing>)
+   (Verso.Syntax.directive
+    ":::"
+    <missing>
+    []
+    "\n"
+    []
+    <missing>)]
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0041.input b/src/tests/parser/block/blocks/blocks_0041.input
new file mode 100644
index 000000000..0086cc6f8
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0041.input
@@ -0,0 +1,8 @@
+Here's some error recovery for directives.
+
+:::foo
+
+Indeed.
+
+It is.
+ :::
diff --git a/src/tests/parser/block/blocks/blocks_0042.expected b/src/tests/parser/block/blocks/blocks_0042.expected
new file mode 100644
index 000000000..6a53c0d4d
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0042.expected
@@ -0,0 +1,41 @@
+2 failures:
+  @71 (⟨8, 0⟩): expected closing '::::' for directive from line 3
+    ":::: a\n\nx\n"
+  @81 (⟨11, 0⟩): expected closing '::::' for directive from line 8
+    ""
+
+Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str
+       "\"Here's some error recovery for directives.\""))]
+    "}")
+   (Verso.Syntax.directive
+    "::::"
+    `foo
+    [(Verso.Syntax.anon
+      (Verso.Syntax.arg_num (num "5")))]
+    "\n"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"Indeed.\""))]
+      "}")
+     (Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"It is.\""))]
+      "}")]
+    <missing>)
+   (Verso.Syntax.directive
+    "::::"
+    `a
+    []
+    "\n"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"x\""))
+       (Verso.Syntax.linebreak
+        "line!"
+        (str "\"\\n\""))]
+      "}")]
+    <missing>)]
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0042.input b/src/tests/parser/block/blocks/blocks_0042.input
new file mode 100644
index 000000000..91852404e
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0042.input
@@ -0,0 +1,10 @@
+Here's some error recovery for directives.
+
+::::foo 5
+
+Indeed.
+
+It is.
+:::: a
+
+x
diff --git a/src/tests/parser/block/blocks/blocks_0043.expected b/src/tests/parser/block/blocks/blocks_0043.expected
new file mode 100644
index 000000000..6291d7cda
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0043.expected
@@ -0,0 +1,13 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"Quotation\""))]
+      "}")
+     (Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text
+        (str "\"and contained\""))]
+      "}")])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0043.input b/src/tests/parser/block/blocks/blocks_0043.input
new file mode 100644
index 000000000..eb68de8fb
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0043.input
@@ -0,0 +1,3 @@
+> Quotation
+
+ and contained
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0044.expected b/src/tests/parser/block/blocks/blocks_0044.expected
new file mode 100644
index 000000000..fb5537c42
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0044.expected
@@ -0,0 +1,13 @@
+Success! Final stack:
+  [(Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text (str "\"Quotation\""))]
+      "}")])
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str "\"and not contained\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0044.input b/src/tests/parser/block/blocks/blocks_0044.input
new file mode 100644
index 000000000..d3369a58e
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0044.input
@@ -0,0 +1,3 @@
+> Quotation
+
+and not contained
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0045.expected b/src/tests/parser/block/blocks/blocks_0045.expected
new file mode 100644
index 000000000..b3fa03dbf
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0045.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  [(Verso.Syntax.command "{" `test [] "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str "\"Here's a paragraph.\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0045.input b/src/tests/parser/block/blocks/blocks_0045.input
new file mode 100644
index 000000000..fd9bf99e3
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0045.input
@@ -0,0 +1,2 @@
+{test}
+Here's a paragraph.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0046.expected b/src/tests/parser/block/blocks/blocks_0046.expected
new file mode 100644
index 000000000..563eb217f
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0046.expected
@@ -0,0 +1,19 @@
+Success! Final stack:
+  [(Verso.Syntax.command "{" `test [] "}")
+   (Verso.Syntax.blockquote
+    ">"
+    [(Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text
+        (str "\"Here's a blockquote\""))]
+      "}")
+     (Verso.Syntax.para
+      "para{"
+      [(Verso.Syntax.text
+        (str "\"with multiple paras\""))]
+      "}")])
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"that ends\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0046.input b/src/tests/parser/block/blocks/blocks_0046.input
new file mode 100644
index 000000000..64bb700af
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0046.input
@@ -0,0 +1,6 @@
+{test}
+> Here's a blockquote
+
+ with multiple paras
+
+that ends
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0047.expected b/src/tests/parser/block/blocks/blocks_0047.expected
new file mode 100644
index 000000000..79883edeb
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0047.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  [(Verso.Syntax.command "{" `abc [] "}")
+   (Verso.Syntax.command "{" `def [] "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0047.input b/src/tests/parser/block/blocks/blocks_0047.input
new file mode 100644
index 000000000..b94927cf9
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0047.input
@@ -0,0 +1,2 @@
+{abc}
+{def}
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0048.expected b/src/tests/parser/block/blocks/blocks_0048.expected
new file mode 100644
index 000000000..210224922
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0048.expected
@@ -0,0 +1,20 @@
+Success! Final stack:
+  [(Verso.Syntax.metadata_block
+    "%%%"
+    (Term.structInstFields
+     [(Term.structInstField
+       (Term.structInstLVal `foo [])
+       [[]
+        []
+        (Term.structInstFieldDef
+         ":="
+         []
+         (num "53"))])
+      []])
+    "%%%")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str "\"Text/paragraph!\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0048.input b/src/tests/parser/block/blocks/blocks_0048.input
new file mode 100644
index 000000000..abb9bab81
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0048.input
@@ -0,0 +1,4 @@
+%%%
+foo := 53
+%%%
+Text/paragraph!
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0049.expected b/src/tests/parser/block/blocks/blocks_0049.expected
new file mode 100644
index 000000000..78ba6795e
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0049.expected
@@ -0,0 +1,22 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.link
+      "["
+      [(Verso.Syntax.text (str "\"[link A]\""))]
+      "]"
+      (Verso.Syntax.url
+       "("
+       (str "\"https://example.com\"")
+       ")"))
+     (Verso.Syntax.text (str "\" \""))
+     (Verso.Syntax.link
+      "["
+      [(Verso.Syntax.text (str "\"[link B]\""))]
+      "]"
+      (Verso.Syntax.url
+       "("
+       (str "\"https://more.example.com\"")
+       ")"))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0049.input b/src/tests/parser/block/blocks/blocks_0049.input
new file mode 100644
index 000000000..d3e16272d
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0049.input
@@ -0,0 +1 @@
+[\[link A\]](https://example.com) [\[link B\]](https://more.example.com)
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0050.expected b/src/tests/parser/block/blocks/blocks_0050.expected
new file mode 100644
index 000000000..5a53a7b9d
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0050.expected
@@ -0,0 +1,18 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.link
+      "["
+      [(Verso.Syntax.text (str "\"My link\""))]
+      "]"
+      (Verso.Syntax.ref
+       "["
+       (str "\"lean\"")
+       "]"))]
+    "}")
+   (Verso.Syntax.link_ref
+    "["
+    (str "\"lean\"")
+    "]:"
+    (str "\"https://lean-lang.org\""))]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0050.input b/src/tests/parser/block/blocks/blocks_0050.input
new file mode 100644
index 000000000..47813a544
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0050.input
@@ -0,0 +1,3 @@
+[My link][lean]
+
+[lean]: https://lean-lang.org
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0051.expected b/src/tests/parser/block/blocks/blocks_0051.expected
new file mode 100644
index 000000000..5d6b4669f
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0051.expected
@@ -0,0 +1,19 @@
+Failure @45 (⟨2, 29⟩): expected '(' or '['
+Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.link
+      "["
+      [(Verso.Syntax.text (str "\"My link\""))]
+      "]"
+      (Verso.Syntax.ref "[" (str "\"lean\"") "]"))
+     (Verso.Syntax.linebreak
+      "line!"
+      (str "\"\\n\""))
+     (Verso.Syntax.link
+      "["
+      [(Verso.Syntax.text (str "\"lean\""))]
+      "]"
+      (Verso.Syntax.url <missing>))]
+    "}")]
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0051.input b/src/tests/parser/block/blocks/blocks_0051.input
new file mode 100644
index 000000000..e1709ab1e
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0051.input
@@ -0,0 +1,2 @@
+[My link][lean]
+[lean]: https://lean-lang.org
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0052.expected b/src/tests/parser/block/blocks/blocks_0052.expected
new file mode 100644
index 000000000..fd47a903f
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0052.expected
@@ -0,0 +1,22 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.link
+      "["
+      [(Verso.Syntax.text (str "\"My link\""))]
+      "]"
+      (Verso.Syntax.ref
+       "["
+       (str "\"lean\"")
+       "]"))]
+    "}")
+   (Verso.Syntax.link_ref
+    "["
+    (str "\"lean\"")
+    "]:"
+    (str "\"https://lean-lang.org\""))
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"hello\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0052.input b/src/tests/parser/block/blocks/blocks_0052.input
new file mode 100644
index 000000000..03650fc12
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0052.input
@@ -0,0 +1,4 @@
+[My link][lean]
+
+[lean]: https://lean-lang.org
+hello
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0053.expected b/src/tests/parser/block/blocks/blocks_0053.expected
new file mode 100644
index 000000000..c70c9601b
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0053.expected
@@ -0,0 +1,16 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text (str "\"Blah blah\""))
+     (Verso.Syntax.footnote
+      "[^"
+      (str "\"1\"")
+      "]")]
+    "}")
+   (Verso.Syntax.footnote_ref
+    "[^"
+    (str "\"1\"")
+    "]:"
+    [(Verso.Syntax.text
+      (str "\"More can be said\""))])]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0053.input b/src/tests/parser/block/blocks/blocks_0053.input
new file mode 100644
index 000000000..a2c99c13c
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0053.input
@@ -0,0 +1,3 @@
+Blah blah[^1]
+
+[^1]: More can be said
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0054.expected b/src/tests/parser/block/blocks/blocks_0054.expected
new file mode 100644
index 000000000..2e0e40340
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0054.expected
@@ -0,0 +1,177 @@
+10 failures:
+  @38 (⟨4, 14⟩): expected ']'
+    "\n\n* [busted\n   link\n\n* [busted\n   _italics\n   link\n\n\n* [busted destination](hey\n\n* ![busted image alt text\n\n* ![busted image link](image.png\n\n* a *bold choice\n\n* very _italic *and bold, onto many\n   lines is OK* but don't forget...\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @57 (⟨7, 7⟩): expected ']'
+    "\n\n* [busted\n   _italics\n   link\n\n\n* [busted destination](hey\n\n* ![busted image alt text\n\n* ![busted image link](image.png\n\n* a *bold choice\n\n* very _italic *and bold, onto many\n   lines is OK* but don't forget...\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @88 (⟨11, 7⟩): '_'
+    "\n\n\n* [busted destination](hey\n\n* ![busted image alt text\n\n* ![busted image link](image.png\n\n* a *bold choice\n\n* very _italic *and bold, onto many\n   lines is OK* but don't forget...\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @88 (⟨11, 7⟩): expected ']'
+    "\n\n\n* [busted destination](hey\n\n* ![busted image alt text\n\n* ![busted image link](image.png\n\n* a *bold choice\n\n* very _italic *and bold, onto many\n   lines is OK* but don't forget...\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @117 (⟨14, 26⟩): expected ')'
+    "\n\n* ![busted image alt text\n\n* ![busted image link](image.png\n\n* a *bold choice\n\n* very _italic *and bold, onto many\n   lines is OK* but don't forget...\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @144 (⟨16, 25⟩): expected ']'
+    "\n\n* ![busted image link](image.png\n\n* a *bold choice\n\n* very _italic *and bold, onto many\n   lines is OK* but don't forget...\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @178 (⟨18, 32⟩): expected ')'
+    "\n\n* a *bold choice\n\n* very _italic *and bold, onto many\n   lines is OK* but don't forget...\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @196 (⟨20, 16⟩): '*'
+    "\n\n* very _italic *and bold, onto many\n   lines is OK* but don't forget...\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @269 (⟨23, 35⟩): '_'
+    "\n\na paragraph with [a bad link syntax](http://example.com\nis OK. The rest *works*.\n"
+  @326 (⟨25, 55⟩): expected ')'
+    "\nis OK. The rest *works*.\n"
+
+Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.linebreak
+      "line!"
+      (str "\"\\n\""))
+     (Verso.Syntax.text
+      (str "\"Error recovery tests:\""))]
+    "}")
+   (Verso.Syntax.ul
+    "ul{"
+    [(Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.link
+          "["
+          [(Verso.Syntax.text
+            (str "\"busted link\""))]
+          <missing>)]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.link
+          "["
+          [(Verso.Syntax.text (str "\"busted\""))
+           (Verso.Syntax.linebreak
+            "line!"
+            (str "\"\\n\""))
+           (Verso.Syntax.text
+            (str "\"   link\""))]
+          <missing>)]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.link
+          "["
+          [(Verso.Syntax.text (str "\"busted\""))
+           (Verso.Syntax.linebreak
+            "line!"
+            (str "\"\\n\""))
+           (Verso.Syntax.text (str "\"   \""))
+           (Verso.Syntax.emph
+            "_"
+            [(Verso.Syntax.text
+              (str "\"italics\""))
+             (Verso.Syntax.linebreak
+              "line!"
+              (str "\"\\n\""))
+             (Verso.Syntax.text
+              (str "\"   link\""))]
+            <missing>)]
+          <missing>)]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.link
+          "["
+          [(Verso.Syntax.text
+            (str "\"busted destination\""))]
+          "]"
+          (Verso.Syntax.url
+           "("
+           (str "\"hey\"")
+           <missing>))]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.image
+          "!["
+          (str "\"busted image alt text\"")
+          <missing>)]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.image
+          "!["
+          (str "\"busted image link\"")
+          "]"
+          (Verso.Syntax.url
+           "("
+           (str "\"image.png\"")
+           <missing>))]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"a \""))
+         (Verso.Syntax.bold
+          "*"
+          [(Verso.Syntax.text
+            (str "\"bold choice\""))]
+          <missing>)]
+        "}")])
+     (Verso.Syntax.li
+      "*"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text (str "\"very \""))
+         (Verso.Syntax.emph
+          "_"
+          [(Verso.Syntax.text (str "\"italic \""))
+           (Verso.Syntax.bold
+            "*"
+            [(Verso.Syntax.text
+              (str "\"and bold, onto many\""))
+             (Verso.Syntax.linebreak
+              "line!"
+              (str "\"\\n\""))
+             (Verso.Syntax.text
+              (str "\"   lines is OK\""))]
+            "*")
+           (Verso.Syntax.text
+            (str "\" but don't forget...\""))]
+          <missing>)]
+        "}")])]
+    "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str "\"a paragraph with \""))
+     (Verso.Syntax.link
+      "["
+      [(Verso.Syntax.text
+        (str "\"a bad link syntax\""))]
+      "]"
+      (Verso.Syntax.url
+       "("
+       (str "\"http://example.com\"")
+       <missing>))
+     (Verso.Syntax.linebreak
+      "line!"
+      (str "\"\\n\""))
+     (Verso.Syntax.text
+      (str "\"is OK. The rest \""))
+     (Verso.Syntax.bold
+      "*"
+      [(Verso.Syntax.text (str "\"works\""))]
+      "*")
+     (Verso.Syntax.text (str "\".\""))
+     (Verso.Syntax.linebreak
+      "line!"
+      (str "\"\\n\""))]
+    "}")]
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0054.input b/src/tests/parser/block/blocks/blocks_0054.input
new file mode 100644
index 000000000..de5a45d35
--- /dev/null
+++ b/src/tests/parser/block/blocks/blocks_0054.input
@@ -0,0 +1,26 @@
+
+Error recovery tests:
+
+* [busted link
+
+* [busted
+   link
+
+* [busted
+   _italics
+   link
+
+
+* [busted destination](hey
+
+* ![busted image alt text
+
+* ![busted image link](image.png
+
+* a *bold choice
+
+* very _italic *and bold, onto many
+   lines is OK* but don't forget...
+
+a paragraph with [a bad link syntax](http://example.com
+is OK. The rest *works*.
diff --git a/src/tests/parser/block/code/codeBlock_0001.expected b/src/tests/parser/block/code/codeBlock_0001.expected
new file mode 100644
index 000000000..0e3d78e4a
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0001.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme []]
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   "```")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0001.input b/src/tests/parser/block/code/codeBlock_0001.input
new file mode 100644
index 000000000..dc36ef62e
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0001.input
@@ -0,0 +1,4 @@
+ ``` scheme
+ (define x 4)
+ x
+ ```
diff --git a/src/tests/parser/block/code/codeBlock_0002.expected b/src/tests/parser/block/code/codeBlock_0002.expected
new file mode 100644
index 000000000..f12df710d
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0002.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme []]
+   "\n"
+   (str "\" (define x 4)\\n x\\n\"")
+   "```")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0002.input b/src/tests/parser/block/code/codeBlock_0002.input
new file mode 100644
index 000000000..f07886f27
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0002.input
@@ -0,0 +1,4 @@
+``` scheme
+ (define x 4)
+ x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0003.expected b/src/tests/parser/block/code/codeBlock_0003.expected
new file mode 100644
index 000000000..117c9482c
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0003.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   []
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   "```")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0003.input b/src/tests/parser/block/code/codeBlock_0003.input
new file mode 100644
index 000000000..f1530288c
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0003.input
@@ -0,0 +1,4 @@
+ ``` 
+ (define x 4)
+ x
+ ```
diff --git a/src/tests/parser/block/code/codeBlock_0004.expected b/src/tests/parser/block/code/codeBlock_0004.expected
new file mode 100644
index 000000000..117c9482c
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0004.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   []
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   "```")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0004.input b/src/tests/parser/block/code/codeBlock_0004.input
new file mode 100644
index 000000000..b68d97987
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0004.input
@@ -0,0 +1,4 @@
+ ```
+ (define x 4)
+ x
+ ```
diff --git a/src/tests/parser/block/code/codeBlock_0005.expected b/src/tests/parser/block/code/codeBlock_0005.expected
new file mode 100644
index 000000000..f12df710d
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0005.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme []]
+   "\n"
+   (str "\" (define x 4)\\n x\\n\"")
+   "```")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0005.input b/src/tests/parser/block/code/codeBlock_0005.input
new file mode 100644
index 000000000..f07886f27
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0005.input
@@ -0,0 +1,4 @@
+``` scheme
+ (define x 4)
+ x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0006.expected b/src/tests/parser/block/code/codeBlock_0006.expected
new file mode 100644
index 000000000..0e3d78e4a
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0006.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme []]
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   "```")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0006.input b/src/tests/parser/block/code/codeBlock_0006.input
new file mode 100644
index 000000000..c91cfd1f6
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0006.input
@@ -0,0 +1,4 @@
+``` scheme
+(define x 4)
+x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0007.expected b/src/tests/parser/block/code/codeBlock_0007.expected
new file mode 100644
index 000000000..119a0f228
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0007.expected
@@ -0,0 +1,9 @@
+Failure @32 (⟨5, 0⟩): expected column 0
+Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme []]
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   <missing>)
+Remaining: "more"
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0007.input b/src/tests/parser/block/code/codeBlock_0007.input
new file mode 100644
index 000000000..8b124f80a
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0007.input
@@ -0,0 +1,5 @@
+``` scheme
+(define x 4)
+x
+ ````
+more
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0008.expected b/src/tests/parser/block/code/codeBlock_0008.expected
new file mode 100644
index 000000000..9e884bd69
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0008.expected
@@ -0,0 +1,9 @@
+Failure @25 (⟨3, 0⟩): expected column 1
+Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme []]
+   "\n"
+   (str "\"\\n\"")
+   <missing>)
+Remaining: "x\n```"
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0008.input b/src/tests/parser/block/code/codeBlock_0008.input
new file mode 100644
index 000000000..036053708
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0008.input
@@ -0,0 +1,4 @@
+ ``` scheme
+(define x 4)
+x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0009.expected b/src/tests/parser/block/code/codeBlock_0009.expected
new file mode 100644
index 000000000..5872b1ae4
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0009.expected
@@ -0,0 +1,9 @@
+Failure @32 (⟨4, 3⟩): expected column 1
+Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme []]
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   <missing>)
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0009.input b/src/tests/parser/block/code/codeBlock_0009.input
new file mode 100644
index 000000000..946bd5816
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0009.input
@@ -0,0 +1,4 @@
+ ``` scheme
+ (define x 4)
+ x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0010.expected b/src/tests/parser/block/code/codeBlock_0010.expected
new file mode 100644
index 000000000..c6f7e19f2
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0010.expected
@@ -0,0 +1,9 @@
+Failure @25 (⟨4, 3⟩): expected column 1
+Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   []
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   <missing>)
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0010.input b/src/tests/parser/block/code/codeBlock_0010.input
new file mode 100644
index 000000000..9aaa5b01f
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0010.input
@@ -0,0 +1,4 @@
+ ```
+ (define x 4)
+ x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0011.expected b/src/tests/parser/block/code/codeBlock_0011.expected
new file mode 100644
index 000000000..bea4a2304
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0011.expected
@@ -0,0 +1,9 @@
+Failure @28 (⟨4, 3⟩): expected column 1
+Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   []
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   <missing>)
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0011.input b/src/tests/parser/block/code/codeBlock_0011.input
new file mode 100644
index 000000000..25afaa302
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0011.input
@@ -0,0 +1,4 @@
+ ```   
+ (define x 4)
+ x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0012.expected b/src/tests/parser/block/code/codeBlock_0012.expected
new file mode 100644
index 000000000..12988bc52
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0012.expected
@@ -0,0 +1,14 @@
+Success! Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme
+    [(Verso.Syntax.named_no_paren
+      `dialect
+      ":="
+      (Verso.Syntax.arg_str (str "\"chicken\"")))
+     (Verso.Syntax.anon
+      (Verso.Syntax.arg_num (num "43")))]]
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   "```")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0012.input b/src/tests/parser/block/code/codeBlock_0012.input
new file mode 100644
index 000000000..1776232fc
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0012.input
@@ -0,0 +1,4 @@
+``` scheme dialect:="chicken" 43
+(define x 4)
+x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0013.expected b/src/tests/parser/block/code/codeBlock_0013.expected
new file mode 100644
index 000000000..4cc30845e
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0013.expected
@@ -0,0 +1,14 @@
+Success! Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme
+    [(Verso.Syntax.named
+      "("
+      `dialect
+      ":="
+      (Verso.Syntax.arg_str (str "\"chicken\""))
+      ")")]]
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   "```")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0013.input b/src/tests/parser/block/code/codeBlock_0013.input
new file mode 100644
index 000000000..f11acdb95
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0013.input
@@ -0,0 +1,4 @@
+``` scheme (dialect:="chicken")
+(define x 4)
+x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0014.expected b/src/tests/parser/block/code/codeBlock_0014.expected
new file mode 100644
index 000000000..668840f31
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0014.expected
@@ -0,0 +1,15 @@
+Failure @30 (⟨1, 30⟩): expected ')'
+Final stack:
+  (Verso.Syntax.codeblock
+   "```"
+   [`scheme
+    [(Verso.Syntax.named
+      "("
+      `dialect
+      ":="
+      (Verso.Syntax.arg_str (str "\"chicken\""))
+      <missing>)]]
+   "\n"
+   (str "\"(define x 4)\\nx\\n\"")
+   "```")
+Remaining: "\n(define x 4)\nx\n```"
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0014.input b/src/tests/parser/block/code/codeBlock_0014.input
new file mode 100644
index 000000000..bd497fdc2
--- /dev/null
+++ b/src/tests/parser/block/code/codeBlock_0014.input
@@ -0,0 +1,4 @@
+``` scheme (dialect:="chicken"
+(define x 4)
+x
+```
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0001.expected b/src/tests/parser/block/directive/directive_0001.expected
new file mode 100644
index 000000000..9f4075031
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0001.expected
@@ -0,0 +1,12 @@
+Success! Final stack:
+  (Verso.Syntax.directive
+   "::::"
+   `multiPara
+   []
+   "\n"
+   [(Verso.Syntax.para
+     "para{"
+     [(Verso.Syntax.text (str "\"foo\""))]
+     "}")]
+   "::::")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0001.input b/src/tests/parser/block/directive/directive_0001.input
new file mode 100644
index 000000000..b6878d607
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0001.input
@@ -0,0 +1,3 @@
+:::: multiPara
+foo
+::::
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0002.expected b/src/tests/parser/block/directive/directive_0002.expected
new file mode 100644
index 000000000..9f4075031
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0002.expected
@@ -0,0 +1,12 @@
+Success! Final stack:
+  (Verso.Syntax.directive
+   "::::"
+   `multiPara
+   []
+   "\n"
+   [(Verso.Syntax.para
+     "para{"
+     [(Verso.Syntax.text (str "\"foo\""))]
+     "}")]
+   "::::")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0002.input b/src/tests/parser/block/directive/directive_0002.input
new file mode 100644
index 000000000..07b217bbb
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0002.input
@@ -0,0 +1,5 @@
+:::: multiPara
+
+
+foo
+::::
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0003.expected b/src/tests/parser/block/directive/directive_0003.expected
new file mode 100644
index 000000000..5a5e99bc9
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0003.expected
@@ -0,0 +1,15 @@
+Success! Final stack:
+  (Verso.Syntax.directive
+   ":::"
+   `multiPara
+   [(Verso.Syntax.named_no_paren
+     `greatness
+     ":="
+     (Verso.Syntax.arg_str (str "\"amazing!\"")))]
+   "\n"
+   [(Verso.Syntax.para
+     "para{"
+     [(Verso.Syntax.text (str "\"foo\""))]
+     "}")]
+   ":::")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0003.input b/src/tests/parser/block/directive/directive_0003.input
new file mode 100644
index 000000000..847d73799
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0003.input
@@ -0,0 +1,3 @@
+ ::: multiPara greatness:="amazing!"
+ foo
+ :::
diff --git a/src/tests/parser/block/directive/directive_0004.expected b/src/tests/parser/block/directive/directive_0004.expected
new file mode 100644
index 000000000..935e2bccd
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0004.expected
@@ -0,0 +1,22 @@
+Success! Final stack:
+  (Verso.Syntax.directive
+   ":::"
+   `multiPara
+   []
+   "\n"
+   [(Verso.Syntax.para
+     "para{"
+     [(Verso.Syntax.text (str "\"foo\""))]
+     "}")
+    (Verso.Syntax.ul
+     "ul{"
+     [(Verso.Syntax.li
+       "*"
+       [(Verso.Syntax.para
+         "para{"
+         [(Verso.Syntax.text
+           (str "\"List item \""))]
+         "}")])]
+     "}")]
+   ":::")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0004.input b/src/tests/parser/block/directive/directive_0004.input
new file mode 100644
index 000000000..9ab71c6ee
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0004.input
@@ -0,0 +1,7 @@
+ ::: multiPara
+ foo
+ 
+ 
+ 
+  * List item 
+ :::
diff --git a/src/tests/parser/block/directive/directive_0005.expected b/src/tests/parser/block/directive/directive_0005.expected
new file mode 100644
index 000000000..5ff417b7d
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0005.expected
@@ -0,0 +1,23 @@
+Success! Final stack:
+  (Verso.Syntax.directive
+   ":::"
+   `multiPara
+   [(Verso.Syntax.anon
+     (Verso.Syntax.arg_ident `thing))]
+   "\n"
+   [(Verso.Syntax.para
+     "para{"
+     [(Verso.Syntax.text (str "\"foo\""))]
+     "}")
+    (Verso.Syntax.ul
+     "ul{"
+     [(Verso.Syntax.li
+       "*"
+       [(Verso.Syntax.para
+         "para{"
+         [(Verso.Syntax.text
+           (str "\"List item \""))]
+         "}")])]
+     "}")]
+   ":::")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0005.input b/src/tests/parser/block/directive/directive_0005.input
new file mode 100644
index 000000000..2d7abfb0b
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0005.input
@@ -0,0 +1,7 @@
+ ::: multiPara thing
+ foo
+ 
+ 
+ 
+  * List item 
+ :::
diff --git a/src/tests/parser/block/directive/directive_0006.expected b/src/tests/parser/block/directive/directive_0006.expected
new file mode 100644
index 000000000..935e2bccd
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0006.expected
@@ -0,0 +1,22 @@
+Success! Final stack:
+  (Verso.Syntax.directive
+   ":::"
+   `multiPara
+   []
+   "\n"
+   [(Verso.Syntax.para
+     "para{"
+     [(Verso.Syntax.text (str "\"foo\""))]
+     "}")
+    (Verso.Syntax.ul
+     "ul{"
+     [(Verso.Syntax.li
+       "*"
+       [(Verso.Syntax.para
+         "para{"
+         [(Verso.Syntax.text
+           (str "\"List item \""))]
+         "}")])]
+     "}")]
+   ":::")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0006.input b/src/tests/parser/block/directive/directive_0006.input
new file mode 100644
index 000000000..e281f1f5b
--- /dev/null
+++ b/src/tests/parser/block/directive/directive_0006.input
@@ -0,0 +1,5 @@
+ ::: multiPara
+ foo
+
+ * List item 
+ :::
diff --git a/src/tests/parser/block/header/header_0001.expected b/src/tests/parser/block/header/header_0001.expected
new file mode 100644
index 000000000..9f1422f48
--- /dev/null
+++ b/src/tests/parser/block/header/header_0001.expected
@@ -0,0 +1,9 @@
+Success! Final stack:
+  (Verso.Syntax.header
+   "header("
+   (num "0")
+   ")"
+   "{"
+   [(Verso.Syntax.text (str "\"Header!\""))]
+   "}")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/header/header_0001.input b/src/tests/parser/block/header/header_0001.input
new file mode 100644
index 000000000..db23e08da
--- /dev/null
+++ b/src/tests/parser/block/header/header_0001.input
@@ -0,0 +1 @@
+# Header!
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0001.expected b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0001.expected
new file mode 100644
index 000000000..b40ba2c60
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0001.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+ • (num "1")
+ • "Verso.Parser.OrderedListType.numDot 1"
+
+Remaining:
+"1. "
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0001.input b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0001.input
new file mode 100644
index 000000000..1f2b81dae
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0001.input
@@ -0,0 +1 @@
+1. 
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0002.expected b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0002.expected
new file mode 100644
index 000000000..8b0339787
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0002.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+ • (num "2")
+ • "Verso.Parser.OrderedListType.numDot 2"
+
+Remaining:
+"2. "
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0002.input b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0002.input
new file mode 100644
index 000000000..03b8252c5
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0002.input
@@ -0,0 +1 @@
+2. 
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0003.expected b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0003.expected
new file mode 100644
index 000000000..3aaa5a63e
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0003.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): unexpected end of input
+Final stack:
+  <missing>
+Remaining: "2."
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0003.input b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0003.input
new file mode 100644
index 000000000..c5aa09bb1
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0003.input
@@ -0,0 +1 @@
+2.
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0004.expected b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0004.expected
new file mode 100644
index 000000000..e97212256
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0004.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+ • (num "2")
+ • "Verso.Parser.OrderedListType.parenAfter 2"
+
+Remaining:
+"2) "
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0004.input b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0004.input
new file mode 100644
index 000000000..75d671965
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0004.input
@@ -0,0 +1 @@
+2) 
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0005.expected b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0005.expected
new file mode 100644
index 000000000..4ea9f206e
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0005.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): digits
+Final stack:
+ empty
+Remaining: "-23) "
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0005.input b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0005.input
new file mode 100644
index 000000000..289c4b456
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0005.input
@@ -0,0 +1 @@
+-23) 
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0006.expected b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0006.expected
new file mode 100644
index 000000000..6e8b27cf5
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0006.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): digits
+Final stack:
+ empty
+Remaining: "a-23) "
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0006.input b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0006.input
new file mode 100644
index 000000000..0e09270fe
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0006.input
@@ -0,0 +1 @@
+a-23) 
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0007.expected b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0007.expected
new file mode 100644
index 000000000..9242c5806
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0007.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): unexpected ' '; expected ')' or '.'
+Final stack:
+ empty
+Remaining: "23 ) "
\ No newline at end of file
diff --git a/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0007.input b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0007.input
new file mode 100644
index 000000000..120456cae
--- /dev/null
+++ b/src/tests/parser/block/olIndicator/lookaheadOrderedListIndicator_0007.input
@@ -0,0 +1 @@
+23 ) 
\ No newline at end of file
diff --git a/src/tests/parser/block/opener/blockOpener_0001.expected b/src/tests/parser/block/opener/blockOpener_0001.expected
new file mode 100644
index 000000000..08f596a60
--- /dev/null
+++ b/src/tests/parser/block/opener/blockOpener_0001.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+ empty
+Remaining:
+"abc"
\ No newline at end of file
diff --git a/src/tests/parser/block/opener/blockOpener_0001.input b/src/tests/parser/block/opener/blockOpener_0001.input
new file mode 100644
index 000000000..1198a6c90
--- /dev/null
+++ b/src/tests/parser/block/opener/blockOpener_0001.input
@@ -0,0 +1 @@
++ abc
\ No newline at end of file
diff --git a/src/tests/parser/block/opener/blockOpener_0002.expected b/src/tests/parser/block/opener/blockOpener_0002.expected
new file mode 100644
index 000000000..08f596a60
--- /dev/null
+++ b/src/tests/parser/block/opener/blockOpener_0002.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+ empty
+Remaining:
+"abc"
\ No newline at end of file
diff --git a/src/tests/parser/block/opener/blockOpener_0002.input b/src/tests/parser/block/opener/blockOpener_0002.input
new file mode 100644
index 000000000..1c98dec5d
--- /dev/null
+++ b/src/tests/parser/block/opener/blockOpener_0002.input
@@ -0,0 +1 @@
+* abc
\ No newline at end of file
diff --git a/src/tests/parser/block/opener/blockOpener_0003.expected b/src/tests/parser/block/opener/blockOpener_0003.expected
new file mode 100644
index 000000000..08f596a60
--- /dev/null
+++ b/src/tests/parser/block/opener/blockOpener_0003.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+ empty
+Remaining:
+"abc"
\ No newline at end of file
diff --git a/src/tests/parser/block/opener/blockOpener_0003.input b/src/tests/parser/block/opener/blockOpener_0003.input
new file mode 100644
index 000000000..1198a6c90
--- /dev/null
+++ b/src/tests/parser/block/opener/blockOpener_0003.input
@@ -0,0 +1 @@
++ abc
\ No newline at end of file
diff --git a/src/tests/parser/block/recover/recoverBlock_0001.expected b/src/tests/parser/block/recover/recoverBlock_0001.expected
new file mode 100644
index 000000000..d32847d88
--- /dev/null
+++ b/src/tests/parser/block/recover/recoverBlock_0001.expected
@@ -0,0 +1,40 @@
+Failure @55 (⟨3, 0⟩): '{'; expected '![', '$$', '$', '[' or '[^'
+Final stack:
+  (Verso.Syntax.para
+   "para{"
+   [(Verso.Syntax.role
+     "{"
+     `tactic
+     []
+     "}"
+     "["
+     [(Verso.Syntax.code "`" (str "\"rw\"") "`")]
+     "]")
+    (Verso.Syntax.role
+     "{"
+     `lit
+     []
+     "}"
+     "["
+     [(Verso.Syntax.code
+       "`"
+       (str "\" [t] \"")
+       "`")]
+     "]")
+    (Verso.Syntax.role
+     "{"
+     `kw
+     []
+     "}"
+     "["
+     [(Verso.Syntax.code "`" (str "\"at\"") "`")]
+     "]")
+    (Verso.Syntax.role
+     "{"
+     `lit
+     []
+     "}"
+     "["
+     [(Verso.Syntax.footnote <missing>)]
+     "]")])
+Remaining: "test"
\ No newline at end of file
diff --git a/src/tests/parser/block/recover/recoverBlock_0001.input b/src/tests/parser/block/recover/recoverBlock_0001.input
new file mode 100644
index 000000000..14718cb34
--- /dev/null
+++ b/src/tests/parser/block/recover/recoverBlock_0001.input
@@ -0,0 +1,3 @@
+{tactic}`rw`{lit}`  [t]  `{kw}`at`{lit} h` applies th
+
+test
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0001.expected b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0001.expected
new file mode 100644
index 000000000..9c3f712e4
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0001.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  "Verso.Parser.UnorderedListType.asterisk"
+Remaining:
+"* "
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0001.input b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0001.input
new file mode 100644
index 000000000..e48d96ff9
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0001.input
@@ -0,0 +1 @@
+* 
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0002.expected b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0002.expected
new file mode 100644
index 000000000..3b258a351
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0002.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  "Verso.Parser.UnorderedListType.dash"
+Remaining:
+"- "
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0002.input b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0002.input
new file mode 100644
index 000000000..0d439ac8b
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0002.input
@@ -0,0 +1 @@
+- 
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0003.expected b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0003.expected
new file mode 100644
index 000000000..0ec34f7b7
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0003.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  "Verso.Parser.UnorderedListType.plus"
+Remaining:
+"+ "
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0003.input b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0003.input
new file mode 100644
index 000000000..2ca484d62
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0003.input
@@ -0,0 +1 @@
++ 
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0004.expected b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0004.expected
new file mode 100644
index 000000000..9c3f712e4
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0004.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  "Verso.Parser.UnorderedListType.asterisk"
+Remaining:
+"* "
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0004.input b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0004.input
new file mode 100644
index 000000000..e48d96ff9
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0004.input
@@ -0,0 +1 @@
+* 
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0005.expected b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0005.expected
new file mode 100644
index 000000000..54ab873ab
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0005.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): unexpected end of input
+Final stack:
+  <missing>
+Remaining: " *"
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0005.input b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0005.input
new file mode 100644
index 000000000..42780ecb1
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0005.input
@@ -0,0 +1 @@
+ *
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0006.expected b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0006.expected
new file mode 100644
index 000000000..78f009875
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0006.expected
@@ -0,0 +1,5 @@
+Failure @0 (⟨1, 0⟩): '
+'
+Final stack:
+  <missing>
+Remaining: "** "
\ No newline at end of file
diff --git a/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0006.input b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0006.input
new file mode 100644
index 000000000..0ca974ea5
--- /dev/null
+++ b/src/tests/parser/block/ulIndicator/lookaheadUnorderedListIndicator_0006.input
@@ -0,0 +1 @@
+** 
\ No newline at end of file
diff --git a/src/tests/parser/blocks/recover/recoverBlocks_0001.expected b/src/tests/parser/blocks/recover/recoverBlocks_0001.expected
new file mode 100644
index 000000000..cfdfdb07f
--- /dev/null
+++ b/src/tests/parser/blocks/recover/recoverBlocks_0001.expected
@@ -0,0 +1,44 @@
+Failure @92 (⟨7, 0⟩): '{'; expected '![', '$$', '$', '[' or '[^'
+Final stack:
+  [(Verso.Syntax.dl
+    "dl{"
+    [(Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text (str "\" \""))
+       (Verso.Syntax.role
+        "{"
+        `ref
+        [(Verso.Syntax.anon
+          (Verso.Syntax.arg_ident `defs))]
+        "}"
+        "["
+        [(Verso.Syntax.text
+          (str "\"Basic definitions\""))]
+        "]")]
+      "=>"
+      [(Verso.Syntax.para
+        "para{"
+        [(Verso.Syntax.text
+          (str "\"The def is something\""))]
+        "}")])
+     (Verso.Syntax.desc
+      ":"
+      [(Verso.Syntax.text (str "\" \""))
+       (Verso.Syntax.role
+        "{"
+        `ref
+        [(Verso.Syntax.anon
+          (Verso.Syntax.arg_ident `large))]
+        "}"
+        "["
+        [(Verso.Syntax.role
+          "{"
+          `Sufficiently
+          [(Verso.Syntax.anon
+            (Verso.Syntax.arg_ident `large))]
+          "}"
+          "["
+          [(Verso.Syntax.footnote <missing>)]
+          "]")]
+        "]")])])]
+Remaining: "  More text\n\n: `foo`\n\n  Thing\n"
\ No newline at end of file
diff --git a/src/tests/parser/blocks/recover/recoverBlocks_0001.input b/src/tests/parser/blocks/recover/recoverBlocks_0001.input
new file mode 100644
index 000000000..96a14844c
--- /dev/null
+++ b/src/tests/parser/blocks/recover/recoverBlocks_0001.input
@@ -0,0 +1,11 @@
+: {ref defs}[Basic definitions]
+
+  The def is something
+
+: {ref large}{Sufficiently large}
+
+  More text
+
+: `foo`
+
+  Thing
diff --git a/src/tests/parser/document/document_0001.expected b/src/tests/parser/document/document_0001.expected
new file mode 100644
index 000000000..299394199
--- /dev/null
+++ b/src/tests/parser/document/document_0001.expected
@@ -0,0 +1,19 @@
+Success! Final stack:
+  [(Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.image
+      "!["
+      (str "\"Lean logo\"")
+      "]"
+      (Verso.Syntax.url
+       "("
+       (str "\"/static/lean_logo.svg\"")
+       ")"))]
+    "}")
+   (Verso.Syntax.para
+    "para{"
+    [(Verso.Syntax.text
+      (str
+       "\"This is an example website/blog, for testing purposes.\""))]
+    "}")]
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/document/document_0001.input b/src/tests/parser/document/document_0001.input
new file mode 100644
index 000000000..ceb60ff23
--- /dev/null
+++ b/src/tests/parser/document/document_0001.input
@@ -0,0 +1,3 @@
+![Lean logo](/static/lean_logo.svg)
+
+This is an example website/blog, for testing purposes.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0001.expected b/src/tests/parser/inline/code/code_0001.expected
new file mode 100644
index 000000000..7409b094f
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0001.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.code
+   "``"
+   (str "\"foo bar\"")
+   "``")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0001.input b/src/tests/parser/inline/code/code_0001.input
new file mode 100644
index 000000000..26c2351ec
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0001.input
@@ -0,0 +1 @@
+``foo bar``
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0002.expected b/src/tests/parser/inline/code/code_0002.expected
new file mode 100644
index 000000000..4c7243669
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0002.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\" \"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0002.input b/src/tests/parser/inline/code/code_0002.input
new file mode 100644
index 000000000..bac7389bb
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0002.input
@@ -0,0 +1 @@
+` `
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0003.expected b/src/tests/parser/inline/code/code_0003.expected
new file mode 100644
index 000000000..465db60b0
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0003.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\"  \"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0003.input b/src/tests/parser/inline/code/code_0003.input
new file mode 100644
index 000000000..e6ba24d95
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0003.input
@@ -0,0 +1 @@
+`  `
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0004.expected b/src/tests/parser/inline/code/code_0004.expected
new file mode 100644
index 000000000..ee0783b27
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0004.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\"   \"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0004.input b/src/tests/parser/inline/code/code_0004.input
new file mode 100644
index 000000000..a3ece3ead
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0004.input
@@ -0,0 +1 @@
+`   `
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0005.expected b/src/tests/parser/inline/code/code_0005.expected
new file mode 100644
index 000000000..dcd20f976
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0005.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\"x\"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0005.input b/src/tests/parser/inline/code/code_0005.input
new file mode 100644
index 000000000..8cc1e2f98
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0005.input
@@ -0,0 +1 @@
+` x `
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0006.expected b/src/tests/parser/inline/code/code_0006.expected
new file mode 100644
index 000000000..d7bc318e0
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0006.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.code
+   "``"
+   (str "\"foo `stuff` bar\"")
+   "``")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0006.input b/src/tests/parser/inline/code/code_0006.input
new file mode 100644
index 000000000..6f340fa8d
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0006.input
@@ -0,0 +1 @@
+``foo `stuff` bar``
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0007.expected b/src/tests/parser/inline/code/code_0007.expected
new file mode 100644
index 000000000..31602b6d6
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0007.expected
@@ -0,0 +1,7 @@
+Failure @4 (⟨1, 4⟩): expected '`' to close inline code
+Final stack:
+  (Verso.Syntax.code
+   "`"
+   (str "\"foo\"")
+   <missing>)
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0007.input b/src/tests/parser/inline/code/code_0007.input
new file mode 100644
index 000000000..8814874d8
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0007.input
@@ -0,0 +1 @@
+`foo
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0008.expected b/src/tests/parser/inline/code/code_0008.expected
new file mode 100644
index 000000000..835451129
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0008.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\" foo\"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0008.input b/src/tests/parser/inline/code/code_0008.input
new file mode 100644
index 000000000..87e9555ea
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0008.input
@@ -0,0 +1 @@
+` foo`
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0009.expected b/src/tests/parser/inline/code/code_0009.expected
new file mode 100644
index 000000000..3f8e82e20
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0009.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\"foo\"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0009.input b/src/tests/parser/inline/code/code_0009.input
new file mode 100644
index 000000000..cfc7ed5fe
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0009.input
@@ -0,0 +1 @@
+` foo `
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0010.expected b/src/tests/parser/inline/code/code_0010.expected
new file mode 100644
index 000000000..00dcc932b
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0010.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\"fo\\no\"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0010.input b/src/tests/parser/inline/code/code_0010.input
new file mode 100644
index 000000000..018a5bfe1
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0010.input
@@ -0,0 +1,2 @@
+` fo
+o `
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0011.expected b/src/tests/parser/inline/code/code_0011.expected
new file mode 100644
index 000000000..2ee02947d
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0011.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "``" (str "\"`x\"") "``")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0011.input b/src/tests/parser/inline/code/code_0011.input
new file mode 100644
index 000000000..6b1d3de5b
--- /dev/null
+++ b/src/tests/parser/inline/code/code_0011.input
@@ -0,0 +1 @@
+`` `x ``
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0001.expected b/src/tests/parser/inline/emph/emph_0001.expected
new file mode 100644
index 000000000..c7bf43d0d
--- /dev/null
+++ b/src/tests/parser/inline/emph/emph_0001.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.emph
+   "_"
+   [(Verso.Syntax.text (str "\"aa\""))]
+   "_")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0001.input b/src/tests/parser/inline/emph/emph_0001.input
new file mode 100644
index 000000000..e48a4bf50
--- /dev/null
+++ b/src/tests/parser/inline/emph/emph_0001.input
@@ -0,0 +1 @@
+_aa_
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0002.expected b/src/tests/parser/inline/emph/emph_0002.expected
new file mode 100644
index 000000000..4fd415bbb
--- /dev/null
+++ b/src/tests/parser/inline/emph/emph_0002.expected
@@ -0,0 +1,7 @@
+Failure @4 (⟨1, 4⟩): expected '_' without preceding space
+Final stack:
+  (Verso.Syntax.emph
+   "_"
+   [(Verso.Syntax.text (str "\"aa \""))]
+   <missing>)
+Remaining: "_"
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0002.input b/src/tests/parser/inline/emph/emph_0002.input
new file mode 100644
index 000000000..07c26144b
--- /dev/null
+++ b/src/tests/parser/inline/emph/emph_0002.input
@@ -0,0 +1 @@
+_aa _
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0003.expected b/src/tests/parser/inline/emph/emph_0003.expected
new file mode 100644
index 000000000..1745da6cf
--- /dev/null
+++ b/src/tests/parser/inline/emph/emph_0003.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): unexpected space or newline after opener
+Final stack:
+  (Verso.Syntax.emph "_" <missing>)
+Remaining: "_ aa_"
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0003.input b/src/tests/parser/inline/emph/emph_0003.input
new file mode 100644
index 000000000..c09ead4eb
--- /dev/null
+++ b/src/tests/parser/inline/emph/emph_0003.input
@@ -0,0 +1 @@
+_ aa_
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0001.expected b/src/tests/parser/inline/oneInline_0001.expected
new file mode 100644
index 000000000..7409b094f
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0001.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.code
+   "``"
+   (str "\"foo bar\"")
+   "``")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0001.input b/src/tests/parser/inline/oneInline_0001.input
new file mode 100644
index 000000000..26c2351ec
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0001.input
@@ -0,0 +1 @@
+``foo bar``
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0002.expected b/src/tests/parser/inline/oneInline_0002.expected
new file mode 100644
index 000000000..d7bc318e0
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0002.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.code
+   "``"
+   (str "\"foo `stuff` bar\"")
+   "``")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0002.input b/src/tests/parser/inline/oneInline_0002.input
new file mode 100644
index 000000000..6f340fa8d
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0002.input
@@ -0,0 +1 @@
+``foo `stuff` bar``
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0003.expected b/src/tests/parser/inline/oneInline_0003.expected
new file mode 100644
index 000000000..31602b6d6
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0003.expected
@@ -0,0 +1,7 @@
+Failure @4 (⟨1, 4⟩): expected '`' to close inline code
+Final stack:
+  (Verso.Syntax.code
+   "`"
+   (str "\"foo\"")
+   <missing>)
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0003.input b/src/tests/parser/inline/oneInline_0003.input
new file mode 100644
index 000000000..8814874d8
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0003.input
@@ -0,0 +1 @@
+`foo
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0004.expected b/src/tests/parser/inline/oneInline_0004.expected
new file mode 100644
index 000000000..835451129
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0004.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\" foo\"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0004.input b/src/tests/parser/inline/oneInline_0004.input
new file mode 100644
index 000000000..87e9555ea
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0004.input
@@ -0,0 +1 @@
+` foo`
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0005.expected b/src/tests/parser/inline/oneInline_0005.expected
new file mode 100644
index 000000000..3f8e82e20
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0005.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\"foo\"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0005.input b/src/tests/parser/inline/oneInline_0005.input
new file mode 100644
index 000000000..cfc7ed5fe
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0005.input
@@ -0,0 +1 @@
+` foo `
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0006.expected b/src/tests/parser/inline/oneInline_0006.expected
new file mode 100644
index 000000000..00dcc932b
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0006.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.code "`" (str "\"fo\\no\"") "`")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0006.input b/src/tests/parser/inline/oneInline_0006.input
new file mode 100644
index 000000000..018a5bfe1
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0006.input
@@ -0,0 +1,2 @@
+` fo
+o `
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0007.expected b/src/tests/parser/inline/oneInline_0007.expected
new file mode 100644
index 000000000..7d97ba631
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0007.expected
@@ -0,0 +1,7 @@
+Failure @6 (⟨2, 0⟩): expected '``' to close inline code
+Final stack:
+  (Verso.Syntax.code
+   "``"
+   (str "\" fo\"")
+   <missing>)
+Remaining: "o `"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0007.input b/src/tests/parser/inline/oneInline_0007.input
new file mode 100644
index 000000000..5a0c67cc4
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0007.input
@@ -0,0 +1,2 @@
+`` fo
+o `
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0008.expected b/src/tests/parser/inline/oneInline_0008.expected
new file mode 100644
index 000000000..227bb1501
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0008.expected
@@ -0,0 +1,10 @@
+Success! Final stack:
+  (Verso.Syntax.bold
+   "**"
+   [(Verso.Syntax.text (str "\"aa\""))
+    (Verso.Syntax.linebreak
+     "line!"
+     (str "\"\\n\""))
+    (Verso.Syntax.text (str "\"bb\""))]
+   "**")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0008.input b/src/tests/parser/inline/oneInline_0008.input
new file mode 100644
index 000000000..d52eda654
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0008.input
@@ -0,0 +1,2 @@
+**aa
+bb**
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0009.expected b/src/tests/parser/inline/oneInline_0009.expected
new file mode 100644
index 000000000..36d98e82d
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0009.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.text (str "\"a \""))
+Remaining:
+"* b"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0009.input b/src/tests/parser/inline/oneInline_0009.input
new file mode 100644
index 000000000..8415737ae
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0009.input
@@ -0,0 +1 @@
+a * b
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0010.expected b/src/tests/parser/inline/oneInline_0010.expected
new file mode 100644
index 000000000..bd840f8ca
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0010.expected
@@ -0,0 +1,10 @@
+Success! Final stack:
+  (Verso.Syntax.link
+   "["
+   [(Verso.Syntax.text (str "\"Wikipedia\""))]
+   "]"
+   (Verso.Syntax.url
+    "("
+    (str "\"https://en.wikipedia.org\"")
+    ")"))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0010.input b/src/tests/parser/inline/oneInline_0010.input
new file mode 100644
index 000000000..35ac92890
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0010.input
@@ -0,0 +1 @@
+[Wikipedia](https://en.wikipedia.org)
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0011.expected b/src/tests/parser/inline/oneInline_0011.expected
new file mode 100644
index 000000000..5b2a623f0
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0011.expected
@@ -0,0 +1,10 @@
+Success! Final stack:
+  (Verso.Syntax.image
+   "!["
+   (str "\"\"")
+   "]"
+   (Verso.Syntax.url
+    "("
+    (str "\"logo.png\"")
+    ")"))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0011.input b/src/tests/parser/inline/oneInline_0011.input
new file mode 100644
index 000000000..67f751262
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0011.input
@@ -0,0 +1 @@
+![](logo.png)
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0012.expected b/src/tests/parser/inline/oneInline_0012.expected
new file mode 100644
index 000000000..c73fa1761
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0012.expected
@@ -0,0 +1,11 @@
+Failure @12 (⟨1, 12⟩): expected ')'
+Final stack:
+  (Verso.Syntax.image
+   "!["
+   (str "\"\"")
+   "]"
+   (Verso.Syntax.url
+    "("
+    (str "\"logo.png\"")
+    <missing>))
+Remaining: "\nabc"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0012.input b/src/tests/parser/inline/oneInline_0012.input
new file mode 100644
index 000000000..5e8cc6b46
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0012.input
@@ -0,0 +1,2 @@
+![](logo.png
+abc
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0013.expected b/src/tests/parser/inline/oneInline_0013.expected
new file mode 100644
index 000000000..7366711c5
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0013.expected
@@ -0,0 +1,7 @@
+Failure @5 (⟨1, 5⟩): expected ']'
+Final stack:
+  (Verso.Syntax.image
+   "!["
+   (str "\"abc\"")
+   <missing>)
+Remaining: "\n123"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0013.input b/src/tests/parser/inline/oneInline_0013.input
new file mode 100644
index 000000000..018259b0f
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0013.input
@@ -0,0 +1,2 @@
+![abc
+123
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0014.expected b/src/tests/parser/inline/oneInline_0014.expected
new file mode 100644
index 000000000..87932bcab
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0014.expected
@@ -0,0 +1,10 @@
+Success! Final stack:
+  (Verso.Syntax.image
+   "!["
+   (str "\"alt text is good\"")
+   "]"
+   (Verso.Syntax.url
+    "("
+    (str "\"logo.png\"")
+    ")"))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0014.input b/src/tests/parser/inline/oneInline_0014.input
new file mode 100644
index 000000000..9e92e39d8
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0014.input
@@ -0,0 +1 @@
+![alt text is good](logo.png)
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0015.expected b/src/tests/parser/inline/oneInline_0015.expected
new file mode 100644
index 000000000..51f41544b
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0015.expected
@@ -0,0 +1,8 @@
+Failure @19 (⟨1, 19⟩): expected '(' or '['
+Final stack:
+  (Verso.Syntax.image
+   "!["
+   (str "\"alt text is good\"")
+   "]"
+   (Verso.Syntax.url <missing>))
+Remaining: "](logo.png)"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0015.input b/src/tests/parser/inline/oneInline_0015.input
new file mode 100644
index 000000000..e4b914937
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0015.input
@@ -0,0 +1 @@
+![alt text is good]](logo.png)
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0016.expected b/src/tests/parser/inline/oneInline_0016.expected
new file mode 100644
index 000000000..f675b82df
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0016.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.footnote "[^" (str "\"1\"") "]")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0016.input b/src/tests/parser/inline/oneInline_0016.input
new file mode 100644
index 000000000..bea07b734
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0016.input
@@ -0,0 +1 @@
+[^1]
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0017.expected b/src/tests/parser/inline/oneInline_0017.expected
new file mode 100644
index 000000000..52307cc80
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0017.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.inline_math
+   "$"
+   (Verso.Syntax.code
+    "`"
+    (str "\"\\\\frac{x}{4}\"")
+    "`"))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0017.input b/src/tests/parser/inline/oneInline_0017.input
new file mode 100644
index 000000000..ce2f47e82
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0017.input
@@ -0,0 +1 @@
+$`\frac{x}{4}`
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0018.expected b/src/tests/parser/inline/oneInline_0018.expected
new file mode 100644
index 000000000..216d47795
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0018.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.inline_math
+   "$"
+   (Verso.Syntax.code
+    "`"
+    (str "\"\\\\frac{\\n  x\\n}{\\n  4\\n}\\n\"")
+    "`"))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0018.input b/src/tests/parser/inline/oneInline_0018.input
new file mode 100644
index 000000000..564e267b2
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0018.input
@@ -0,0 +1,6 @@
+$`\frac{
+  x
+}{
+  4
+}
+`
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0019.expected b/src/tests/parser/inline/oneInline_0019.expected
new file mode 100644
index 000000000..fc0efef47
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0019.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+  (Verso.Syntax.display_math
+   "$$"
+   (Verso.Syntax.code
+    "`"
+    (str "\"\\\\frac{x}{4}\"")
+    "`"))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0019.input b/src/tests/parser/inline/oneInline_0019.input
new file mode 100644
index 000000000..05ccf75c7
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0019.input
@@ -0,0 +1 @@
+$$`\frac{x}{4}`
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0020.expected b/src/tests/parser/inline/oneInline_0020.expected
new file mode 100644
index 000000000..e910adc72
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0020.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.text (str "\"$35.23\""))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0020.input b/src/tests/parser/inline/oneInline_0020.input
new file mode 100644
index 000000000..ade1569bb
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0020.input
@@ -0,0 +1 @@
+$35.23
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0021.expected b/src/tests/parser/inline/oneInline_0021.expected
new file mode 100644
index 000000000..f543a5160
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0021.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.text (str "\"$\""))
+Remaining:
+"`code`"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0021.input b/src/tests/parser/inline/oneInline_0021.input
new file mode 100644
index 000000000..a4ac79627
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0021.input
@@ -0,0 +1 @@
+\$`code`
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0022.expected b/src/tests/parser/inline/oneInline_0022.expected
new file mode 100644
index 000000000..f72b84543
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0022.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.text (str "\"$$$\""))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0022.input b/src/tests/parser/inline/oneInline_0022.input
new file mode 100644
index 000000000..7de3ef4a7
--- /dev/null
+++ b/src/tests/parser/inline/oneInline_0022.input
@@ -0,0 +1 @@
+$$$
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0001.expected b/src/tests/parser/inline/role/role_0001.expected
new file mode 100644
index 000000000..9f0cedf53
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0001.expected
@@ -0,0 +1,13 @@
+Success! Final stack:
+  (Verso.Syntax.role
+   "{"
+   `hello
+   []
+   "}"
+   "["
+   [(Verso.Syntax.bold
+     "*"
+     [(Verso.Syntax.text (str "\"there\""))]
+     "*")]
+   "]")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0001.input b/src/tests/parser/inline/role/role_0001.input
new file mode 100644
index 000000000..b5657de55
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0001.input
@@ -0,0 +1 @@
+{hello}*there*
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0002.expected b/src/tests/parser/inline/role/role_0002.expected
new file mode 100644
index 000000000..68704bd0f
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0002.expected
@@ -0,0 +1,10 @@
+Success! Final stack:
+  (Verso.Syntax.role
+   "{"
+   `hello
+   []
+   "}"
+   "["
+   [(Verso.Syntax.text (str "\"there\""))]
+   "]")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0002.input b/src/tests/parser/inline/role/role_0002.input
new file mode 100644
index 000000000..82d9b0c5a
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0002.input
@@ -0,0 +1 @@
+{hello}[there]
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0003.expected b/src/tests/parser/inline/role/role_0003.expected
new file mode 100644
index 000000000..b839fb5c3
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0003.expected
@@ -0,0 +1,19 @@
+Success! Final stack:
+  (Verso.Syntax.role
+   "{"
+   `ref
+   [(Verso.Syntax.anon
+     (Verso.Syntax.arg_ident `other))]
+   "}"
+   "["
+   [(Verso.Syntax.role
+     "{"
+     `leanKw
+     []
+     "}"
+     "["
+     [(Verso.Syntax.code "`" (str "\"cmd\"") "`")]
+     "]")
+    (Verso.Syntax.text (str "\" is great\""))]
+   "]")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0003.input b/src/tests/parser/inline/role/role_0003.input
new file mode 100644
index 000000000..f9a43ff30
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0003.input
@@ -0,0 +1 @@
+{ref other}[{leanKw}`cmd` is great]
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0004.expected b/src/tests/parser/inline/role/role_0004.expected
new file mode 100644
index 000000000..ff9b08027
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0004.expected
@@ -0,0 +1,13 @@
+Success! Final stack:
+  (Verso.Syntax.role
+   "{"
+   `hello
+   [(Verso.Syntax.named_no_paren
+     `world
+     ":="
+     (Verso.Syntax.arg_ident `gaia))]
+   "}"
+   "["
+   [(Verso.Syntax.text (str "\"there\""))]
+   "]")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0004.input b/src/tests/parser/inline/role/role_0004.input
new file mode 100644
index 000000000..f0aed6081
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0004.input
@@ -0,0 +1 @@
+{hello world:=gaia}[there]
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0005.expected b/src/tests/parser/inline/role/role_0005.expected
new file mode 100644
index 000000000..41eb440fe
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0005.expected
@@ -0,0 +1,23 @@
+Success! Final stack:
+  (Verso.Syntax.role
+   "{"
+   `hello
+   [(Verso.Syntax.named_no_paren
+     `world
+     ":="
+     (Verso.Syntax.arg_ident `gaia))]
+   "}"
+   "["
+   [(Verso.Syntax.text (str "\"there \""))
+    (Verso.Syntax.bold
+     "*"
+     [(Verso.Syntax.text (str "\"is\""))]
+     "*")
+    (Verso.Syntax.text (str "\" \""))
+    (Verso.Syntax.emph
+     "_"
+     [(Verso.Syntax.text (str "\"a meaning!\""))]
+     "_")
+    (Verso.Syntax.text (str "\" \""))]
+   "]")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0005.input b/src/tests/parser/inline/role/role_0005.input
new file mode 100644
index 000000000..f7a96975a
--- /dev/null
+++ b/src/tests/parser/inline/role/role_0005.input
@@ -0,0 +1 @@
+{hello world:=gaia}[there *is* _a meaning!_ ]
\ No newline at end of file
diff --git a/src/tests/parser/inline/text/text_0001.expected b/src/tests/parser/inline/text/text_0001.expected
new file mode 100644
index 000000000..2977e07e1
--- /dev/null
+++ b/src/tests/parser/inline/text/text_0001.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.text (str "\" \""))
+Remaining:
+"[\\[link\\]](https://link.com)"
\ No newline at end of file
diff --git a/src/tests/parser/inline/text/text_0001.input b/src/tests/parser/inline/text/text_0001.input
new file mode 100644
index 000000000..214d3fb0c
--- /dev/null
+++ b/src/tests/parser/inline/text/text_0001.input
@@ -0,0 +1 @@
+ [\[link\]](https://link.com)
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0001.expected b/src/tests/parser/inlineTextChar/inlineTextChar_0001.expected
new file mode 100644
index 000000000..948a3a630
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0001.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): unexpected end of input
+Final stack:
+  <missing>
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0001.input b/src/tests/parser/inlineTextChar/inlineTextChar_0001.input
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0002.expected b/src/tests/parser/inlineTextChar/inlineTextChar_0002.expected
new file mode 100644
index 000000000..58b7cea6a
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0002.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+ empty
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0002.input b/src/tests/parser/inlineTextChar/inlineTextChar_0002.input
new file mode 100644
index 000000000..2e65efe2a
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0002.input
@@ -0,0 +1 @@
+a
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0003.expected b/src/tests/parser/inlineTextChar/inlineTextChar_0003.expected
new file mode 100644
index 000000000..c3fd7fc41
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0003.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+ empty
+Remaining:
+"bc"
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0003.input b/src/tests/parser/inlineTextChar/inlineTextChar_0003.input
new file mode 100644
index 000000000..f2ba8f84a
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0003.input
@@ -0,0 +1 @@
+abc
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0004.expected b/src/tests/parser/inlineTextChar/inlineTextChar_0004.expected
new file mode 100644
index 000000000..52f3b75f4
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0004.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): '['
+Final stack:
+  <missing>
+Remaining: "[abc"
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0004.input b/src/tests/parser/inlineTextChar/inlineTextChar_0004.input
new file mode 100644
index 000000000..b8d5035c1
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0004.input
@@ -0,0 +1 @@
+[abc
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0005.expected b/src/tests/parser/inlineTextChar/inlineTextChar_0005.expected
new file mode 100644
index 000000000..08f596a60
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0005.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+ empty
+Remaining:
+"abc"
\ No newline at end of file
diff --git a/src/tests/parser/inlineTextChar/inlineTextChar_0005.input b/src/tests/parser/inlineTextChar/inlineTextChar_0005.input
new file mode 100644
index 000000000..78e3ae40b
--- /dev/null
+++ b/src/tests/parser/inlineTextChar/inlineTextChar_0005.input
@@ -0,0 +1 @@
+!abc
\ No newline at end of file
diff --git a/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0001.expected b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0001.expected
new file mode 100644
index 000000000..141eb8787
--- /dev/null
+++ b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0001.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  "!!"
+Remaining:
+"![abc"
\ No newline at end of file
diff --git a/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0001.input b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0001.input
new file mode 100644
index 000000000..baace3026
--- /dev/null
+++ b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0001.input
@@ -0,0 +1 @@
+!!![abc
\ No newline at end of file
diff --git a/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0002.expected b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0002.expected
new file mode 100644
index 000000000..86af371c4
--- /dev/null
+++ b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0002.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): '*'
+Final stack:
+  [<missing>]
+Remaining: "*"
\ No newline at end of file
diff --git a/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0002.input b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0002.input
new file mode 100644
index 000000000..f59ec20aa
--- /dev/null
+++ b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0002.input
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0003.expected b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0003.expected
new file mode 100644
index 000000000..69756435a
--- /dev/null
+++ b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0003.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  "!!!\\[abc"
+Remaining:
+"]"
\ No newline at end of file
diff --git a/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0003.input b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0003.input
new file mode 100644
index 000000000..133398899
--- /dev/null
+++ b/src/tests/parser/manyInlineTextChar/manyInlineTextChar_0003.input
@@ -0,0 +1 @@
+!!!\[abc]
\ No newline at end of file
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0001.expected b/src/tests/parser/metadataBlock/metadataBlock_0001.expected
new file mode 100644
index 000000000..24e332352
--- /dev/null
+++ b/src/tests/parser/metadataBlock/metadataBlock_0001.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+  (Verso.Syntax.metadata_block
+   "%%%"
+   (Term.structInstFields [])
+   "%%%")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0001.input b/src/tests/parser/metadataBlock/metadataBlock_0001.input
new file mode 100644
index 000000000..157458a32
--- /dev/null
+++ b/src/tests/parser/metadataBlock/metadataBlock_0001.input
@@ -0,0 +1,2 @@
+%%%
+%%%
\ No newline at end of file
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0002.expected b/src/tests/parser/metadataBlock/metadataBlock_0002.expected
new file mode 100644
index 000000000..d45d3f516
--- /dev/null
+++ b/src/tests/parser/metadataBlock/metadataBlock_0002.expected
@@ -0,0 +1,12 @@
+Success! Final stack:
+  (Verso.Syntax.metadata_block
+   "%%%"
+   (Term.structInstFields
+    [(Term.structInstField
+      (Term.structInstLVal `foo [])
+      [[]
+       []
+       (Term.structInstFieldDef ":=" [] `bar)])
+     []])
+   "%%%")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0002.input b/src/tests/parser/metadataBlock/metadataBlock_0002.input
new file mode 100644
index 000000000..894b79e40
--- /dev/null
+++ b/src/tests/parser/metadataBlock/metadataBlock_0002.input
@@ -0,0 +1,4 @@
+%%%
+foo := bar
+
+%%%
\ No newline at end of file
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0003.expected b/src/tests/parser/metadataBlock/metadataBlock_0003.expected
new file mode 100644
index 000000000..63f5783a4
--- /dev/null
+++ b/src/tests/parser/metadataBlock/metadataBlock_0003.expected
@@ -0,0 +1,16 @@
+Success! Final stack:
+  (Verso.Syntax.metadata_block
+   "%%%"
+   (Term.structInstFields
+    [(Term.structInstField
+      (Term.structInstLVal `foo [])
+      [[]
+       []
+       (Term.structInstFieldDef ":=" [] `bar)])
+     []
+     (Term.structInstField
+      (Term.structInstLVal `x [])
+      [])
+     []])
+   "%%%")
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0003.input b/src/tests/parser/metadataBlock/metadataBlock_0003.input
new file mode 100644
index 000000000..05625731c
--- /dev/null
+++ b/src/tests/parser/metadataBlock/metadataBlock_0003.input
@@ -0,0 +1,4 @@
+%%%
+foo := bar
+x
+%%%
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0001.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0001.expected
new file mode 100644
index 000000000..857f12afe
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0001.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+ • `leanExample
+ • [(Verso.Syntax.named_no_paren
+      `context
+      ":="
+      (Verso.Syntax.arg_num (num "2")))]
+
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0001.input b/src/tests/parser/nameAndArgs/nameAndArgs_0001.input
new file mode 100644
index 000000000..0ca118b32
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0001.input
@@ -0,0 +1 @@
+leanExample context := 2
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
new file mode 100644
index 000000000..ac3de7ea6
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
@@ -0,0 +1,10 @@
+Success! Final stack:
+ • `scheme
+ • [(Verso.Syntax.named_no_paren
+      `dialect
+      ":="
+      (Verso.Syntax.arg_str (str "\"chicken\"")))
+     (Verso.Syntax.anon
+      (Verso.Syntax.arg_num (num "43")))]
+
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0002.input b/src/tests/parser/nameAndArgs/nameAndArgs_0002.input
new file mode 100644
index 000000000..099760067
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0002.input
@@ -0,0 +1 @@
+scheme dialect:="chicken" 43
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
new file mode 100644
index 000000000..942cabea4
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
@@ -0,0 +1,11 @@
+Success! Final stack:
+ • `scheme
+ • [(Verso.Syntax.named_no_paren
+      `dialect
+      ":="
+      (Verso.Syntax.arg_str (str "\"chicken\"")))
+     (Verso.Syntax.anon
+      (Verso.Syntax.arg_num (num "43")))
+     (Verso.Syntax.flag_on "+" `foo)]
+
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0003.input b/src/tests/parser/nameAndArgs/nameAndArgs_0003.input
new file mode 100644
index 000000000..4be9889fa
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0003.input
@@ -0,0 +1 @@
+scheme dialect:="chicken" 43 +foo
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
new file mode 100644
index 000000000..0752e7089
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
@@ -0,0 +1,12 @@
+Failure @29 (⟨1, 29⟩): expected flag name
+Final stack:
+ • `scheme
+ • [(Verso.Syntax.named_no_paren
+      `dialect
+      ":="
+      (Verso.Syntax.arg_str (str "\"chicken\"")))
+     (Verso.Syntax.flag_on "+" <missing>)
+     (Verso.Syntax.anon
+      (Verso.Syntax.arg_num (num "99")))]
+
+Remaining: " 99"
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0004.input b/src/tests/parser/nameAndArgs/nameAndArgs_0004.input
new file mode 100644
index 000000000..e14f14d53
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0004.input
@@ -0,0 +1 @@
+scheme dialect:="chicken" +43 99
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
new file mode 100644
index 000000000..57248e902
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
@@ -0,0 +1,12 @@
+Failure @28 (⟨1, 28⟩): expected no space before
+Final stack:
+ • `scheme
+ • [(Verso.Syntax.named_no_paren
+      `dialect
+      ":="
+      (Verso.Syntax.arg_str (str "\"chicken\"")))
+     (Verso.Syntax.flag_on "+" `x)
+     (Verso.Syntax.anon
+      (Verso.Syntax.arg_num (num "99")))]
+
+Remaining: "x 99"
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0005.input b/src/tests/parser/nameAndArgs/nameAndArgs_0005.input
new file mode 100644
index 000000000..f1f619282
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0005.input
@@ -0,0 +1 @@
+scheme dialect:="chicken" + x 99
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
new file mode 100644
index 000000000..cfc92aa81
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
@@ -0,0 +1,11 @@
+Success! Final stack:
+ • `scheme
+ • [(Verso.Syntax.named_no_paren
+      `dialect
+      ":="
+      (Verso.Syntax.arg_str (str "\"chicken\"")))
+     (Verso.Syntax.anon
+      (Verso.Syntax.arg_num (num "43")))]
+
+Remaining:
+"\n(foo)"
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0006.input b/src/tests/parser/nameAndArgs/nameAndArgs_0006.input
new file mode 100644
index 000000000..47faa6abd
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0006.input
@@ -0,0 +1,2 @@
+scheme dialect:="chicken" 43
+(foo)
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0007.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0007.expected
new file mode 100644
index 000000000..ddea45f16
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0007.expected
@@ -0,0 +1,6 @@
+Success! Final stack:
+ • `leanExample
+ • [(Verso.Syntax.anon
+      (Verso.Syntax.arg_ident `context))]
+
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0007.input b/src/tests/parser/nameAndArgs/nameAndArgs_0007.input
new file mode 100644
index 000000000..fb8c24572
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0007.input
@@ -0,0 +1 @@
+leanExample context
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0008.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0008.expected
new file mode 100644
index 000000000..4e7a4518e
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0008.expected
@@ -0,0 +1,8 @@
+Success! Final stack:
+ • `leanExample
+ • [(Verso.Syntax.anon
+      (Verso.Syntax.arg_ident `context))
+     (Verso.Syntax.anon
+      (Verso.Syntax.arg_ident `more))]
+
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0008.input b/src/tests/parser/nameAndArgs/nameAndArgs_0008.input
new file mode 100644
index 000000000..dd713f29f
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0008.input
@@ -0,0 +1 @@
+leanExample context more
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
new file mode 100644
index 000000000..b9eec4730
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
@@ -0,0 +1,10 @@
+Success! Final stack:
+ • `leanExample
+ • [(Verso.Syntax.anon
+      (Verso.Syntax.arg_ident `context))
+     (Verso.Syntax.named_no_paren
+      `more
+      ":="
+      (Verso.Syntax.arg_str (str "\"stuff\"")))]
+
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0009.input b/src/tests/parser/nameAndArgs/nameAndArgs_0009.input
new file mode 100644
index 000000000..1ddaeb97b
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0009.input
@@ -0,0 +1 @@
+leanExample context more:="stuff"
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
new file mode 100644
index 000000000..367b429bd
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
@@ -0,0 +1,11 @@
+Success! Final stack:
+ • `leanExample
+ • [(Verso.Syntax.anon
+      (Verso.Syntax.arg_ident `context))
+     (Verso.Syntax.named_no_paren
+      `more
+      ":="
+      (Verso.Syntax.arg_str (str "\"stuff\"")))]
+
+Remaining:
+"\n\nabc"
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0010.input b/src/tests/parser/nameAndArgs/nameAndArgs_0010.input
new file mode 100644
index 000000000..b455b56ac
--- /dev/null
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0010.input
@@ -0,0 +1,3 @@
+leanExample context more:="stuff"
+
+abc
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0001.expected b/src/tests/parser/val/arg_val_0001.expected
new file mode 100644
index 000000000..4e818ea8b
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0001.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.arg_num (num "1"))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0001.input b/src/tests/parser/val/arg_val_0001.input
new file mode 100644
index 000000000..56a6051ca
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0001.input
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0002.expected b/src/tests/parser/val/arg_val_0002.expected
new file mode 100644
index 000000000..b4bd90e9a
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0002.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.arg_num (num "3"))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0002.input b/src/tests/parser/val/arg_val_0002.input
new file mode 100644
index 000000000..e440e5c84
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0002.input
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0003.expected b/src/tests/parser/val/arg_val_0003.expected
new file mode 100644
index 000000000..f7b61d60a
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0003.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): unexpected end of input; expected identifier, numeral or string literal
+Final stack:
+  (Verso.Syntax.arg_str <missing>)
+Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0003.input b/src/tests/parser/val/arg_val_0003.input
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/tests/parser/val/arg_val_0004.expected b/src/tests/parser/val/arg_val_0004.expected
new file mode 100644
index 000000000..e99159fbe
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0004.expected
@@ -0,0 +1,3 @@
+Success! Final stack:
+  (Verso.Syntax.arg_str (str "\"a b c\t d\""))
+All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0004.input b/src/tests/parser/val/arg_val_0004.input
new file mode 100644
index 000000000..101b1a715
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0004.input
@@ -0,0 +1 @@
+"a b c	 d"
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0005.expected b/src/tests/parser/val/arg_val_0005.expected
new file mode 100644
index 000000000..1fab98123
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0005.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.arg_str (str "\"a b c\t d\""))
+Remaining:
+"\n"
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0005.input b/src/tests/parser/val/arg_val_0005.input
new file mode 100644
index 000000000..54fb7822c
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0005.input
@@ -0,0 +1 @@
+"a b c	 d"
diff --git a/src/tests/parser/val/arg_val_0006.expected b/src/tests/parser/val/arg_val_0006.expected
new file mode 100644
index 000000000..1a98bd11d
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0006.expected
@@ -0,0 +1,4 @@
+Success! Final stack:
+  (Verso.Syntax.arg_num (num "43"))
+Remaining:
+"\n\"foo\""
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0006.input b/src/tests/parser/val/arg_val_0006.input
new file mode 100644
index 000000000..4c37dc640
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0006.input
@@ -0,0 +1,2 @@
+43
+"foo"
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0007.expected b/src/tests/parser/val/arg_val_0007.expected
new file mode 100644
index 000000000..2e157c1bb
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0007.expected
@@ -0,0 +1,4 @@
+Failure @0 (⟨1, 0⟩): unterminated string literal; expected identifier or numeral
+Final stack:
+  (Verso.Syntax.arg_str <missing>)
+Remaining: "\"foo"
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0007.input b/src/tests/parser/val/arg_val_0007.input
new file mode 100644
index 000000000..d45772e3c
--- /dev/null
+++ b/src/tests/parser/val/arg_val_0007.input
@@ -0,0 +1 @@
+"foo
\ No newline at end of file

From 3e138b6937bfac0aecddc82709297eca142a8c4c Mon Sep 17 00:00:00 2001
From: Jason Reed <jcreed@gmail.com>
Date: Tue, 30 Sep 2025 16:31:35 -0400
Subject: [PATCH 2/3] Do simple text replacement

Did:
find . -type f -exec sed -i 's/\bVerso\.Syntax/Lean.Doc.Syntax/g' {} +
find . -type f -exec sed -i 's/expected identifier/expected token/g' {} +
---
 src/tests/parser/arg/arg_0001.expected        |   2 +-
 src/tests/parser/arg/arg_0002.expected        |   4 +-
 src/tests/parser/arg/arg_0003.expected        |   4 +-
 src/tests/parser/arg/arg_0004.expected        |   2 +-
 src/tests/parser/arg/arg_0005.expected        |   2 +-
 src/tests/parser/arg/arg_0006.expected        |   2 +-
 src/tests/parser/arg/arg_0007.expected        |   2 +-
 src/tests/parser/arg/arg_0008.expected        |   4 +-
 src/tests/parser/arg/arg_0009.expected        |   4 +-
 src/tests/parser/arg/arg_0010.expected        |   4 +-
 src/tests/parser/arg/arg_0011.expected        |   4 +-
 src/tests/parser/arg/arg_0012.expected        |   4 +-
 src/tests/parser/arg/arg_0013.expected        |   6 +-
 src/tests/parser/arg/arg_0014.expected        |   4 +-
 src/tests/parser/arg/arg_0015.expected        |   6 +-
 src/tests/parser/arg/arg_0016.expected        |   6 +-
 src/tests/parser/arg/arg_0017.expected        |   4 +-
 src/tests/parser/arg/arg_0018.expected        |   4 +-
 src/tests/parser/args/args_0001.expected      |   4 +-
 src/tests/parser/args/args_0002.expected      |   8 +-
 src/tests/parser/args/args_0003.expected      |   8 +-
 src/tests/parser/block/block_0001.expected    |  24 ++--
 src/tests/parser/block/block_0002.expected    |   2 +-
 src/tests/parser/block/block_0003.expected    |   2 +-
 src/tests/parser/block/block_0004.expected    |   2 +-
 src/tests/parser/block/block_0005.expected    |   2 +-
 src/tests/parser/block/block_0006.expected    |   2 +-
 src/tests/parser/block/block_0007.expected    |   8 +-
 src/tests/parser/block/block_0008.expected    |   8 +-
 src/tests/parser/block/block_0009.expected    |   8 +-
 src/tests/parser/block/block_0010.expected    |   8 +-
 src/tests/parser/block/block_0011.expected    |   8 +-
 src/tests/parser/block/block_0012.expected    |  54 ++++----
 .../parser/block/blocks/blocks_0001.expected  |   8 +-
 .../parser/block/blocks/blocks_0002.expected  |   8 +-
 .../parser/block/blocks/blocks_0003.expected  |  18 +--
 .../parser/block/blocks/blocks_0004.expected  |  38 +++---
 .../parser/block/blocks/blocks_0005.expected  |  30 ++---
 .../parser/block/blocks/blocks_0006.expected  |  30 ++---
 .../parser/block/blocks/blocks_0007.expected  |   6 +-
 .../parser/block/blocks/blocks_0008.expected  |  12 +-
 .../parser/block/blocks/blocks_0009.expected  |  12 +-
 .../parser/block/blocks/blocks_0010.expected  |  16 +--
 .../parser/block/blocks/blocks_0011.expected  |  10 +-
 .../parser/block/blocks/blocks_0012.expected  |  10 +-
 .../parser/block/blocks/blocks_0013.expected  |  18 +--
 .../parser/block/blocks/blocks_0014.expected  |  18 +--
 .../parser/block/blocks/blocks_0015.expected  |  16 +--
 .../parser/block/blocks/blocks_0016.expected  |  20 +--
 .../parser/block/blocks/blocks_0017.expected  |  18 +--
 .../parser/block/blocks/blocks_0018.expected  |  12 +-
 .../parser/block/blocks/blocks_0019.expected  |  16 +--
 .../parser/block/blocks/blocks_0020.expected  |  16 +--
 .../parser/block/blocks/blocks_0021.expected  |  30 ++---
 .../parser/block/blocks/blocks_0022.expected  |  22 ++--
 .../parser/block/blocks/blocks_0023.expected  |  12 +-
 .../parser/block/blocks/blocks_0024.expected  |  10 +-
 .../parser/block/blocks/blocks_0025.expected  |  14 +-
 .../parser/block/blocks/blocks_0026.expected  |  18 +--
 .../parser/block/blocks/blocks_0027.expected  |  18 +--
 .../parser/block/blocks/blocks_0028.expected  |  14 +-
 .../parser/block/blocks/blocks_0029.expected  |  14 +-
 .../parser/block/blocks/blocks_0030.expected  |   8 +-
 .../parser/block/blocks/blocks_0031.expected  |  16 +--
 .../parser/block/blocks/blocks_0032.expected  |  14 +-
 .../parser/block/blocks/blocks_0033.expected  |   8 +-
 .../parser/block/blocks/blocks_0034.expected  |   4 +-
 .../parser/block/blocks/blocks_0035.expected  |  12 +-
 .../parser/block/blocks/blocks_0036.expected  |   4 +-
 .../parser/block/blocks/blocks_0037.expected  |   4 +-
 .../parser/block/blocks/blocks_0038.expected  |  10 +-
 .../parser/block/blocks/blocks_0039.expected  |  20 +--
 .../parser/block/blocks/blocks_0040.expected  |  16 +--
 .../parser/block/blocks/blocks_0041.expected  |  16 +--
 .../parser/block/blocks/blocks_0042.expected  |  26 ++--
 .../parser/block/blocks/blocks_0043.expected  |  10 +-
 .../parser/block/blocks/blocks_0044.expected  |  10 +-
 .../parser/block/blocks/blocks_0045.expected  |   6 +-
 .../parser/block/blocks/blocks_0046.expected  |  16 +--
 .../parser/block/blocks/blocks_0047.expected  |   4 +-
 .../parser/block/blocks/blocks_0048.expected  |   6 +-
 .../parser/block/blocks/blocks_0049.expected  |  16 +--
 .../parser/block/blocks/blocks_0050.expected  |  10 +-
 .../parser/block/blocks/blocks_0051.expected  |  16 +--
 .../parser/block/blocks/blocks_0052.expected  |  14 +-
 .../parser/block/blocks/blocks_0053.expected  |  10 +-
 .../parser/block/blocks/blocks_0054.expected  | 124 +++++++++---------
 .../parser/block/code/codeBlock_0001.expected |   2 +-
 .../parser/block/code/codeBlock_0002.expected |   2 +-
 .../parser/block/code/codeBlock_0003.expected |   2 +-
 .../parser/block/code/codeBlock_0004.expected |   2 +-
 .../parser/block/code/codeBlock_0005.expected |   2 +-
 .../parser/block/code/codeBlock_0006.expected |   2 +-
 .../parser/block/code/codeBlock_0007.expected |   2 +-
 .../parser/block/code/codeBlock_0008.expected |   2 +-
 .../parser/block/code/codeBlock_0009.expected |   2 +-
 .../parser/block/code/codeBlock_0010.expected |   2 +-
 .../parser/block/code/codeBlock_0011.expected |   2 +-
 .../parser/block/code/codeBlock_0012.expected |  10 +-
 .../parser/block/code/codeBlock_0013.expected |   6 +-
 .../parser/block/code/codeBlock_0014.expected |   6 +-
 .../block/directive/directive_0001.expected   |   6 +-
 .../block/directive/directive_0002.expected   |   6 +-
 .../block/directive/directive_0003.expected   |  10 +-
 .../block/directive/directive_0004.expected   |  14 +-
 .../block/directive/directive_0005.expected   |  18 +--
 .../block/directive/directive_0006.expected   |  14 +-
 .../parser/block/header/header_0001.expected  |   4 +-
 .../block/recover/recoverBlock_0001.expected  |  18 +--
 .../recover/recoverBlocks_0001.expected       |  36 ++---
 .../parser/document/document_0001.expected    |  10 +-
 .../parser/inline/code/code_0001.expected     |   2 +-
 .../parser/inline/code/code_0002.expected     |   2 +-
 .../parser/inline/code/code_0003.expected     |   2 +-
 .../parser/inline/code/code_0004.expected     |   2 +-
 .../parser/inline/code/code_0005.expected     |   2 +-
 .../parser/inline/code/code_0006.expected     |   2 +-
 .../parser/inline/code/code_0007.expected     |   2 +-
 .../parser/inline/code/code_0008.expected     |   2 +-
 .../parser/inline/code/code_0009.expected     |   2 +-
 .../parser/inline/code/code_0010.expected     |   2 +-
 .../parser/inline/code/code_0011.expected     |   2 +-
 .../parser/inline/emph/emph_0001.expected     |   4 +-
 .../parser/inline/emph/emph_0002.expected     |   4 +-
 .../parser/inline/emph/emph_0003.expected     |   2 +-
 .../parser/inline/oneInline_0001.expected     |   2 +-
 .../parser/inline/oneInline_0002.expected     |   2 +-
 .../parser/inline/oneInline_0003.expected     |   2 +-
 .../parser/inline/oneInline_0004.expected     |   2 +-
 .../parser/inline/oneInline_0005.expected     |   2 +-
 .../parser/inline/oneInline_0006.expected     |   2 +-
 .../parser/inline/oneInline_0007.expected     |   2 +-
 .../parser/inline/oneInline_0008.expected     |   8 +-
 .../parser/inline/oneInline_0009.expected     |   2 +-
 .../parser/inline/oneInline_0010.expected     |   6 +-
 .../parser/inline/oneInline_0011.expected     |   4 +-
 .../parser/inline/oneInline_0012.expected     |   4 +-
 .../parser/inline/oneInline_0013.expected     |   2 +-
 .../parser/inline/oneInline_0014.expected     |   4 +-
 .../parser/inline/oneInline_0015.expected     |   4 +-
 .../parser/inline/oneInline_0016.expected     |   2 +-
 .../parser/inline/oneInline_0017.expected     |   4 +-
 .../parser/inline/oneInline_0018.expected     |   4 +-
 .../parser/inline/oneInline_0019.expected     |   4 +-
 .../parser/inline/oneInline_0020.expected     |   2 +-
 .../parser/inline/oneInline_0021.expected     |   2 +-
 .../parser/inline/oneInline_0022.expected     |   2 +-
 .../parser/inline/role/role_0001.expected     |   6 +-
 .../parser/inline/role/role_0002.expected     |   4 +-
 .../parser/inline/role/role_0003.expected     |  12 +-
 .../parser/inline/role/role_0004.expected     |   8 +-
 .../parser/inline/role/role_0005.expected     |  20 +--
 .../parser/inline/text/text_0001.expected     |   2 +-
 .../metadataBlock/metadataBlock_0001.expected |   2 +-
 .../metadataBlock/metadataBlock_0002.expected |   2 +-
 .../metadataBlock/metadataBlock_0003.expected |   2 +-
 .../nameAndArgs/nameAndArgs_0001.expected     |   4 +-
 .../nameAndArgs/nameAndArgs_0002.expected     |   8 +-
 .../nameAndArgs/nameAndArgs_0003.expected     |  10 +-
 .../nameAndArgs/nameAndArgs_0004.expected     |  10 +-
 .../nameAndArgs/nameAndArgs_0005.expected     |  10 +-
 .../nameAndArgs/nameAndArgs_0006.expected     |   8 +-
 .../nameAndArgs/nameAndArgs_0007.expected     |   4 +-
 .../nameAndArgs/nameAndArgs_0008.expected     |   8 +-
 .../nameAndArgs/nameAndArgs_0009.expected     |   8 +-
 .../nameAndArgs/nameAndArgs_0010.expected     |   8 +-
 src/tests/parser/val/arg_val_0001.expected    |   2 +-
 src/tests/parser/val/arg_val_0002.expected    |   2 +-
 src/tests/parser/val/arg_val_0003.expected    |   4 +-
 src/tests/parser/val/arg_val_0004.expected    |   2 +-
 src/tests/parser/val/arg_val_0005.expected    |   2 +-
 src/tests/parser/val/arg_val_0006.expected    |   2 +-
 src/tests/parser/val/arg_val_0007.expected    |   4 +-
 173 files changed, 767 insertions(+), 767 deletions(-)

diff --git a/src/tests/parser/arg/arg_0001.expected b/src/tests/parser/arg/arg_0001.expected
index f4b58db2c..07cca1148 100644
--- a/src/tests/parser/arg/arg_0001.expected
+++ b/src/tests/parser/arg/arg_0001.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.anon (Verso.Syntax.arg_ident `x))
+  (Lean.Doc.Syntax.anon (Lean.Doc.Syntax.arg_ident `x))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0002.expected b/src/tests/parser/arg/arg_0002.expected
index 3e1b83cfe..415949d8d 100644
--- a/src/tests/parser/arg/arg_0002.expected
+++ b/src/tests/parser/arg/arg_0002.expected
@@ -1,6 +1,6 @@
 Success! Final stack:
-  (Verso.Syntax.named_no_paren
+  (Lean.Doc.Syntax.named_no_paren
    `x
    ":="
-   (Verso.Syntax.arg_num (num "1")))
+   (Lean.Doc.Syntax.arg_num (num "1")))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0003.expected b/src/tests/parser/arg/arg_0003.expected
index a53d228a7..2f1c0fd65 100644
--- a/src/tests/parser/arg/arg_0003.expected
+++ b/src/tests/parser/arg/arg_0003.expected
@@ -1,8 +1,8 @@
 Success! Final stack:
-  (Verso.Syntax.named
+  (Lean.Doc.Syntax.named
    "("
    `x
    ":="
-   (Verso.Syntax.arg_num (num "1"))
+   (Lean.Doc.Syntax.arg_num (num "1"))
    ")")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0004.expected b/src/tests/parser/arg/arg_0004.expected
index dc143ace9..37b2f8400 100644
--- a/src/tests/parser/arg/arg_0004.expected
+++ b/src/tests/parser/arg/arg_0004.expected
@@ -1,5 +1,5 @@
 Failure @0 (⟨1, 0⟩): '
 '; expected '(', '+', '-', identifier or numeral
 Final stack:
-  (Verso.Syntax.arg_str <missing>)
+  (Lean.Doc.Syntax.arg_str <missing>)
 Remaining: "\n(x:=1)"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0005.expected b/src/tests/parser/arg/arg_0005.expected
index 9038bbd35..8b83361a0 100644
--- a/src/tests/parser/arg/arg_0005.expected
+++ b/src/tests/parser/arg/arg_0005.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.flag_on "+" `foo)
+  (Lean.Doc.Syntax.flag_on "+" `foo)
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0006.expected b/src/tests/parser/arg/arg_0006.expected
index 647217ce0..8e2455ac9 100644
--- a/src/tests/parser/arg/arg_0006.expected
+++ b/src/tests/parser/arg/arg_0006.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.flag_off "-" `other)
+  (Lean.Doc.Syntax.flag_off "-" `other)
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0007.expected b/src/tests/parser/arg/arg_0007.expected
index 6108c6195..35abac62b 100644
--- a/src/tests/parser/arg/arg_0007.expected
+++ b/src/tests/parser/arg/arg_0007.expected
@@ -1,4 +1,4 @@
 Failure @2 (⟨1, 2⟩): expected no space before
 Final stack:
-  (Verso.Syntax.flag_off "-" `other)
+  (Lean.Doc.Syntax.flag_off "-" `other)
 Remaining: "other"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0008.expected b/src/tests/parser/arg/arg_0008.expected
index 2dde93014..271999b4a 100644
--- a/src/tests/parser/arg/arg_0008.expected
+++ b/src/tests/parser/arg/arg_0008.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  (Verso.Syntax.named
+  (Lean.Doc.Syntax.named
    "("
    `x
    ":="
-   (Verso.Syntax.arg_num (num "1"))
+   (Lean.Doc.Syntax.arg_num (num "1"))
    ")")
 Remaining:
 "\n"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0009.expected b/src/tests/parser/arg/arg_0009.expected
index 2989b24b8..53aa69cfe 100644
--- a/src/tests/parser/arg/arg_0009.expected
+++ b/src/tests/parser/arg/arg_0009.expected
@@ -1,6 +1,6 @@
 Success! Final stack:
-  (Verso.Syntax.named_no_paren
+  (Lean.Doc.Syntax.named_no_paren
    `x
    ":="
-   (Verso.Syntax.arg_ident `y))
+   (Lean.Doc.Syntax.arg_ident `y))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0010.expected b/src/tests/parser/arg/arg_0010.expected
index fbf3fe3f3..84a495bdf 100644
--- a/src/tests/parser/arg/arg_0010.expected
+++ b/src/tests/parser/arg/arg_0010.expected
@@ -1,8 +1,8 @@
 Success! Final stack:
-  (Verso.Syntax.named
+  (Lean.Doc.Syntax.named
    "("
    `x
    ":="
-   (Verso.Syntax.arg_ident `y)
+   (Lean.Doc.Syntax.arg_ident `y)
    ")")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0011.expected b/src/tests/parser/arg/arg_0011.expected
index af537342d..1d893bf95 100644
--- a/src/tests/parser/arg/arg_0011.expected
+++ b/src/tests/parser/arg/arg_0011.expected
@@ -1,6 +1,6 @@
 Success! Final stack:
-  (Verso.Syntax.named_no_paren
+  (Lean.Doc.Syntax.named_no_paren
    `x
    ":="
-   (Verso.Syntax.arg_str (str "\"y\"")))
+   (Lean.Doc.Syntax.arg_str (str "\"y\"")))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0012.expected b/src/tests/parser/arg/arg_0012.expected
index 25f56d64e..f619c9f29 100644
--- a/src/tests/parser/arg/arg_0012.expected
+++ b/src/tests/parser/arg/arg_0012.expected
@@ -1,7 +1,7 @@
-Failure @3 (⟨1, 3⟩): unterminated string literal; expected identifier or numeral
+Failure @3 (⟨1, 3⟩): unterminated string literal; expected token or numeral
 Final stack:
  • `x
  • ":="
- • (Verso.Syntax.arg_str <missing>)
+ • (Lean.Doc.Syntax.arg_str <missing>)
 
 Remaining: "\"y"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0013.expected b/src/tests/parser/arg/arg_0013.expected
index deb8cb2dd..e4ee4e814 100644
--- a/src/tests/parser/arg/arg_0013.expected
+++ b/src/tests/parser/arg/arg_0013.expected
@@ -1,13 +1,13 @@
 2 failures:
   @7 (⟨1, 7⟩): expected ')'
     ""
-  @7 (⟨1, 7⟩): unterminated string literal; expected identifier or numeral
+  @7 (⟨1, 7⟩): unterminated string literal; expected token or numeral
     ""
 
 Final stack:
-  (Verso.Syntax.named
+  (Lean.Doc.Syntax.named
    "("
    `x
    ":="
-   (Verso.Syntax.arg_str <missing>)
+   (Lean.Doc.Syntax.arg_str <missing>)
    <missing>)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0014.expected b/src/tests/parser/arg/arg_0014.expected
index a665be094..fa5d18aee 100644
--- a/src/tests/parser/arg/arg_0014.expected
+++ b/src/tests/parser/arg/arg_0014.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.anon
-   (Verso.Syntax.arg_num (num "42")))
+  (Lean.Doc.Syntax.anon
+   (Lean.Doc.Syntax.arg_num (num "42")))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0015.expected b/src/tests/parser/arg/arg_0015.expected
index efc95bee2..628222e1c 100644
--- a/src/tests/parser/arg/arg_0015.expected
+++ b/src/tests/parser/arg/arg_0015.expected
@@ -5,13 +5,13 @@
     ""
   @4 (⟨1, 4⟩): expected argument name
     ""
-  @4 (⟨1, 4⟩): unexpected end of input; expected identifier, numeral or string literal
+  @4 (⟨1, 4⟩): unexpected end of input; expected token, numeral or string literal
     ""
 
 Final stack:
-  (Verso.Syntax.named
+  (Lean.Doc.Syntax.named
    "("
    <missing>
    <missing>
-   (Verso.Syntax.arg_str <missing>)
+   (Lean.Doc.Syntax.arg_str <missing>)
    <missing>)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0016.expected b/src/tests/parser/arg/arg_0016.expected
index 2f4f12ca9..830c2c266 100644
--- a/src/tests/parser/arg/arg_0016.expected
+++ b/src/tests/parser/arg/arg_0016.expected
@@ -3,13 +3,13 @@
     ""
   @6 (⟨1, 6⟩): expected ':='
     ""
-  @6 (⟨1, 6⟩): unexpected end of input; expected identifier, numeral or string literal
+  @6 (⟨1, 6⟩): unexpected end of input; expected token, numeral or string literal
     ""
 
 Final stack:
-  (Verso.Syntax.named
+  (Lean.Doc.Syntax.named
    "("
    `x
    <missing>
-   (Verso.Syntax.arg_str <missing>)
+   (Lean.Doc.Syntax.arg_str <missing>)
    <missing>)
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0017.expected b/src/tests/parser/arg/arg_0017.expected
index 1b123b06a..166a8bb2d 100644
--- a/src/tests/parser/arg/arg_0017.expected
+++ b/src/tests/parser/arg/arg_0017.expected
@@ -1,9 +1,9 @@
 Failure @8 (⟨1, 8⟩): expected ')'
 Final stack:
-  (Verso.Syntax.named
+  (Lean.Doc.Syntax.named
    "("
    `x
    ":="
-   (Verso.Syntax.arg_num (num "42"))
+   (Lean.Doc.Syntax.arg_num (num "42"))
    <missing>)
 Remaining: "\n)"
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0018.expected b/src/tests/parser/arg/arg_0018.expected
index eb16be359..c59c669b8 100644
--- a/src/tests/parser/arg/arg_0018.expected
+++ b/src/tests/parser/arg/arg_0018.expected
@@ -1,9 +1,9 @@
 Failure @8 (⟨1, 8⟩): expected ')'
 Final stack:
-  (Verso.Syntax.named
+  (Lean.Doc.Syntax.named
    "("
    `x
    ":="
-   (Verso.Syntax.arg_num (num "42"))
+   (Lean.Doc.Syntax.arg_num (num "42"))
    <missing>)
 Remaining: "\na"
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0001.expected b/src/tests/parser/args/args_0001.expected
index c03173049..8cf69af3b 100644
--- a/src/tests/parser/args/args_0001.expected
+++ b/src/tests/parser/args/args_0001.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  [(Verso.Syntax.anon
-    (Verso.Syntax.arg_num (num "43")))]
+  [(Lean.Doc.Syntax.anon
+    (Lean.Doc.Syntax.arg_num (num "43")))]
 Remaining:
 "\n\"foo\""
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0002.expected b/src/tests/parser/args/args_0002.expected
index a74107a79..81bd7bc6f 100644
--- a/src/tests/parser/args/args_0002.expected
+++ b/src/tests/parser/args/args_0002.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  [(Verso.Syntax.named_no_paren
+  [(Lean.Doc.Syntax.named_no_paren
     `dialect
     ":="
-    (Verso.Syntax.arg_str (str "\"chicken\"")))
-   (Verso.Syntax.anon
-    (Verso.Syntax.arg_num (num "43")))]
+    (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+   (Lean.Doc.Syntax.anon
+    (Lean.Doc.Syntax.arg_num (num "43")))]
 Remaining:
 "\nfoo"
\ No newline at end of file
diff --git a/src/tests/parser/args/args_0003.expected b/src/tests/parser/args/args_0003.expected
index 284274ffd..6edb3eea0 100644
--- a/src/tests/parser/args/args_0003.expected
+++ b/src/tests/parser/args/args_0003.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  [(Verso.Syntax.named_no_paren
+  [(Lean.Doc.Syntax.named_no_paren
     `dialect
     ":="
-    (Verso.Syntax.arg_str (str "\"chicken\"")))
-   (Verso.Syntax.anon
-    (Verso.Syntax.arg_num (num "43")))]
+    (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+   (Lean.Doc.Syntax.anon
+    (Lean.Doc.Syntax.arg_num (num "43")))]
 Remaining:
 "\n(foo)"
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0001.expected b/src/tests/parser/block/block_0001.expected
index a849e7336..755ffd97c 100644
--- a/src/tests/parser/block/block_0001.expected
+++ b/src/tests/parser/block/block_0001.expected
@@ -1,34 +1,34 @@
 Success! Final stack:
-  (Verso.Syntax.ul
+  (Lean.Doc.Syntax.ul
    "ul{"
-   [(Verso.Syntax.li
+   [(Lean.Doc.Syntax.li
      "*"
-     [(Verso.Syntax.para
+     [(Lean.Doc.Syntax.para
        "para{"
-       [(Verso.Syntax.text
+       [(Lean.Doc.Syntax.text
          (str "\"Here's a bullet\""))]
        "}")])
-    (Verso.Syntax.li
+    (Lean.Doc.Syntax.li
      "*"
-     [(Verso.Syntax.para
+     [(Lean.Doc.Syntax.para
        "para{"
-       [(Verso.Syntax.text
+       [(Lean.Doc.Syntax.text
          (str
           "\"and another with some code in it\""))]
        "}")
-      (Verso.Syntax.codeblock
+      (Lean.Doc.Syntax.codeblock
        "````"
        [`lean []]
        "\n"
        (str "\"hey\\n\\nthere\\n\"")
        "````")])
-    (Verso.Syntax.li
+    (Lean.Doc.Syntax.li
      "*"
-     [(Verso.Syntax.para
+     [(Lean.Doc.Syntax.para
        "para{"
-       [(Verso.Syntax.text
+       [(Lean.Doc.Syntax.text
          (str "\"and another one\""))
-        (Verso.Syntax.linebreak
+        (Lean.Doc.Syntax.linebreak
          "line!"
          (str "\"\\n\""))]
        "}")])]
diff --git a/src/tests/parser/block/block_0002.expected b/src/tests/parser/block/block_0002.expected
index a41d1291f..f1b9ec73b 100644
--- a/src/tests/parser/block/block_0002.expected
+++ b/src/tests/parser/block/block_0002.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.command "{" `test [] "}")
+  (Lean.Doc.Syntax.command "{" `test [] "}")
 Remaining:
 "Here's a paragraph."
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0003.expected b/src/tests/parser/block/block_0003.expected
index 668621f4b..7af7884e3 100644
--- a/src/tests/parser/block/block_0003.expected
+++ b/src/tests/parser/block/block_0003.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.command "{" `test [] "}")
+  (Lean.Doc.Syntax.command "{" `test [] "}")
 Remaining:
 " Here's a paragraph."
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0004.expected b/src/tests/parser/block/block_0004.expected
index 668621f4b..7af7884e3 100644
--- a/src/tests/parser/block/block_0004.expected
+++ b/src/tests/parser/block/block_0004.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.command "{" `test [] "}")
+  (Lean.Doc.Syntax.command "{" `test [] "}")
 Remaining:
 " Here's a paragraph."
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0005.expected b/src/tests/parser/block/block_0005.expected
index a41d1291f..f1b9ec73b 100644
--- a/src/tests/parser/block/block_0005.expected
+++ b/src/tests/parser/block/block_0005.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.command "{" `test [] "}")
+  (Lean.Doc.Syntax.command "{" `test [] "}")
 Remaining:
 "Here's a paragraph."
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0006.expected b/src/tests/parser/block/block_0006.expected
index 8ff33eef6..44c01444d 100644
--- a/src/tests/parser/block/block_0006.expected
+++ b/src/tests/parser/block/block_0006.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.command "{" `test [] "}")
+  (Lean.Doc.Syntax.command "{" `test [] "}")
 Remaining:
 "> Here's a blockquote\n\n with multiple paras\n\nthat ends"
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0007.expected b/src/tests/parser/block/block_0007.expected
index d3514372b..da8e1f2e9 100644
--- a/src/tests/parser/block/block_0007.expected
+++ b/src/tests/parser/block/block_0007.expected
@@ -1,15 +1,15 @@
 2 failures:
-  @36 (⟨3, 28⟩): expected identifier
+  @36 (⟨3, 28⟩): expected token
     ""
   @36 (⟨3, 28⟩): unexpected end of input; expected '![', '$$', '$', '[' or '[^'
     ""
 
 Final stack:
-  (Verso.Syntax.para
+  (Lean.Doc.Syntax.para
    "para{"
-   [(Verso.Syntax.role
+   [(Lean.Doc.Syntax.role
      "{"
      <missing>
      "["
-     [(Verso.Syntax.footnote <missing>)]
+     [(Lean.Doc.Syntax.footnote <missing>)]
      "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0008.expected b/src/tests/parser/block/block_0008.expected
index 33740a7c2..e16be6660 100644
--- a/src/tests/parser/block/block_0008.expected
+++ b/src/tests/parser/block/block_0008.expected
@@ -1,15 +1,15 @@
 2 failures:
-  @37 (⟨3, 28⟩): expected identifier
+  @37 (⟨3, 28⟩): expected token
     ""
   @37 (⟨3, 28⟩): unexpected end of input; expected '![', '$$', '$', '[' or '[^'
     ""
 
 Final stack:
-  (Verso.Syntax.para
+  (Lean.Doc.Syntax.para
    "para{"
-   [(Verso.Syntax.role
+   [(Lean.Doc.Syntax.role
      "{"
      <missing>
      "["
-     [(Verso.Syntax.footnote <missing>)]
+     [(Lean.Doc.Syntax.footnote <missing>)]
      "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0009.expected b/src/tests/parser/block/block_0009.expected
index df6c04797..593ab4154 100644
--- a/src/tests/parser/block/block_0009.expected
+++ b/src/tests/parser/block/block_0009.expected
@@ -1,15 +1,15 @@
 2 failures:
-  @44 (⟨4, 28⟩): expected identifier
+  @44 (⟨4, 28⟩): expected token
     ""
   @44 (⟨4, 28⟩): unexpected end of input; expected '![', '$$', '$', '[' or '[^'
     ""
 
 Final stack:
-  (Verso.Syntax.para
+  (Lean.Doc.Syntax.para
    "para{"
-   [(Verso.Syntax.role
+   [(Lean.Doc.Syntax.role
      "{"
      <missing>
      "["
-     [(Verso.Syntax.footnote <missing>)]
+     [(Lean.Doc.Syntax.footnote <missing>)]
      "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0010.expected b/src/tests/parser/block/block_0010.expected
index 7261e8e79..9b0169141 100644
--- a/src/tests/parser/block/block_0010.expected
+++ b/src/tests/parser/block/block_0010.expected
@@ -1,15 +1,15 @@
 2 failures:
-  @45 (⟨4, 28⟩): expected identifier
+  @45 (⟨4, 28⟩): expected token
     ""
   @45 (⟨4, 28⟩): unexpected end of input; expected '![', '$$', '$', '[' or '[^'
     ""
 
 Final stack:
-  (Verso.Syntax.para
+  (Lean.Doc.Syntax.para
    "para{"
-   [(Verso.Syntax.role
+   [(Lean.Doc.Syntax.role
      "{"
      <missing>
      "["
-     [(Verso.Syntax.footnote <missing>)]
+     [(Lean.Doc.Syntax.footnote <missing>)]
      "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0011.expected b/src/tests/parser/block/block_0011.expected
index 1426f8d7c..98d23d662 100644
--- a/src/tests/parser/block/block_0011.expected
+++ b/src/tests/parser/block/block_0011.expected
@@ -1,15 +1,15 @@
 2 failures:
   @19 (⟨6, 0⟩): '{'; expected '![', '$$', '$', '[' or '[^'
     "Here's a paragraph."
-  @19 (⟨6, 0⟩): expected identifier
+  @19 (⟨6, 0⟩): expected token
     "Here's a paragraph."
 
 Final stack:
-  (Verso.Syntax.para
+  (Lean.Doc.Syntax.para
    "para{"
-   [(Verso.Syntax.role
+   [(Lean.Doc.Syntax.role
      "{"
      <missing>
      "["
-     [(Verso.Syntax.footnote <missing>)]
+     [(Lean.Doc.Syntax.footnote <missing>)]
      "]")])
\ No newline at end of file
diff --git a/src/tests/parser/block/block_0012.expected b/src/tests/parser/block/block_0012.expected
index c0e0de3c3..4f9606fd2 100644
--- a/src/tests/parser/block/block_0012.expected
+++ b/src/tests/parser/block/block_0012.expected
@@ -1,81 +1,81 @@
 Success! Final stack:
-  (Verso.Syntax.ul
+  (Lean.Doc.Syntax.ul
    "ul{"
-   [(Verso.Syntax.li
+   [(Lean.Doc.Syntax.li
      "*"
-     [(Verso.Syntax.para
+     [(Lean.Doc.Syntax.para
        "para{"
-       [(Verso.Syntax.code
+       [(Lean.Doc.Syntax.code
          "`"
          (str "\"structure\"")
          "`")
-        (Verso.Syntax.text (str "\" and \""))
-        (Verso.Syntax.code
+        (Lean.Doc.Syntax.text (str "\" and \""))
+        (Lean.Doc.Syntax.code
          "`"
          (str "\"inductive\"")
          "`")
-        (Verso.Syntax.text (str "\" commands\""))]
+        (Lean.Doc.Syntax.text (str "\" commands\""))]
        "}")
-      (Verso.Syntax.ul
+      (Lean.Doc.Syntax.ul
        "ul{"
-       [(Verso.Syntax.li
+       [(Lean.Doc.Syntax.li
          "*"
-         [(Verso.Syntax.para
+         [(Lean.Doc.Syntax.para
            "para{"
-           [(Verso.Syntax.link
+           [(Lean.Doc.Syntax.link
              "["
-             [(Verso.Syntax.text
+             [(Lean.Doc.Syntax.text
                (str "\"#5842\""))]
              "]"
-             (Verso.Syntax.url
+             (Lean.Doc.Syntax.url
               "("
               (str
                "\"https://github.com/leanprover/lean4/pull/5842\"")
               ")"))
-            (Verso.Syntax.text (str "\" and \""))
-            (Verso.Syntax.link
+            (Lean.Doc.Syntax.text (str "\" and \""))
+            (Lean.Doc.Syntax.link
              "["
-             [(Verso.Syntax.text
+             [(Lean.Doc.Syntax.text
                (str "\"#5783\""))]
              "]"
-             (Verso.Syntax.url
+             (Lean.Doc.Syntax.url
               "("
               (str
                "\"https://github.com/leanprover/lean4/pull/5783\"")
               ")"))
-            (Verso.Syntax.text
+            (Lean.Doc.Syntax.text
              (str
               "\" implement a feature where the \""))
-            (Verso.Syntax.code
+            (Lean.Doc.Syntax.code
              "`"
              (str "\"structure\"")
              "`")
-            (Verso.Syntax.text
+            (Lean.Doc.Syntax.text
              (str
               "\" command can now define recursive inductive types:\""))]
            "}")
-          (Verso.Syntax.codeblock
+          (Lean.Doc.Syntax.codeblock
            "```"
            [`lean []]
            "\n"
            (str
             "\"structure Tree where\\n  n : Nat\\n  children : Fin n → Tree\\n\\ndef Tree.size : Tree → Nat\\n  | {n, children} => Id.run do\\n    let mut s := 0\\n    for h : i in [0 : n] do\\n      s := s + (children ⟨i, h.2⟩).size\\n    pure s\\n\"")
            "```")])
-        (Verso.Syntax.li
+        (Lean.Doc.Syntax.li
          "*"
-         [(Verso.Syntax.para
+         [(Lean.Doc.Syntax.para
            "para{"
-           [(Verso.Syntax.link
+           [(Lean.Doc.Syntax.link
              "["
-             [(Verso.Syntax.text
+             [(Lean.Doc.Syntax.text
                (str "\"#5814\""))]
              "]"
-             (Verso.Syntax.url
+             (Lean.Doc.Syntax.url
               "("
               (str
                "\"https://github.com/leanprover/lean4/pull/5814\"")
               ")"))
-            (Verso.Syntax.text (str "\" \""))]
+            (Lean.Doc.Syntax.text (str "\" \""))]
            "}")])]
        "}")])]
    "}")
diff --git a/src/tests/parser/block/blocks/blocks_0001.expected b/src/tests/parser/block/blocks/blocks_0001.expected
index eda419d87..f9979cd6f 100644
--- a/src/tests/parser/block/blocks/blocks_0001.expected
+++ b/src/tests/parser/block/blocks/blocks_0001.expected
@@ -1,12 +1,12 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str
        "\"This is just some textual content. How is it?\""))]
     "}")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"More?\""))]
+    [(Lean.Doc.Syntax.text (str "\"More?\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0002.expected b/src/tests/parser/block/blocks/blocks_0002.expected
index 738114201..5c9f66c66 100644
--- a/src/tests/parser/block/blocks/blocks_0002.expected
+++ b/src/tests/parser/block/blocks/blocks_0002.expected
@@ -1,12 +1,12 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str "\"Newlines are preserved\""))
-     (Verso.Syntax.linebreak
+     (Lean.Doc.Syntax.linebreak
       "line!"
       (str "\"\\n\""))
-     (Verso.Syntax.text
+     (Lean.Doc.Syntax.text
       (str "\"in paragraphs.\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0003.expected b/src/tests/parser/block/blocks/blocks_0003.expected
index 4f5930df1..e332c41af 100644
--- a/src/tests/parser/block/blocks/blocks_0003.expected
+++ b/src/tests/parser/block/blocks/blocks_0003.expected
@@ -1,23 +1,23 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str
        "\"I can describe lists like this one:\""))]
     "}")
-   (Verso.Syntax.ul
+   (Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"a\""))]
+        [(Lean.Doc.Syntax.text (str "\"a\""))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"b\""))]
+        [(Lean.Doc.Syntax.text (str "\"b\""))]
         "}")])]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0004.expected b/src/tests/parser/block/blocks/blocks_0004.expected
index 7271e0ce7..13e93a33b 100644
--- a/src/tests/parser/block/blocks/blocks_0004.expected
+++ b/src/tests/parser/block/blocks/blocks_0004.expected
@@ -1,42 +1,42 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.ul
+      [(Lean.Doc.Syntax.ul
         "ul{"
-        [(Verso.Syntax.li
+        [(Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"A1\""))]
+            [(Lean.Doc.Syntax.text (str "\"A1\""))]
             "}")])
-         (Verso.Syntax.li
+         (Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"A2\""))]
+            [(Lean.Doc.Syntax.text (str "\"A2\""))]
             "}")])]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"B\""))]
+        [(Lean.Doc.Syntax.text (str "\"B\""))]
         "}")
-       (Verso.Syntax.ul
+       (Lean.Doc.Syntax.ul
         "ul{"
-        [(Verso.Syntax.li
+        [(Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"B1\""))]
+            [(Lean.Doc.Syntax.text (str "\"B1\""))]
             "}")])
-         (Verso.Syntax.li
+         (Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"B2\""))]
+            [(Lean.Doc.Syntax.text (str "\"B2\""))]
             "}")])]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0005.expected b/src/tests/parser/block/blocks/blocks_0005.expected
index b1c550ca4..065c8ea7c 100644
--- a/src/tests/parser/block/blocks/blocks_0005.expected
+++ b/src/tests/parser/block/blocks/blocks_0005.expected
@@ -1,35 +1,35 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.ul
+      [(Lean.Doc.Syntax.ul
         "ul{"
-        [(Verso.Syntax.li
+        [(Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"A1\""))]
+            [(Lean.Doc.Syntax.text (str "\"A1\""))]
             "}")])
-         (Verso.Syntax.li
+         (Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"A2\""))
-             (Verso.Syntax.linebreak
+            [(Lean.Doc.Syntax.text (str "\"A2\""))
+             (Lean.Doc.Syntax.linebreak
               "line!"
               (str "\"\\n\""))]
             "}")])]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.ul
+      [(Lean.Doc.Syntax.ul
         "ul{"
-        [(Verso.Syntax.li
+        [(Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"B1\""))]
+            [(Lean.Doc.Syntax.text (str "\"B1\""))]
             "}")])]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0006.expected b/src/tests/parser/block/blocks/blocks_0006.expected
index b1c550ca4..065c8ea7c 100644
--- a/src/tests/parser/block/blocks/blocks_0006.expected
+++ b/src/tests/parser/block/blocks/blocks_0006.expected
@@ -1,35 +1,35 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.ul
+      [(Lean.Doc.Syntax.ul
         "ul{"
-        [(Verso.Syntax.li
+        [(Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"A1\""))]
+            [(Lean.Doc.Syntax.text (str "\"A1\""))]
             "}")])
-         (Verso.Syntax.li
+         (Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"A2\""))
-             (Verso.Syntax.linebreak
+            [(Lean.Doc.Syntax.text (str "\"A2\""))
+             (Lean.Doc.Syntax.linebreak
               "line!"
               (str "\"\\n\""))]
             "}")])]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.ul
+      [(Lean.Doc.Syntax.ul
         "ul{"
-        [(Verso.Syntax.li
+        [(Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"B1\""))]
+            [(Lean.Doc.Syntax.text (str "\"B1\""))]
             "}")])]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0007.expected b/src/tests/parser/block/blocks/blocks_0007.expected
index c6f681b28..863b919e9 100644
--- a/src/tests/parser/block/blocks/blocks_0007.expected
+++ b/src/tests/parser/block/blocks/blocks_0007.expected
@@ -1,10 +1,10 @@
 Failure @2 (⟨2, 0⟩): ':'; expected %%% (at line beginning) or expected column at least 1
 Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.metadata_block
+      [(Lean.Doc.Syntax.metadata_block
         <missing>
         <missing>)
        <missing>])])]
diff --git a/src/tests/parser/block/blocks/blocks_0008.expected b/src/tests/parser/block/blocks/blocks_0008.expected
index 5f2ee8592..84bad49bb 100644
--- a/src/tests/parser/block/blocks/blocks_0008.expected
+++ b/src/tests/parser/block/blocks/blocks_0008.expected
@@ -1,15 +1,15 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"abc\""))]
+        [(Lean.Doc.Syntax.text (str "\"abc\""))]
         "}")
-       (Verso.Syntax.para
+       (Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"def\""))]
+        [(Lean.Doc.Syntax.text (str "\"def\""))]
         "}")])]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0009.expected b/src/tests/parser/block/blocks/blocks_0009.expected
index 77d7094f0..63bb41db6 100644
--- a/src/tests/parser/block/blocks/blocks_0009.expected
+++ b/src/tests/parser/block/blocks/blocks_0009.expected
@@ -1,15 +1,15 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"abc\""))]
+        [(Lean.Doc.Syntax.text (str "\"abc\""))]
         "}")])]
     "}")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"def\""))]
+    [(Lean.Doc.Syntax.text (str "\"def\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0010.expected b/src/tests/parser/block/blocks/blocks_0010.expected
index e63e95469..1df295971 100644
--- a/src/tests/parser/block/blocks/blocks_0010.expected
+++ b/src/tests/parser/block/blocks/blocks_0010.expected
@@ -1,18 +1,18 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"foo\""))]
+        [(Lean.Doc.Syntax.text (str "\"foo\""))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"bar\""))
-         (Verso.Syntax.linebreak
+        [(Lean.Doc.Syntax.text (str "\"bar\""))
+         (Lean.Doc.Syntax.linebreak
           "line!"
           (str "\"\\n\""))]
         "}")])]
diff --git a/src/tests/parser/block/blocks/blocks_0011.expected b/src/tests/parser/block/blocks/blocks_0011.expected
index 31f1bcb88..83fdaf55d 100644
--- a/src/tests/parser/block/blocks/blocks_0011.expected
+++ b/src/tests/parser/block/blocks/blocks_0011.expected
@@ -1,13 +1,13 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.ul
+    [(Lean.Doc.Syntax.ul
       "ul{"
-      [(Verso.Syntax.li
+      [(Lean.Doc.Syntax.li
         "*"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"foo\""))]
+          [(Lean.Doc.Syntax.text (str "\"foo\""))]
           "}")])]
       "}")])]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0012.expected b/src/tests/parser/block/blocks/blocks_0012.expected
index dd8f64e30..20e487547 100644
--- a/src/tests/parser/block/blocks/blocks_0012.expected
+++ b/src/tests/parser/block/blocks/blocks_0012.expected
@@ -1,16 +1,16 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.ol
+    [(Lean.Doc.Syntax.ol
       "ol("
       (num "1")
       ")"
       "{"
-      [(Verso.Syntax.li
+      [(Lean.Doc.Syntax.li
         "1."
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"foo\""))]
+          [(Lean.Doc.Syntax.text (str "\"foo\""))]
           "}")])]
       "}")])]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0013.expected b/src/tests/parser/block/blocks/blocks_0013.expected
index a51fcb64a..f156ea4e2 100644
--- a/src/tests/parser/block/blocks/blocks_0013.expected
+++ b/src/tests/parser/block/blocks/blocks_0013.expected
@@ -1,22 +1,22 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.ul
+    [(Lean.Doc.Syntax.ul
       "ul{"
-      [(Verso.Syntax.li
+      [(Lean.Doc.Syntax.li
         "*"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"foo\""))]
+          [(Lean.Doc.Syntax.text (str "\"foo\""))]
           "}")])]
       "}")
-     (Verso.Syntax.ul
+     (Lean.Doc.Syntax.ul
       "ul{"
-      [(Verso.Syntax.li
+      [(Lean.Doc.Syntax.li
         "*"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"foo\""))]
+          [(Lean.Doc.Syntax.text (str "\"foo\""))]
           "}")])]
       "}")])]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0014.expected b/src/tests/parser/block/blocks/blocks_0014.expected
index c8cf40b3d..f5aedb1ea 100644
--- a/src/tests/parser/block/blocks/blocks_0014.expected
+++ b/src/tests/parser/block/blocks/blocks_0014.expected
@@ -1,23 +1,23 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\"I like quotes\""))]
       "}")
-     (Verso.Syntax.ul
+     (Lean.Doc.Syntax.ul
       "ul{"
-      [(Verso.Syntax.li
+      [(Lean.Doc.Syntax.li
         "*"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text
+          [(Lean.Doc.Syntax.text
             (str "\"Also with lists in them\""))]
           "}")])]
       "}")])
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"Abc\""))]
+    [(Lean.Doc.Syntax.text (str "\"Abc\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0015.expected b/src/tests/parser/block/blocks/blocks_0015.expected
index ab77bea55..e29e740c8 100644
--- a/src/tests/parser/block/blocks/blocks_0015.expected
+++ b/src/tests/parser/block/blocks/blocks_0015.expected
@@ -1,19 +1,19 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.ul
+    [(Lean.Doc.Syntax.ul
       "ul{"
-      [(Verso.Syntax.li
+      [(Lean.Doc.Syntax.li
         "*"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"foo\""))]
+          [(Lean.Doc.Syntax.text (str "\"foo\""))]
           "}")])
-       (Verso.Syntax.li
+       (Lean.Doc.Syntax.li
         "*"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"foo\""))]
+          [(Lean.Doc.Syntax.text (str "\"foo\""))]
           "}")])]
       "}")])]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0016.expected b/src/tests/parser/block/blocks/blocks_0016.expected
index 6cdf93047..cefd59770 100644
--- a/src/tests/parser/block/blocks/blocks_0016.expected
+++ b/src/tests/parser/block/blocks/blocks_0016.expected
@@ -1,24 +1,24 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.blockquote
+    [(Lean.Doc.Syntax.blockquote
       ">"
-      [(Verso.Syntax.ul
+      [(Lean.Doc.Syntax.ul
         "ul{"
-        [(Verso.Syntax.li
+        [(Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"foo\""))]
+            [(Lean.Doc.Syntax.text (str "\"foo\""))]
             "}")])]
         "}")])
-     (Verso.Syntax.ul
+     (Lean.Doc.Syntax.ul
       "ul{"
-      [(Verso.Syntax.li
+      [(Lean.Doc.Syntax.li
         "*"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"foo\""))]
+          [(Lean.Doc.Syntax.text (str "\"foo\""))]
           "}")])]
       "}")])]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0017.expected b/src/tests/parser/block/blocks/blocks_0017.expected
index 69745737a..b2ef0b8f8 100644
--- a/src/tests/parser/block/blocks/blocks_0017.expected
+++ b/src/tests/parser/block/blocks/blocks_0017.expected
@@ -1,22 +1,22 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.ul
+    [(Lean.Doc.Syntax.ul
       "ul{"
-      [(Verso.Syntax.li
+      [(Lean.Doc.Syntax.li
         "*"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"foo\""))]
+          [(Lean.Doc.Syntax.text (str "\"foo\""))]
           "}")])]
       "}")])
-   (Verso.Syntax.ul
+   (Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"foo\""))]
+        [(Lean.Doc.Syntax.text (str "\"foo\""))]
         "}")])]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0018.expected b/src/tests/parser/block/blocks/blocks_0018.expected
index 7ac7b65e6..3239c5f95 100644
--- a/src/tests/parser/block/blocks/blocks_0018.expected
+++ b/src/tests/parser/block/blocks/blocks_0018.expected
@@ -1,15 +1,15 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"foo\""))
-         (Verso.Syntax.linebreak
+        [(Lean.Doc.Syntax.text (str "\"foo\""))
+         (Lean.Doc.Syntax.linebreak
           "line!"
           (str "\"\\n\""))
-         (Verso.Syntax.text (str "\"  thing\""))]
+         (Lean.Doc.Syntax.text (str "\"  thing\""))]
         "}")])]
     "}")]
 Remaining:
diff --git a/src/tests/parser/block/blocks/blocks_0019.expected b/src/tests/parser/block/blocks/blocks_0019.expected
index 9f64cd912..822d174bc 100644
--- a/src/tests/parser/block/blocks/blocks_0019.expected
+++ b/src/tests/parser/block/blocks/blocks_0019.expected
@@ -1,18 +1,18 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "+"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"foo\""))]
+        [(Lean.Doc.Syntax.text (str "\"foo\""))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "+"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"bar\""))
-         (Verso.Syntax.linebreak
+        [(Lean.Doc.Syntax.text (str "\"bar\""))
+         (Lean.Doc.Syntax.linebreak
           "line!"
           (str "\"\\n\""))]
         "}")])]
diff --git a/src/tests/parser/block/blocks/blocks_0020.expected b/src/tests/parser/block/blocks/blocks_0020.expected
index e63e95469..1df295971 100644
--- a/src/tests/parser/block/blocks/blocks_0020.expected
+++ b/src/tests/parser/block/blocks/blocks_0020.expected
@@ -1,18 +1,18 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"foo\""))]
+        [(Lean.Doc.Syntax.text (str "\"foo\""))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"bar\""))
-         (Verso.Syntax.linebreak
+        [(Lean.Doc.Syntax.text (str "\"bar\""))
+         (Lean.Doc.Syntax.linebreak
           "line!"
           (str "\"\\n\""))]
         "}")])]
diff --git a/src/tests/parser/block/blocks/blocks_0021.expected b/src/tests/parser/block/blocks/blocks_0021.expected
index 5f33ae54c..492037f14 100644
--- a/src/tests/parser/block/blocks/blocks_0021.expected
+++ b/src/tests/parser/block/blocks/blocks_0021.expected
@@ -1,32 +1,32 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"foo\""))
-         (Verso.Syntax.linebreak
+        [(Lean.Doc.Syntax.text (str "\"foo\""))
+         (Lean.Doc.Syntax.linebreak
           "line!"
           (str "\"\\n\""))
-         (Verso.Syntax.text (str "\"  stuff\""))]
+         (Lean.Doc.Syntax.text (str "\"  stuff\""))]
         "}")
-       (Verso.Syntax.blockquote
+       (Lean.Doc.Syntax.blockquote
         ">"
-        [(Verso.Syntax.para
+        [(Lean.Doc.Syntax.para
           "para{"
-          [(Verso.Syntax.text (str "\"more \""))]
+          [(Lean.Doc.Syntax.text (str "\"more \""))]
           "}")])
-       (Verso.Syntax.para
+       (Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"abc\""))]
+        [(Lean.Doc.Syntax.text (str "\"abc\""))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"bar\""))
-         (Verso.Syntax.linebreak
+        [(Lean.Doc.Syntax.text (str "\"bar\""))
+         (Lean.Doc.Syntax.linebreak
           "line!"
           (str "\"\\n\""))]
         "}")])]
diff --git a/src/tests/parser/block/blocks/blocks_0022.expected b/src/tests/parser/block/blocks/blocks_0022.expected
index 1008dfbdb..155d39197 100644
--- a/src/tests/parser/block/blocks/blocks_0022.expected
+++ b/src/tests/parser/block/blocks/blocks_0022.expected
@@ -1,26 +1,26 @@
 Success! Final stack:
-  [(Verso.Syntax.ul
+  [(Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"foo\""))]
+        [(Lean.Doc.Syntax.text (str "\"foo\""))]
         "}")
-       (Verso.Syntax.ul
+       (Lean.Doc.Syntax.ul
         "ul{"
-        [(Verso.Syntax.li
+        [(Lean.Doc.Syntax.li
           "*"
-          [(Verso.Syntax.para
+          [(Lean.Doc.Syntax.para
             "para{"
-            [(Verso.Syntax.text (str "\"bar\""))]
+            [(Lean.Doc.Syntax.text (str "\"bar\""))]
             "}")])]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text
+        [(Lean.Doc.Syntax.text
           (str "\"more outer\""))]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0023.expected b/src/tests/parser/block/blocks/blocks_0023.expected
index dc4a0a53b..6fafea3f2 100644
--- a/src/tests/parser/block/blocks/blocks_0023.expected
+++ b/src/tests/parser/block/blocks/blocks_0023.expected
@@ -1,18 +1,18 @@
 Failure @35 (⟨2, 15⟩): unexpected end of input; expected %%% (at line beginning), '![', '$$', '$', '[', '[^', beginning of line at ⟨2, 15⟩ or beginning of line or sequence of nestable block openers at ⟨2, 15⟩
 Final stack:
-  [(Verso.Syntax.dl
+  [(Lean.Doc.Syntax.dl
     "dl{"
-    [(Verso.Syntax.desc
+    [(Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\" an excellent idea\""))
-       (Verso.Syntax.linebreak
+       (Lean.Doc.Syntax.linebreak
         "line!"
         (str "\"\\n\""))
-       (Verso.Syntax.text
+       (Lean.Doc.Syntax.text
         (str "\"Let's say more!\""))]
       "=>"
-      [(Verso.Syntax.metadata_block <missing>)
+      [(Lean.Doc.Syntax.metadata_block <missing>)
        <missing>])]
     "}")]
 Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0024.expected b/src/tests/parser/block/blocks/blocks_0024.expected
index 9b6f82c60..de0467157 100644
--- a/src/tests/parser/block/blocks/blocks_0024.expected
+++ b/src/tests/parser/block/blocks/blocks_0024.expected
@@ -1,14 +1,14 @@
 Success! Final stack:
-  [(Verso.Syntax.dl
+  [(Lean.Doc.Syntax.dl
     "dl{"
-    [(Verso.Syntax.desc
+    [(Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\" an excellent idea\""))]
       "=>"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text
+        [(Lean.Doc.Syntax.text
           (str "\"Let's say more!\""))]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0025.expected b/src/tests/parser/block/blocks/blocks_0025.expected
index 71b8efbe0..875fa0646 100644
--- a/src/tests/parser/block/blocks/blocks_0025.expected
+++ b/src/tests/parser/block/blocks/blocks_0025.expected
@@ -1,20 +1,20 @@
 Failure @47 (⟨7, 0⟩): expected indentation at least 1
 Final stack:
-  [(Verso.Syntax.dl
+  [(Lean.Doc.Syntax.dl
     "dl{"
-    [(Verso.Syntax.desc
+    [(Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\" an excellent idea\""))]
       "=>"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text
+        [(Lean.Doc.Syntax.text
           (str "\"Let's say more!\""))]
         "}")])
-     (Verso.Syntax.desc
+     (Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text (str "\" more\""))]
+      [(Lean.Doc.Syntax.text (str "\" more\""))]
       "=>"
       <missing>)]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0026.expected b/src/tests/parser/block/blocks/blocks_0026.expected
index bd39b0881..22b3cd79e 100644
--- a/src/tests/parser/block/blocks/blocks_0026.expected
+++ b/src/tests/parser/block/blocks/blocks_0026.expected
@@ -1,23 +1,23 @@
 Success! Final stack:
-  [(Verso.Syntax.dl
+  [(Lean.Doc.Syntax.dl
     "dl{"
-    [(Verso.Syntax.desc
+    [(Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\" an excellent idea\""))]
       "=>"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text
+        [(Lean.Doc.Syntax.text
           (str "\"Let's say more!\""))]
         "}")])
-     (Verso.Syntax.desc
+     (Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text (str "\" more\""))]
+      [(Lean.Doc.Syntax.text (str "\" more\""))]
       "=>"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text
+        [(Lean.Doc.Syntax.text
           (str "\"even more!\""))]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0027.expected b/src/tests/parser/block/blocks/blocks_0027.expected
index 532705620..c7cc6f676 100644
--- a/src/tests/parser/block/blocks/blocks_0027.expected
+++ b/src/tests/parser/block/blocks/blocks_0027.expected
@@ -1,23 +1,23 @@
 Success! Final stack:
-  [(Verso.Syntax.dl
+  [(Lean.Doc.Syntax.dl
     "dl{"
-    [(Verso.Syntax.desc
+    [(Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\" an excellent idea\""))]
       "=>"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text
+        [(Lean.Doc.Syntax.text
           (str "\"Let's say more!\""))]
         "}")])
-     (Verso.Syntax.desc
+     (Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text (str "\" more\""))]
+      [(Lean.Doc.Syntax.text (str "\" more\""))]
       "=>"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"stuff\""))]
+        [(Lean.Doc.Syntax.text (str "\"stuff\""))]
         "}")])]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0028.expected b/src/tests/parser/block/blocks/blocks_0028.expected
index c60221983..6387eca66 100644
--- a/src/tests/parser/block/blocks/blocks_0028.expected
+++ b/src/tests/parser/block/blocks/blocks_0028.expected
@@ -1,21 +1,21 @@
 Failure @21 (⟨3, 0⟩): expected indentation at least 1
 Final stack:
-  [(Verso.Syntax.dl
+  [(Lean.Doc.Syntax.dl
     "dl{"
-    [(Verso.Syntax.desc
+    [(Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\" an excellent idea\""))]
       "=>"
       <missing>)]
     "}")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str "\"Let's say more!\""))]
     "}")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"hello\""))]
+    [(Lean.Doc.Syntax.text (str "\"hello\""))]
     "}")]
 Remaining: "Let's say more!\n\nhello"
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0029.expected b/src/tests/parser/block/blocks/blocks_0029.expected
index b2ebb4f89..b0e31ac37 100644
--- a/src/tests/parser/block/blocks/blocks_0029.expected
+++ b/src/tests/parser/block/blocks/blocks_0029.expected
@@ -1,20 +1,20 @@
 Success! Final stack:
-  [(Verso.Syntax.ol
+  [(Lean.Doc.Syntax.ol
     "ol("
     (num "1")
     ")"
     "{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "1."
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"Hello\""))]
+        [(Lean.Doc.Syntax.text (str "\"Hello\""))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "2."
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"World\""))]
+        [(Lean.Doc.Syntax.text (str "\"World\""))]
         "}")])]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0030.expected b/src/tests/parser/block/blocks/blocks_0030.expected
index bc75acfe2..72c633500 100644
--- a/src/tests/parser/block/blocks/blocks_0030.expected
+++ b/src/tests/parser/block/blocks/blocks_0030.expected
@@ -1,14 +1,14 @@
 Success! Final stack:
-  [(Verso.Syntax.ol
+  [(Lean.Doc.Syntax.ol
     "ol("
     (num "1")
     ")"
     "{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "1."
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"Hello\""))]
+        [(Lean.Doc.Syntax.text (str "\"Hello\""))]
         "}")])]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0031.expected b/src/tests/parser/block/blocks/blocks_0031.expected
index 3a8db82df..ac1238881 100644
--- a/src/tests/parser/block/blocks/blocks_0031.expected
+++ b/src/tests/parser/block/blocks/blocks_0031.expected
@@ -1,26 +1,26 @@
 Success! Final stack:
-  [(Verso.Syntax.ol
+  [(Lean.Doc.Syntax.ol
     "ol("
     (num "1")
     ")"
     "{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "1."
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"Hello\""))]
+        [(Lean.Doc.Syntax.text (str "\"Hello\""))]
         "}")])]
     "}")
-   (Verso.Syntax.ol
+   (Lean.Doc.Syntax.ol
     "ol("
     (num "2")
     ")"
     "{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "2."
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"World\""))]
+        [(Lean.Doc.Syntax.text (str "\"World\""))]
         "}")])]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0032.expected b/src/tests/parser/block/blocks/blocks_0032.expected
index b2ebb4f89..b0e31ac37 100644
--- a/src/tests/parser/block/blocks/blocks_0032.expected
+++ b/src/tests/parser/block/blocks/blocks_0032.expected
@@ -1,20 +1,20 @@
 Success! Final stack:
-  [(Verso.Syntax.ol
+  [(Lean.Doc.Syntax.ol
     "ol("
     (num "1")
     ")"
     "{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "1."
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"Hello\""))]
+        [(Lean.Doc.Syntax.text (str "\"Hello\""))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "2."
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"World\""))]
+        [(Lean.Doc.Syntax.text (str "\"World\""))]
         "}")])]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0033.expected b/src/tests/parser/block/blocks/blocks_0033.expected
index 76d77b6b8..8845597f0 100644
--- a/src/tests/parser/block/blocks/blocks_0033.expected
+++ b/src/tests/parser/block/blocks/blocks_0033.expected
@@ -1,10 +1,10 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"hey\""))
-       (Verso.Syntax.linebreak
+      [(Lean.Doc.Syntax.text (str "\"hey\""))
+       (Lean.Doc.Syntax.linebreak
         "line!"
         (str "\"\\n\""))]
       "}")])]
diff --git a/src/tests/parser/block/blocks/blocks_0034.expected b/src/tests/parser/block/blocks/blocks_0034.expected
index 78ee349a7..bf7af691d 100644
--- a/src/tests/parser/block/blocks/blocks_0034.expected
+++ b/src/tests/parser/block/blocks/blocks_0034.expected
@@ -1,6 +1,6 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"n*k \""))]
+    [(Lean.Doc.Syntax.text (str "\"n*k \""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0035.expected b/src/tests/parser/block/blocks/blocks_0035.expected
index f3fb9310f..a5ec8b20d 100644
--- a/src/tests/parser/block/blocks/blocks_0035.expected
+++ b/src/tests/parser/block/blocks/blocks_0035.expected
@@ -1,15 +1,15 @@
 Failure @16 (⟨1, 16⟩): '_'
 Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.bold
+    [(Lean.Doc.Syntax.bold
       "*"
-      [(Verso.Syntax.text (str "\"This is \""))
-       (Verso.Syntax.emph
+      [(Lean.Doc.Syntax.text (str "\"This is \""))
+       (Lean.Doc.Syntax.emph
         "_"
-        [(Verso.Syntax.text (str "\"strong\""))]
+        [(Lean.Doc.Syntax.text (str "\"strong\""))]
         <missing>)]
       "*")
-     (Verso.Syntax.text (str "\" not regular\""))]
+     (Lean.Doc.Syntax.text (str "\" not regular\""))]
     "}")]
 Remaining: "* not regular_ emphasis"
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0036.expected b/src/tests/parser/block/blocks/blocks_0036.expected
index bc3f54df6..44e76edec 100644
--- a/src/tests/parser/block/blocks/blocks_0036.expected
+++ b/src/tests/parser/block/blocks/blocks_0036.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  [(Verso.Syntax.header
+  [(Lean.Doc.Syntax.header
     "header("
     (num "0")
     ")"
     "{"
-    [(Verso.Syntax.text (str "\"Header!\""))]
+    [(Lean.Doc.Syntax.text (str "\"Header!\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0037.expected b/src/tests/parser/block/blocks/blocks_0037.expected
index e3062d8d2..bc03584f0 100644
--- a/src/tests/parser/block/blocks/blocks_0037.expected
+++ b/src/tests/parser/block/blocks/blocks_0037.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  [(Verso.Syntax.header
+  [(Lean.Doc.Syntax.header
     "header("
     (num "1")
     ")"
     "{"
-    [(Verso.Syntax.text (str "\"Header!\""))]
+    [(Lean.Doc.Syntax.text (str "\"Header!\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0038.expected b/src/tests/parser/block/blocks/blocks_0038.expected
index 937bd01e3..b887979dd 100644
--- a/src/tests/parser/block/blocks/blocks_0038.expected
+++ b/src/tests/parser/block/blocks/blocks_0038.expected
@@ -1,13 +1,13 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"Quotation\""))
-       (Verso.Syntax.linebreak
+      [(Lean.Doc.Syntax.text (str "\"Quotation\""))
+       (Lean.Doc.Syntax.linebreak
         "line!"
         (str "\"\\n\""))
-       (Verso.Syntax.text
+       (Lean.Doc.Syntax.text
         (str "\"and contained\""))]
       "}")])]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0039.expected b/src/tests/parser/block/blocks/blocks_0039.expected
index d14b934d2..b4a290108 100644
--- a/src/tests/parser/block/blocks/blocks_0039.expected
+++ b/src/tests/parser/block/blocks/blocks_0039.expected
@@ -1,28 +1,28 @@
 Failure @65 (⟨4, 0⟩): expected '`' to close inline code
 Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"Attention:\""))]
+    [(Lean.Doc.Syntax.text (str "\"Attention:\""))]
     "}")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str
        "\"Here is a paragraph with an unterminated \""))
-     (Verso.Syntax.code
+     (Lean.Doc.Syntax.code
       "`"
       (str "\"code block\"")
       <missing>)
-     (Verso.Syntax.text
+     (Lean.Doc.Syntax.text
       (str
        "\"that would be super annoying without error recovery in the\""))
-     (Verso.Syntax.linebreak
+     (Lean.Doc.Syntax.linebreak
       "line!"
       (str "\"\\n\""))
-     (Verso.Syntax.text (str "\"parser.\""))]
+     (Lean.Doc.Syntax.text (str "\"parser.\""))]
     "}")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"Yep.\""))]
+    [(Lean.Doc.Syntax.text (str "\"Yep.\""))]
     "}")]
 Remaining: "that would be super annoying without error recovery in the\nparser.\n\nYep."
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0040.expected b/src/tests/parser/block/blocks/blocks_0040.expected
index ac5aa9bf2..f3937c886 100644
--- a/src/tests/parser/block/blocks/blocks_0040.expected
+++ b/src/tests/parser/block/blocks/blocks_0040.expected
@@ -7,26 +7,26 @@
     ""
 
 Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str
        "\"Here's some error recovery for directives.\""))]
     "}")
-   (Verso.Syntax.directive
+   (Lean.Doc.Syntax.directive
     "::::"
     `foo
     []
     "\n"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"Indeed.\""))]
+      [(Lean.Doc.Syntax.text (str "\"Indeed.\""))]
       "}")
-     (Verso.Syntax.para
+     (Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"It is.\""))]
+      [(Lean.Doc.Syntax.text (str "\"It is.\""))]
       "}")
-     (Verso.Syntax.directive
+     (Lean.Doc.Syntax.directive
       ":::"
       <missing>
       []
diff --git a/src/tests/parser/block/blocks/blocks_0041.expected b/src/tests/parser/block/blocks/blocks_0041.expected
index 3281aca64..5bbc26730 100644
--- a/src/tests/parser/block/blocks/blocks_0041.expected
+++ b/src/tests/parser/block/blocks/blocks_0041.expected
@@ -7,27 +7,27 @@
     ""
 
 Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str
        "\"Here's some error recovery for directives.\""))]
     "}")
-   (Verso.Syntax.directive
+   (Lean.Doc.Syntax.directive
     ":::"
     `foo
     []
     "\n"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"Indeed.\""))]
+      [(Lean.Doc.Syntax.text (str "\"Indeed.\""))]
       "}")
-     (Verso.Syntax.para
+     (Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"It is.\""))]
+      [(Lean.Doc.Syntax.text (str "\"It is.\""))]
       "}")]
     <missing>)
-   (Verso.Syntax.directive
+   (Lean.Doc.Syntax.directive
     ":::"
     <missing>
     []
diff --git a/src/tests/parser/block/blocks/blocks_0042.expected b/src/tests/parser/block/blocks/blocks_0042.expected
index 6a53c0d4d..e814adc21 100644
--- a/src/tests/parser/block/blocks/blocks_0042.expected
+++ b/src/tests/parser/block/blocks/blocks_0042.expected
@@ -5,36 +5,36 @@
     ""
 
 Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str
        "\"Here's some error recovery for directives.\""))]
     "}")
-   (Verso.Syntax.directive
+   (Lean.Doc.Syntax.directive
     "::::"
     `foo
-    [(Verso.Syntax.anon
-      (Verso.Syntax.arg_num (num "5")))]
+    [(Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_num (num "5")))]
     "\n"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"Indeed.\""))]
+      [(Lean.Doc.Syntax.text (str "\"Indeed.\""))]
       "}")
-     (Verso.Syntax.para
+     (Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"It is.\""))]
+      [(Lean.Doc.Syntax.text (str "\"It is.\""))]
       "}")]
     <missing>)
-   (Verso.Syntax.directive
+   (Lean.Doc.Syntax.directive
     "::::"
     `a
     []
     "\n"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"x\""))
-       (Verso.Syntax.linebreak
+      [(Lean.Doc.Syntax.text (str "\"x\""))
+       (Lean.Doc.Syntax.linebreak
         "line!"
         (str "\"\\n\""))]
       "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0043.expected b/src/tests/parser/block/blocks/blocks_0043.expected
index 6291d7cda..265a145b8 100644
--- a/src/tests/parser/block/blocks/blocks_0043.expected
+++ b/src/tests/parser/block/blocks/blocks_0043.expected
@@ -1,13 +1,13 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"Quotation\""))]
+      [(Lean.Doc.Syntax.text (str "\"Quotation\""))]
       "}")
-     (Verso.Syntax.para
+     (Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\"and contained\""))]
       "}")])]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0044.expected b/src/tests/parser/block/blocks/blocks_0044.expected
index fb5537c42..0686bbd75 100644
--- a/src/tests/parser/block/blocks/blocks_0044.expected
+++ b/src/tests/parser/block/blocks/blocks_0044.expected
@@ -1,13 +1,13 @@
 Success! Final stack:
-  [(Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text (str "\"Quotation\""))]
+      [(Lean.Doc.Syntax.text (str "\"Quotation\""))]
       "}")])
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str "\"and not contained\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0045.expected b/src/tests/parser/block/blocks/blocks_0045.expected
index b3fa03dbf..3d4c9d1d1 100644
--- a/src/tests/parser/block/blocks/blocks_0045.expected
+++ b/src/tests/parser/block/blocks/blocks_0045.expected
@@ -1,8 +1,8 @@
 Success! Final stack:
-  [(Verso.Syntax.command "{" `test [] "}")
-   (Verso.Syntax.para
+  [(Lean.Doc.Syntax.command "{" `test [] "}")
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str "\"Here's a paragraph.\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0046.expected b/src/tests/parser/block/blocks/blocks_0046.expected
index 563eb217f..cafc29d7c 100644
--- a/src/tests/parser/block/blocks/blocks_0046.expected
+++ b/src/tests/parser/block/blocks/blocks_0046.expected
@@ -1,19 +1,19 @@
 Success! Final stack:
-  [(Verso.Syntax.command "{" `test [] "}")
-   (Verso.Syntax.blockquote
+  [(Lean.Doc.Syntax.command "{" `test [] "}")
+   (Lean.Doc.Syntax.blockquote
     ">"
-    [(Verso.Syntax.para
+    [(Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\"Here's a blockquote\""))]
       "}")
-     (Verso.Syntax.para
+     (Lean.Doc.Syntax.para
       "para{"
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\"with multiple paras\""))]
       "}")])
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"that ends\""))]
+    [(Lean.Doc.Syntax.text (str "\"that ends\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0047.expected b/src/tests/parser/block/blocks/blocks_0047.expected
index 79883edeb..8bfe1f7c8 100644
--- a/src/tests/parser/block/blocks/blocks_0047.expected
+++ b/src/tests/parser/block/blocks/blocks_0047.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  [(Verso.Syntax.command "{" `abc [] "}")
-   (Verso.Syntax.command "{" `def [] "}")]
+  [(Lean.Doc.Syntax.command "{" `abc [] "}")
+   (Lean.Doc.Syntax.command "{" `def [] "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0048.expected b/src/tests/parser/block/blocks/blocks_0048.expected
index 210224922..57c0dcb00 100644
--- a/src/tests/parser/block/blocks/blocks_0048.expected
+++ b/src/tests/parser/block/blocks/blocks_0048.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  [(Verso.Syntax.metadata_block
+  [(Lean.Doc.Syntax.metadata_block
     "%%%"
     (Term.structInstFields
      [(Term.structInstField
@@ -12,9 +12,9 @@ Success! Final stack:
          (num "53"))])
       []])
     "%%%")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str "\"Text/paragraph!\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0049.expected b/src/tests/parser/block/blocks/blocks_0049.expected
index 78ba6795e..966111668 100644
--- a/src/tests/parser/block/blocks/blocks_0049.expected
+++ b/src/tests/parser/block/blocks/blocks_0049.expected
@@ -1,20 +1,20 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.link
+    [(Lean.Doc.Syntax.link
       "["
-      [(Verso.Syntax.text (str "\"[link A]\""))]
+      [(Lean.Doc.Syntax.text (str "\"[link A]\""))]
       "]"
-      (Verso.Syntax.url
+      (Lean.Doc.Syntax.url
        "("
        (str "\"https://example.com\"")
        ")"))
-     (Verso.Syntax.text (str "\" \""))
-     (Verso.Syntax.link
+     (Lean.Doc.Syntax.text (str "\" \""))
+     (Lean.Doc.Syntax.link
       "["
-      [(Verso.Syntax.text (str "\"[link B]\""))]
+      [(Lean.Doc.Syntax.text (str "\"[link B]\""))]
       "]"
-      (Verso.Syntax.url
+      (Lean.Doc.Syntax.url
        "("
        (str "\"https://more.example.com\"")
        ")"))]
diff --git a/src/tests/parser/block/blocks/blocks_0050.expected b/src/tests/parser/block/blocks/blocks_0050.expected
index 5a53a7b9d..5b90de958 100644
--- a/src/tests/parser/block/blocks/blocks_0050.expected
+++ b/src/tests/parser/block/blocks/blocks_0050.expected
@@ -1,16 +1,16 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.link
+    [(Lean.Doc.Syntax.link
       "["
-      [(Verso.Syntax.text (str "\"My link\""))]
+      [(Lean.Doc.Syntax.text (str "\"My link\""))]
       "]"
-      (Verso.Syntax.ref
+      (Lean.Doc.Syntax.ref
        "["
        (str "\"lean\"")
        "]"))]
     "}")
-   (Verso.Syntax.link_ref
+   (Lean.Doc.Syntax.link_ref
     "["
     (str "\"lean\"")
     "]:"
diff --git a/src/tests/parser/block/blocks/blocks_0051.expected b/src/tests/parser/block/blocks/blocks_0051.expected
index 5d6b4669f..f3a5f816c 100644
--- a/src/tests/parser/block/blocks/blocks_0051.expected
+++ b/src/tests/parser/block/blocks/blocks_0051.expected
@@ -1,19 +1,19 @@
 Failure @45 (⟨2, 29⟩): expected '(' or '['
 Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.link
+    [(Lean.Doc.Syntax.link
       "["
-      [(Verso.Syntax.text (str "\"My link\""))]
+      [(Lean.Doc.Syntax.text (str "\"My link\""))]
       "]"
-      (Verso.Syntax.ref "[" (str "\"lean\"") "]"))
-     (Verso.Syntax.linebreak
+      (Lean.Doc.Syntax.ref "[" (str "\"lean\"") "]"))
+     (Lean.Doc.Syntax.linebreak
       "line!"
       (str "\"\\n\""))
-     (Verso.Syntax.link
+     (Lean.Doc.Syntax.link
       "["
-      [(Verso.Syntax.text (str "\"lean\""))]
+      [(Lean.Doc.Syntax.text (str "\"lean\""))]
       "]"
-      (Verso.Syntax.url <missing>))]
+      (Lean.Doc.Syntax.url <missing>))]
     "}")]
 Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0052.expected b/src/tests/parser/block/blocks/blocks_0052.expected
index fd47a903f..ef4f90aae 100644
--- a/src/tests/parser/block/blocks/blocks_0052.expected
+++ b/src/tests/parser/block/blocks/blocks_0052.expected
@@ -1,22 +1,22 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.link
+    [(Lean.Doc.Syntax.link
       "["
-      [(Verso.Syntax.text (str "\"My link\""))]
+      [(Lean.Doc.Syntax.text (str "\"My link\""))]
       "]"
-      (Verso.Syntax.ref
+      (Lean.Doc.Syntax.ref
        "["
        (str "\"lean\"")
        "]"))]
     "}")
-   (Verso.Syntax.link_ref
+   (Lean.Doc.Syntax.link_ref
     "["
     (str "\"lean\"")
     "]:"
     (str "\"https://lean-lang.org\""))
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"hello\""))]
+    [(Lean.Doc.Syntax.text (str "\"hello\""))]
     "}")]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0053.expected b/src/tests/parser/block/blocks/blocks_0053.expected
index c70c9601b..dc22d30e4 100644
--- a/src/tests/parser/block/blocks/blocks_0053.expected
+++ b/src/tests/parser/block/blocks/blocks_0053.expected
@@ -1,16 +1,16 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text (str "\"Blah blah\""))
-     (Verso.Syntax.footnote
+    [(Lean.Doc.Syntax.text (str "\"Blah blah\""))
+     (Lean.Doc.Syntax.footnote
       "[^"
       (str "\"1\"")
       "]")]
     "}")
-   (Verso.Syntax.footnote_ref
+   (Lean.Doc.Syntax.footnote_ref
     "[^"
     (str "\"1\"")
     "]:"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str "\"More can be said\""))])]
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0054.expected b/src/tests/parser/block/blocks/blocks_0054.expected
index 2e0e40340..6617b4238 100644
--- a/src/tests/parser/block/blocks/blocks_0054.expected
+++ b/src/tests/parser/block/blocks/blocks_0054.expected
@@ -21,157 +21,157 @@
     "\nis OK. The rest *works*.\n"
 
 Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.linebreak
+    [(Lean.Doc.Syntax.linebreak
       "line!"
       (str "\"\\n\""))
-     (Verso.Syntax.text
+     (Lean.Doc.Syntax.text
       (str "\"Error recovery tests:\""))]
     "}")
-   (Verso.Syntax.ul
+   (Lean.Doc.Syntax.ul
     "ul{"
-    [(Verso.Syntax.li
+    [(Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.link
+        [(Lean.Doc.Syntax.link
           "["
-          [(Verso.Syntax.text
+          [(Lean.Doc.Syntax.text
             (str "\"busted link\""))]
           <missing>)]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.link
+        [(Lean.Doc.Syntax.link
           "["
-          [(Verso.Syntax.text (str "\"busted\""))
-           (Verso.Syntax.linebreak
+          [(Lean.Doc.Syntax.text (str "\"busted\""))
+           (Lean.Doc.Syntax.linebreak
             "line!"
             (str "\"\\n\""))
-           (Verso.Syntax.text
+           (Lean.Doc.Syntax.text
             (str "\"   link\""))]
           <missing>)]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.link
+        [(Lean.Doc.Syntax.link
           "["
-          [(Verso.Syntax.text (str "\"busted\""))
-           (Verso.Syntax.linebreak
+          [(Lean.Doc.Syntax.text (str "\"busted\""))
+           (Lean.Doc.Syntax.linebreak
             "line!"
             (str "\"\\n\""))
-           (Verso.Syntax.text (str "\"   \""))
-           (Verso.Syntax.emph
+           (Lean.Doc.Syntax.text (str "\"   \""))
+           (Lean.Doc.Syntax.emph
             "_"
-            [(Verso.Syntax.text
+            [(Lean.Doc.Syntax.text
               (str "\"italics\""))
-             (Verso.Syntax.linebreak
+             (Lean.Doc.Syntax.linebreak
               "line!"
               (str "\"\\n\""))
-             (Verso.Syntax.text
+             (Lean.Doc.Syntax.text
               (str "\"   link\""))]
             <missing>)]
           <missing>)]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.link
+        [(Lean.Doc.Syntax.link
           "["
-          [(Verso.Syntax.text
+          [(Lean.Doc.Syntax.text
             (str "\"busted destination\""))]
           "]"
-          (Verso.Syntax.url
+          (Lean.Doc.Syntax.url
            "("
            (str "\"hey\"")
            <missing>))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.image
+        [(Lean.Doc.Syntax.image
           "!["
           (str "\"busted image alt text\"")
           <missing>)]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.image
+        [(Lean.Doc.Syntax.image
           "!["
           (str "\"busted image link\"")
           "]"
-          (Verso.Syntax.url
+          (Lean.Doc.Syntax.url
            "("
            (str "\"image.png\"")
            <missing>))]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"a \""))
-         (Verso.Syntax.bold
+        [(Lean.Doc.Syntax.text (str "\"a \""))
+         (Lean.Doc.Syntax.bold
           "*"
-          [(Verso.Syntax.text
+          [(Lean.Doc.Syntax.text
             (str "\"bold choice\""))]
           <missing>)]
         "}")])
-     (Verso.Syntax.li
+     (Lean.Doc.Syntax.li
       "*"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text (str "\"very \""))
-         (Verso.Syntax.emph
+        [(Lean.Doc.Syntax.text (str "\"very \""))
+         (Lean.Doc.Syntax.emph
           "_"
-          [(Verso.Syntax.text (str "\"italic \""))
-           (Verso.Syntax.bold
+          [(Lean.Doc.Syntax.text (str "\"italic \""))
+           (Lean.Doc.Syntax.bold
             "*"
-            [(Verso.Syntax.text
+            [(Lean.Doc.Syntax.text
               (str "\"and bold, onto many\""))
-             (Verso.Syntax.linebreak
+             (Lean.Doc.Syntax.linebreak
               "line!"
               (str "\"\\n\""))
-             (Verso.Syntax.text
+             (Lean.Doc.Syntax.text
               (str "\"   lines is OK\""))]
             "*")
-           (Verso.Syntax.text
+           (Lean.Doc.Syntax.text
             (str "\" but don't forget...\""))]
           <missing>)]
         "}")])]
     "}")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str "\"a paragraph with \""))
-     (Verso.Syntax.link
+     (Lean.Doc.Syntax.link
       "["
-      [(Verso.Syntax.text
+      [(Lean.Doc.Syntax.text
         (str "\"a bad link syntax\""))]
       "]"
-      (Verso.Syntax.url
+      (Lean.Doc.Syntax.url
        "("
        (str "\"http://example.com\"")
        <missing>))
-     (Verso.Syntax.linebreak
+     (Lean.Doc.Syntax.linebreak
       "line!"
       (str "\"\\n\""))
-     (Verso.Syntax.text
+     (Lean.Doc.Syntax.text
       (str "\"is OK. The rest \""))
-     (Verso.Syntax.bold
+     (Lean.Doc.Syntax.bold
       "*"
-      [(Verso.Syntax.text (str "\"works\""))]
+      [(Lean.Doc.Syntax.text (str "\"works\""))]
       "*")
-     (Verso.Syntax.text (str "\".\""))
-     (Verso.Syntax.linebreak
+     (Lean.Doc.Syntax.text (str "\".\""))
+     (Lean.Doc.Syntax.linebreak
       "line!"
       (str "\"\\n\""))]
     "}")]
\ No newline at end of file
diff --git a/src/tests/parser/block/code/codeBlock_0001.expected b/src/tests/parser/block/code/codeBlock_0001.expected
index 0e3d78e4a..c53fe6fcf 100644
--- a/src/tests/parser/block/code/codeBlock_0001.expected
+++ b/src/tests/parser/block/code/codeBlock_0001.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme []]
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0002.expected b/src/tests/parser/block/code/codeBlock_0002.expected
index f12df710d..c043b3019 100644
--- a/src/tests/parser/block/code/codeBlock_0002.expected
+++ b/src/tests/parser/block/code/codeBlock_0002.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme []]
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0003.expected b/src/tests/parser/block/code/codeBlock_0003.expected
index 117c9482c..9092953fa 100644
--- a/src/tests/parser/block/code/codeBlock_0003.expected
+++ b/src/tests/parser/block/code/codeBlock_0003.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    []
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0004.expected b/src/tests/parser/block/code/codeBlock_0004.expected
index 117c9482c..9092953fa 100644
--- a/src/tests/parser/block/code/codeBlock_0004.expected
+++ b/src/tests/parser/block/code/codeBlock_0004.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    []
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0005.expected b/src/tests/parser/block/code/codeBlock_0005.expected
index f12df710d..c043b3019 100644
--- a/src/tests/parser/block/code/codeBlock_0005.expected
+++ b/src/tests/parser/block/code/codeBlock_0005.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme []]
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0006.expected b/src/tests/parser/block/code/codeBlock_0006.expected
index 0e3d78e4a..c53fe6fcf 100644
--- a/src/tests/parser/block/code/codeBlock_0006.expected
+++ b/src/tests/parser/block/code/codeBlock_0006.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme []]
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0007.expected b/src/tests/parser/block/code/codeBlock_0007.expected
index 119a0f228..4109389b5 100644
--- a/src/tests/parser/block/code/codeBlock_0007.expected
+++ b/src/tests/parser/block/code/codeBlock_0007.expected
@@ -1,6 +1,6 @@
 Failure @32 (⟨5, 0⟩): expected column 0
 Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme []]
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0008.expected b/src/tests/parser/block/code/codeBlock_0008.expected
index 9e884bd69..5bb5a3913 100644
--- a/src/tests/parser/block/code/codeBlock_0008.expected
+++ b/src/tests/parser/block/code/codeBlock_0008.expected
@@ -1,6 +1,6 @@
 Failure @25 (⟨3, 0⟩): expected column 1
 Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme []]
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0009.expected b/src/tests/parser/block/code/codeBlock_0009.expected
index 5872b1ae4..224612461 100644
--- a/src/tests/parser/block/code/codeBlock_0009.expected
+++ b/src/tests/parser/block/code/codeBlock_0009.expected
@@ -1,6 +1,6 @@
 Failure @32 (⟨4, 3⟩): expected column 1
 Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme []]
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0010.expected b/src/tests/parser/block/code/codeBlock_0010.expected
index c6f7e19f2..ac290ed14 100644
--- a/src/tests/parser/block/code/codeBlock_0010.expected
+++ b/src/tests/parser/block/code/codeBlock_0010.expected
@@ -1,6 +1,6 @@
 Failure @25 (⟨4, 3⟩): expected column 1
 Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    []
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0011.expected b/src/tests/parser/block/code/codeBlock_0011.expected
index bea4a2304..c71422ee6 100644
--- a/src/tests/parser/block/code/codeBlock_0011.expected
+++ b/src/tests/parser/block/code/codeBlock_0011.expected
@@ -1,6 +1,6 @@
 Failure @28 (⟨4, 3⟩): expected column 1
 Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    []
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0012.expected b/src/tests/parser/block/code/codeBlock_0012.expected
index 12988bc52..c69187b2f 100644
--- a/src/tests/parser/block/code/codeBlock_0012.expected
+++ b/src/tests/parser/block/code/codeBlock_0012.expected
@@ -1,13 +1,13 @@
 Success! Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme
-    [(Verso.Syntax.named_no_paren
+    [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Verso.Syntax.arg_str (str "\"chicken\"")))
-     (Verso.Syntax.anon
-      (Verso.Syntax.arg_num (num "43")))]]
+      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+     (Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_num (num "43")))]]
    "\n"
    (str "\"(define x 4)\\nx\\n\"")
    "```")
diff --git a/src/tests/parser/block/code/codeBlock_0013.expected b/src/tests/parser/block/code/codeBlock_0013.expected
index 4cc30845e..cb0e09fba 100644
--- a/src/tests/parser/block/code/codeBlock_0013.expected
+++ b/src/tests/parser/block/code/codeBlock_0013.expected
@@ -1,12 +1,12 @@
 Success! Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme
-    [(Verso.Syntax.named
+    [(Lean.Doc.Syntax.named
       "("
       `dialect
       ":="
-      (Verso.Syntax.arg_str (str "\"chicken\""))
+      (Lean.Doc.Syntax.arg_str (str "\"chicken\""))
       ")")]]
    "\n"
    (str "\"(define x 4)\\nx\\n\"")
diff --git a/src/tests/parser/block/code/codeBlock_0014.expected b/src/tests/parser/block/code/codeBlock_0014.expected
index 668840f31..2c79fd4e3 100644
--- a/src/tests/parser/block/code/codeBlock_0014.expected
+++ b/src/tests/parser/block/code/codeBlock_0014.expected
@@ -1,13 +1,13 @@
 Failure @30 (⟨1, 30⟩): expected ')'
 Final stack:
-  (Verso.Syntax.codeblock
+  (Lean.Doc.Syntax.codeblock
    "```"
    [`scheme
-    [(Verso.Syntax.named
+    [(Lean.Doc.Syntax.named
       "("
       `dialect
       ":="
-      (Verso.Syntax.arg_str (str "\"chicken\""))
+      (Lean.Doc.Syntax.arg_str (str "\"chicken\""))
       <missing>)]]
    "\n"
    (str "\"(define x 4)\\nx\\n\"")
diff --git a/src/tests/parser/block/directive/directive_0001.expected b/src/tests/parser/block/directive/directive_0001.expected
index 9f4075031..5c3341cce 100644
--- a/src/tests/parser/block/directive/directive_0001.expected
+++ b/src/tests/parser/block/directive/directive_0001.expected
@@ -1,12 +1,12 @@
 Success! Final stack:
-  (Verso.Syntax.directive
+  (Lean.Doc.Syntax.directive
    "::::"
    `multiPara
    []
    "\n"
-   [(Verso.Syntax.para
+   [(Lean.Doc.Syntax.para
      "para{"
-     [(Verso.Syntax.text (str "\"foo\""))]
+     [(Lean.Doc.Syntax.text (str "\"foo\""))]
      "}")]
    "::::")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0002.expected b/src/tests/parser/block/directive/directive_0002.expected
index 9f4075031..5c3341cce 100644
--- a/src/tests/parser/block/directive/directive_0002.expected
+++ b/src/tests/parser/block/directive/directive_0002.expected
@@ -1,12 +1,12 @@
 Success! Final stack:
-  (Verso.Syntax.directive
+  (Lean.Doc.Syntax.directive
    "::::"
    `multiPara
    []
    "\n"
-   [(Verso.Syntax.para
+   [(Lean.Doc.Syntax.para
      "para{"
-     [(Verso.Syntax.text (str "\"foo\""))]
+     [(Lean.Doc.Syntax.text (str "\"foo\""))]
      "}")]
    "::::")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0003.expected b/src/tests/parser/block/directive/directive_0003.expected
index 5a5e99bc9..ad92d1654 100644
--- a/src/tests/parser/block/directive/directive_0003.expected
+++ b/src/tests/parser/block/directive/directive_0003.expected
@@ -1,15 +1,15 @@
 Success! Final stack:
-  (Verso.Syntax.directive
+  (Lean.Doc.Syntax.directive
    ":::"
    `multiPara
-   [(Verso.Syntax.named_no_paren
+   [(Lean.Doc.Syntax.named_no_paren
      `greatness
      ":="
-     (Verso.Syntax.arg_str (str "\"amazing!\"")))]
+     (Lean.Doc.Syntax.arg_str (str "\"amazing!\"")))]
    "\n"
-   [(Verso.Syntax.para
+   [(Lean.Doc.Syntax.para
      "para{"
-     [(Verso.Syntax.text (str "\"foo\""))]
+     [(Lean.Doc.Syntax.text (str "\"foo\""))]
      "}")]
    ":::")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/directive/directive_0004.expected b/src/tests/parser/block/directive/directive_0004.expected
index 935e2bccd..54c523dad 100644
--- a/src/tests/parser/block/directive/directive_0004.expected
+++ b/src/tests/parser/block/directive/directive_0004.expected
@@ -1,20 +1,20 @@
 Success! Final stack:
-  (Verso.Syntax.directive
+  (Lean.Doc.Syntax.directive
    ":::"
    `multiPara
    []
    "\n"
-   [(Verso.Syntax.para
+   [(Lean.Doc.Syntax.para
      "para{"
-     [(Verso.Syntax.text (str "\"foo\""))]
+     [(Lean.Doc.Syntax.text (str "\"foo\""))]
      "}")
-    (Verso.Syntax.ul
+    (Lean.Doc.Syntax.ul
      "ul{"
-     [(Verso.Syntax.li
+     [(Lean.Doc.Syntax.li
        "*"
-       [(Verso.Syntax.para
+       [(Lean.Doc.Syntax.para
          "para{"
-         [(Verso.Syntax.text
+         [(Lean.Doc.Syntax.text
            (str "\"List item \""))]
          "}")])]
      "}")]
diff --git a/src/tests/parser/block/directive/directive_0005.expected b/src/tests/parser/block/directive/directive_0005.expected
index 5ff417b7d..b59c7b716 100644
--- a/src/tests/parser/block/directive/directive_0005.expected
+++ b/src/tests/parser/block/directive/directive_0005.expected
@@ -1,21 +1,21 @@
 Success! Final stack:
-  (Verso.Syntax.directive
+  (Lean.Doc.Syntax.directive
    ":::"
    `multiPara
-   [(Verso.Syntax.anon
-     (Verso.Syntax.arg_ident `thing))]
+   [(Lean.Doc.Syntax.anon
+     (Lean.Doc.Syntax.arg_ident `thing))]
    "\n"
-   [(Verso.Syntax.para
+   [(Lean.Doc.Syntax.para
      "para{"
-     [(Verso.Syntax.text (str "\"foo\""))]
+     [(Lean.Doc.Syntax.text (str "\"foo\""))]
      "}")
-    (Verso.Syntax.ul
+    (Lean.Doc.Syntax.ul
      "ul{"
-     [(Verso.Syntax.li
+     [(Lean.Doc.Syntax.li
        "*"
-       [(Verso.Syntax.para
+       [(Lean.Doc.Syntax.para
          "para{"
-         [(Verso.Syntax.text
+         [(Lean.Doc.Syntax.text
            (str "\"List item \""))]
          "}")])]
      "}")]
diff --git a/src/tests/parser/block/directive/directive_0006.expected b/src/tests/parser/block/directive/directive_0006.expected
index 935e2bccd..54c523dad 100644
--- a/src/tests/parser/block/directive/directive_0006.expected
+++ b/src/tests/parser/block/directive/directive_0006.expected
@@ -1,20 +1,20 @@
 Success! Final stack:
-  (Verso.Syntax.directive
+  (Lean.Doc.Syntax.directive
    ":::"
    `multiPara
    []
    "\n"
-   [(Verso.Syntax.para
+   [(Lean.Doc.Syntax.para
      "para{"
-     [(Verso.Syntax.text (str "\"foo\""))]
+     [(Lean.Doc.Syntax.text (str "\"foo\""))]
      "}")
-    (Verso.Syntax.ul
+    (Lean.Doc.Syntax.ul
      "ul{"
-     [(Verso.Syntax.li
+     [(Lean.Doc.Syntax.li
        "*"
-       [(Verso.Syntax.para
+       [(Lean.Doc.Syntax.para
          "para{"
-         [(Verso.Syntax.text
+         [(Lean.Doc.Syntax.text
            (str "\"List item \""))]
          "}")])]
      "}")]
diff --git a/src/tests/parser/block/header/header_0001.expected b/src/tests/parser/block/header/header_0001.expected
index 9f1422f48..0170d4860 100644
--- a/src/tests/parser/block/header/header_0001.expected
+++ b/src/tests/parser/block/header/header_0001.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  (Verso.Syntax.header
+  (Lean.Doc.Syntax.header
    "header("
    (num "0")
    ")"
    "{"
-   [(Verso.Syntax.text (str "\"Header!\""))]
+   [(Lean.Doc.Syntax.text (str "\"Header!\""))]
    "}")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/block/recover/recoverBlock_0001.expected b/src/tests/parser/block/recover/recoverBlock_0001.expected
index d32847d88..9d5f3f6ad 100644
--- a/src/tests/parser/block/recover/recoverBlock_0001.expected
+++ b/src/tests/parser/block/recover/recoverBlock_0001.expected
@@ -1,40 +1,40 @@
 Failure @55 (⟨3, 0⟩): '{'; expected '![', '$$', '$', '[' or '[^'
 Final stack:
-  (Verso.Syntax.para
+  (Lean.Doc.Syntax.para
    "para{"
-   [(Verso.Syntax.role
+   [(Lean.Doc.Syntax.role
      "{"
      `tactic
      []
      "}"
      "["
-     [(Verso.Syntax.code "`" (str "\"rw\"") "`")]
+     [(Lean.Doc.Syntax.code "`" (str "\"rw\"") "`")]
      "]")
-    (Verso.Syntax.role
+    (Lean.Doc.Syntax.role
      "{"
      `lit
      []
      "}"
      "["
-     [(Verso.Syntax.code
+     [(Lean.Doc.Syntax.code
        "`"
        (str "\" [t] \"")
        "`")]
      "]")
-    (Verso.Syntax.role
+    (Lean.Doc.Syntax.role
      "{"
      `kw
      []
      "}"
      "["
-     [(Verso.Syntax.code "`" (str "\"at\"") "`")]
+     [(Lean.Doc.Syntax.code "`" (str "\"at\"") "`")]
      "]")
-    (Verso.Syntax.role
+    (Lean.Doc.Syntax.role
      "{"
      `lit
      []
      "}"
      "["
-     [(Verso.Syntax.footnote <missing>)]
+     [(Lean.Doc.Syntax.footnote <missing>)]
      "]")])
 Remaining: "test"
\ No newline at end of file
diff --git a/src/tests/parser/blocks/recover/recoverBlocks_0001.expected b/src/tests/parser/blocks/recover/recoverBlocks_0001.expected
index cfdfdb07f..e2c00cb0d 100644
--- a/src/tests/parser/blocks/recover/recoverBlocks_0001.expected
+++ b/src/tests/parser/blocks/recover/recoverBlocks_0001.expected
@@ -1,44 +1,44 @@
 Failure @92 (⟨7, 0⟩): '{'; expected '![', '$$', '$', '[' or '[^'
 Final stack:
-  [(Verso.Syntax.dl
+  [(Lean.Doc.Syntax.dl
     "dl{"
-    [(Verso.Syntax.desc
+    [(Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text (str "\" \""))
-       (Verso.Syntax.role
+      [(Lean.Doc.Syntax.text (str "\" \""))
+       (Lean.Doc.Syntax.role
         "{"
         `ref
-        [(Verso.Syntax.anon
-          (Verso.Syntax.arg_ident `defs))]
+        [(Lean.Doc.Syntax.anon
+          (Lean.Doc.Syntax.arg_ident `defs))]
         "}"
         "["
-        [(Verso.Syntax.text
+        [(Lean.Doc.Syntax.text
           (str "\"Basic definitions\""))]
         "]")]
       "=>"
-      [(Verso.Syntax.para
+      [(Lean.Doc.Syntax.para
         "para{"
-        [(Verso.Syntax.text
+        [(Lean.Doc.Syntax.text
           (str "\"The def is something\""))]
         "}")])
-     (Verso.Syntax.desc
+     (Lean.Doc.Syntax.desc
       ":"
-      [(Verso.Syntax.text (str "\" \""))
-       (Verso.Syntax.role
+      [(Lean.Doc.Syntax.text (str "\" \""))
+       (Lean.Doc.Syntax.role
         "{"
         `ref
-        [(Verso.Syntax.anon
-          (Verso.Syntax.arg_ident `large))]
+        [(Lean.Doc.Syntax.anon
+          (Lean.Doc.Syntax.arg_ident `large))]
         "}"
         "["
-        [(Verso.Syntax.role
+        [(Lean.Doc.Syntax.role
           "{"
           `Sufficiently
-          [(Verso.Syntax.anon
-            (Verso.Syntax.arg_ident `large))]
+          [(Lean.Doc.Syntax.anon
+            (Lean.Doc.Syntax.arg_ident `large))]
           "}"
           "["
-          [(Verso.Syntax.footnote <missing>)]
+          [(Lean.Doc.Syntax.footnote <missing>)]
           "]")]
         "]")])])]
 Remaining: "  More text\n\n: `foo`\n\n  Thing\n"
\ No newline at end of file
diff --git a/src/tests/parser/document/document_0001.expected b/src/tests/parser/document/document_0001.expected
index 299394199..fb006f0ba 100644
--- a/src/tests/parser/document/document_0001.expected
+++ b/src/tests/parser/document/document_0001.expected
@@ -1,18 +1,18 @@
 Success! Final stack:
-  [(Verso.Syntax.para
+  [(Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.image
+    [(Lean.Doc.Syntax.image
       "!["
       (str "\"Lean logo\"")
       "]"
-      (Verso.Syntax.url
+      (Lean.Doc.Syntax.url
        "("
        (str "\"/static/lean_logo.svg\"")
        ")"))]
     "}")
-   (Verso.Syntax.para
+   (Lean.Doc.Syntax.para
     "para{"
-    [(Verso.Syntax.text
+    [(Lean.Doc.Syntax.text
       (str
        "\"This is an example website/blog, for testing purposes.\""))]
     "}")]
diff --git a/src/tests/parser/inline/code/code_0001.expected b/src/tests/parser/inline/code/code_0001.expected
index 7409b094f..6faadc05a 100644
--- a/src/tests/parser/inline/code/code_0001.expected
+++ b/src/tests/parser/inline/code/code_0001.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.code
+  (Lean.Doc.Syntax.code
    "``"
    (str "\"foo bar\"")
    "``")
diff --git a/src/tests/parser/inline/code/code_0002.expected b/src/tests/parser/inline/code/code_0002.expected
index 4c7243669..cd7d7a06a 100644
--- a/src/tests/parser/inline/code/code_0002.expected
+++ b/src/tests/parser/inline/code/code_0002.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\" \"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\" \"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0003.expected b/src/tests/parser/inline/code/code_0003.expected
index 465db60b0..549b305de 100644
--- a/src/tests/parser/inline/code/code_0003.expected
+++ b/src/tests/parser/inline/code/code_0003.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\"  \"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\"  \"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0004.expected b/src/tests/parser/inline/code/code_0004.expected
index ee0783b27..b121bb503 100644
--- a/src/tests/parser/inline/code/code_0004.expected
+++ b/src/tests/parser/inline/code/code_0004.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\"   \"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\"   \"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0005.expected b/src/tests/parser/inline/code/code_0005.expected
index dcd20f976..1af0b73d3 100644
--- a/src/tests/parser/inline/code/code_0005.expected
+++ b/src/tests/parser/inline/code/code_0005.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\"x\"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\"x\"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0006.expected b/src/tests/parser/inline/code/code_0006.expected
index d7bc318e0..32c839c11 100644
--- a/src/tests/parser/inline/code/code_0006.expected
+++ b/src/tests/parser/inline/code/code_0006.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.code
+  (Lean.Doc.Syntax.code
    "``"
    (str "\"foo `stuff` bar\"")
    "``")
diff --git a/src/tests/parser/inline/code/code_0007.expected b/src/tests/parser/inline/code/code_0007.expected
index 31602b6d6..35297485f 100644
--- a/src/tests/parser/inline/code/code_0007.expected
+++ b/src/tests/parser/inline/code/code_0007.expected
@@ -1,6 +1,6 @@
 Failure @4 (⟨1, 4⟩): expected '`' to close inline code
 Final stack:
-  (Verso.Syntax.code
+  (Lean.Doc.Syntax.code
    "`"
    (str "\"foo\"")
    <missing>)
diff --git a/src/tests/parser/inline/code/code_0008.expected b/src/tests/parser/inline/code/code_0008.expected
index 835451129..aff92ea2b 100644
--- a/src/tests/parser/inline/code/code_0008.expected
+++ b/src/tests/parser/inline/code/code_0008.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\" foo\"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\" foo\"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0009.expected b/src/tests/parser/inline/code/code_0009.expected
index 3f8e82e20..2e0a05c54 100644
--- a/src/tests/parser/inline/code/code_0009.expected
+++ b/src/tests/parser/inline/code/code_0009.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\"foo\"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\"foo\"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0010.expected b/src/tests/parser/inline/code/code_0010.expected
index 00dcc932b..e8bab7f78 100644
--- a/src/tests/parser/inline/code/code_0010.expected
+++ b/src/tests/parser/inline/code/code_0010.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\"fo\\no\"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\"fo\\no\"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/code/code_0011.expected b/src/tests/parser/inline/code/code_0011.expected
index 2ee02947d..f4be83ef0 100644
--- a/src/tests/parser/inline/code/code_0011.expected
+++ b/src/tests/parser/inline/code/code_0011.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "``" (str "\"`x\"") "``")
+  (Lean.Doc.Syntax.code "``" (str "\"`x\"") "``")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0001.expected b/src/tests/parser/inline/emph/emph_0001.expected
index c7bf43d0d..13f6c44a3 100644
--- a/src/tests/parser/inline/emph/emph_0001.expected
+++ b/src/tests/parser/inline/emph/emph_0001.expected
@@ -1,6 +1,6 @@
 Success! Final stack:
-  (Verso.Syntax.emph
+  (Lean.Doc.Syntax.emph
    "_"
-   [(Verso.Syntax.text (str "\"aa\""))]
+   [(Lean.Doc.Syntax.text (str "\"aa\""))]
    "_")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0002.expected b/src/tests/parser/inline/emph/emph_0002.expected
index 4fd415bbb..c9eb95adb 100644
--- a/src/tests/parser/inline/emph/emph_0002.expected
+++ b/src/tests/parser/inline/emph/emph_0002.expected
@@ -1,7 +1,7 @@
 Failure @4 (⟨1, 4⟩): expected '_' without preceding space
 Final stack:
-  (Verso.Syntax.emph
+  (Lean.Doc.Syntax.emph
    "_"
-   [(Verso.Syntax.text (str "\"aa \""))]
+   [(Lean.Doc.Syntax.text (str "\"aa \""))]
    <missing>)
 Remaining: "_"
\ No newline at end of file
diff --git a/src/tests/parser/inline/emph/emph_0003.expected b/src/tests/parser/inline/emph/emph_0003.expected
index 1745da6cf..a86956ca6 100644
--- a/src/tests/parser/inline/emph/emph_0003.expected
+++ b/src/tests/parser/inline/emph/emph_0003.expected
@@ -1,4 +1,4 @@
 Failure @0 (⟨1, 0⟩): unexpected space or newline after opener
 Final stack:
-  (Verso.Syntax.emph "_" <missing>)
+  (Lean.Doc.Syntax.emph "_" <missing>)
 Remaining: "_ aa_"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0001.expected b/src/tests/parser/inline/oneInline_0001.expected
index 7409b094f..6faadc05a 100644
--- a/src/tests/parser/inline/oneInline_0001.expected
+++ b/src/tests/parser/inline/oneInline_0001.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.code
+  (Lean.Doc.Syntax.code
    "``"
    (str "\"foo bar\"")
    "``")
diff --git a/src/tests/parser/inline/oneInline_0002.expected b/src/tests/parser/inline/oneInline_0002.expected
index d7bc318e0..32c839c11 100644
--- a/src/tests/parser/inline/oneInline_0002.expected
+++ b/src/tests/parser/inline/oneInline_0002.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.code
+  (Lean.Doc.Syntax.code
    "``"
    (str "\"foo `stuff` bar\"")
    "``")
diff --git a/src/tests/parser/inline/oneInline_0003.expected b/src/tests/parser/inline/oneInline_0003.expected
index 31602b6d6..35297485f 100644
--- a/src/tests/parser/inline/oneInline_0003.expected
+++ b/src/tests/parser/inline/oneInline_0003.expected
@@ -1,6 +1,6 @@
 Failure @4 (⟨1, 4⟩): expected '`' to close inline code
 Final stack:
-  (Verso.Syntax.code
+  (Lean.Doc.Syntax.code
    "`"
    (str "\"foo\"")
    <missing>)
diff --git a/src/tests/parser/inline/oneInline_0004.expected b/src/tests/parser/inline/oneInline_0004.expected
index 835451129..aff92ea2b 100644
--- a/src/tests/parser/inline/oneInline_0004.expected
+++ b/src/tests/parser/inline/oneInline_0004.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\" foo\"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\" foo\"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0005.expected b/src/tests/parser/inline/oneInline_0005.expected
index 3f8e82e20..2e0a05c54 100644
--- a/src/tests/parser/inline/oneInline_0005.expected
+++ b/src/tests/parser/inline/oneInline_0005.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\"foo\"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\"foo\"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0006.expected b/src/tests/parser/inline/oneInline_0006.expected
index 00dcc932b..e8bab7f78 100644
--- a/src/tests/parser/inline/oneInline_0006.expected
+++ b/src/tests/parser/inline/oneInline_0006.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.code "`" (str "\"fo\\no\"") "`")
+  (Lean.Doc.Syntax.code "`" (str "\"fo\\no\"") "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0007.expected b/src/tests/parser/inline/oneInline_0007.expected
index 7d97ba631..e8271e541 100644
--- a/src/tests/parser/inline/oneInline_0007.expected
+++ b/src/tests/parser/inline/oneInline_0007.expected
@@ -1,6 +1,6 @@
 Failure @6 (⟨2, 0⟩): expected '``' to close inline code
 Final stack:
-  (Verso.Syntax.code
+  (Lean.Doc.Syntax.code
    "``"
    (str "\" fo\"")
    <missing>)
diff --git a/src/tests/parser/inline/oneInline_0008.expected b/src/tests/parser/inline/oneInline_0008.expected
index 227bb1501..3c2384895 100644
--- a/src/tests/parser/inline/oneInline_0008.expected
+++ b/src/tests/parser/inline/oneInline_0008.expected
@@ -1,10 +1,10 @@
 Success! Final stack:
-  (Verso.Syntax.bold
+  (Lean.Doc.Syntax.bold
    "**"
-   [(Verso.Syntax.text (str "\"aa\""))
-    (Verso.Syntax.linebreak
+   [(Lean.Doc.Syntax.text (str "\"aa\""))
+    (Lean.Doc.Syntax.linebreak
      "line!"
      (str "\"\\n\""))
-    (Verso.Syntax.text (str "\"bb\""))]
+    (Lean.Doc.Syntax.text (str "\"bb\""))]
    "**")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0009.expected b/src/tests/parser/inline/oneInline_0009.expected
index 36d98e82d..ff7a12a23 100644
--- a/src/tests/parser/inline/oneInline_0009.expected
+++ b/src/tests/parser/inline/oneInline_0009.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.text (str "\"a \""))
+  (Lean.Doc.Syntax.text (str "\"a \""))
 Remaining:
 "* b"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0010.expected b/src/tests/parser/inline/oneInline_0010.expected
index bd840f8ca..6633c3fb0 100644
--- a/src/tests/parser/inline/oneInline_0010.expected
+++ b/src/tests/parser/inline/oneInline_0010.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  (Verso.Syntax.link
+  (Lean.Doc.Syntax.link
    "["
-   [(Verso.Syntax.text (str "\"Wikipedia\""))]
+   [(Lean.Doc.Syntax.text (str "\"Wikipedia\""))]
    "]"
-   (Verso.Syntax.url
+   (Lean.Doc.Syntax.url
     "("
     (str "\"https://en.wikipedia.org\"")
     ")"))
diff --git a/src/tests/parser/inline/oneInline_0011.expected b/src/tests/parser/inline/oneInline_0011.expected
index 5b2a623f0..ee49cae64 100644
--- a/src/tests/parser/inline/oneInline_0011.expected
+++ b/src/tests/parser/inline/oneInline_0011.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  (Verso.Syntax.image
+  (Lean.Doc.Syntax.image
    "!["
    (str "\"\"")
    "]"
-   (Verso.Syntax.url
+   (Lean.Doc.Syntax.url
     "("
     (str "\"logo.png\"")
     ")"))
diff --git a/src/tests/parser/inline/oneInline_0012.expected b/src/tests/parser/inline/oneInline_0012.expected
index c73fa1761..eb0441996 100644
--- a/src/tests/parser/inline/oneInline_0012.expected
+++ b/src/tests/parser/inline/oneInline_0012.expected
@@ -1,10 +1,10 @@
 Failure @12 (⟨1, 12⟩): expected ')'
 Final stack:
-  (Verso.Syntax.image
+  (Lean.Doc.Syntax.image
    "!["
    (str "\"\"")
    "]"
-   (Verso.Syntax.url
+   (Lean.Doc.Syntax.url
     "("
     (str "\"logo.png\"")
     <missing>))
diff --git a/src/tests/parser/inline/oneInline_0013.expected b/src/tests/parser/inline/oneInline_0013.expected
index 7366711c5..419d9fa04 100644
--- a/src/tests/parser/inline/oneInline_0013.expected
+++ b/src/tests/parser/inline/oneInline_0013.expected
@@ -1,6 +1,6 @@
 Failure @5 (⟨1, 5⟩): expected ']'
 Final stack:
-  (Verso.Syntax.image
+  (Lean.Doc.Syntax.image
    "!["
    (str "\"abc\"")
    <missing>)
diff --git a/src/tests/parser/inline/oneInline_0014.expected b/src/tests/parser/inline/oneInline_0014.expected
index 87932bcab..5e7d1406e 100644
--- a/src/tests/parser/inline/oneInline_0014.expected
+++ b/src/tests/parser/inline/oneInline_0014.expected
@@ -1,9 +1,9 @@
 Success! Final stack:
-  (Verso.Syntax.image
+  (Lean.Doc.Syntax.image
    "!["
    (str "\"alt text is good\"")
    "]"
-   (Verso.Syntax.url
+   (Lean.Doc.Syntax.url
     "("
     (str "\"logo.png\"")
     ")"))
diff --git a/src/tests/parser/inline/oneInline_0015.expected b/src/tests/parser/inline/oneInline_0015.expected
index 51f41544b..f30b4eae1 100644
--- a/src/tests/parser/inline/oneInline_0015.expected
+++ b/src/tests/parser/inline/oneInline_0015.expected
@@ -1,8 +1,8 @@
 Failure @19 (⟨1, 19⟩): expected '(' or '['
 Final stack:
-  (Verso.Syntax.image
+  (Lean.Doc.Syntax.image
    "!["
    (str "\"alt text is good\"")
    "]"
-   (Verso.Syntax.url <missing>))
+   (Lean.Doc.Syntax.url <missing>))
 Remaining: "](logo.png)"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0016.expected b/src/tests/parser/inline/oneInline_0016.expected
index f675b82df..a782aac03 100644
--- a/src/tests/parser/inline/oneInline_0016.expected
+++ b/src/tests/parser/inline/oneInline_0016.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.footnote "[^" (str "\"1\"") "]")
+  (Lean.Doc.Syntax.footnote "[^" (str "\"1\"") "]")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0017.expected b/src/tests/parser/inline/oneInline_0017.expected
index 52307cc80..5c46fd5dd 100644
--- a/src/tests/parser/inline/oneInline_0017.expected
+++ b/src/tests/parser/inline/oneInline_0017.expected
@@ -1,7 +1,7 @@
 Success! Final stack:
-  (Verso.Syntax.inline_math
+  (Lean.Doc.Syntax.inline_math
    "$"
-   (Verso.Syntax.code
+   (Lean.Doc.Syntax.code
     "`"
     (str "\"\\\\frac{x}{4}\"")
     "`"))
diff --git a/src/tests/parser/inline/oneInline_0018.expected b/src/tests/parser/inline/oneInline_0018.expected
index 216d47795..63cae14fc 100644
--- a/src/tests/parser/inline/oneInline_0018.expected
+++ b/src/tests/parser/inline/oneInline_0018.expected
@@ -1,7 +1,7 @@
 Success! Final stack:
-  (Verso.Syntax.inline_math
+  (Lean.Doc.Syntax.inline_math
    "$"
-   (Verso.Syntax.code
+   (Lean.Doc.Syntax.code
     "`"
     (str "\"\\\\frac{\\n  x\\n}{\\n  4\\n}\\n\"")
     "`"))
diff --git a/src/tests/parser/inline/oneInline_0019.expected b/src/tests/parser/inline/oneInline_0019.expected
index fc0efef47..cc8fe55b0 100644
--- a/src/tests/parser/inline/oneInline_0019.expected
+++ b/src/tests/parser/inline/oneInline_0019.expected
@@ -1,7 +1,7 @@
 Success! Final stack:
-  (Verso.Syntax.display_math
+  (Lean.Doc.Syntax.display_math
    "$$"
-   (Verso.Syntax.code
+   (Lean.Doc.Syntax.code
     "`"
     (str "\"\\\\frac{x}{4}\"")
     "`"))
diff --git a/src/tests/parser/inline/oneInline_0020.expected b/src/tests/parser/inline/oneInline_0020.expected
index e910adc72..83045d754 100644
--- a/src/tests/parser/inline/oneInline_0020.expected
+++ b/src/tests/parser/inline/oneInline_0020.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.text (str "\"$35.23\""))
+  (Lean.Doc.Syntax.text (str "\"$35.23\""))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0021.expected b/src/tests/parser/inline/oneInline_0021.expected
index f543a5160..45d204a4a 100644
--- a/src/tests/parser/inline/oneInline_0021.expected
+++ b/src/tests/parser/inline/oneInline_0021.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.text (str "\"$\""))
+  (Lean.Doc.Syntax.text (str "\"$\""))
 Remaining:
 "`code`"
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0022.expected b/src/tests/parser/inline/oneInline_0022.expected
index f72b84543..f92e87787 100644
--- a/src/tests/parser/inline/oneInline_0022.expected
+++ b/src/tests/parser/inline/oneInline_0022.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.text (str "\"$$$\""))
+  (Lean.Doc.Syntax.text (str "\"$$$\""))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0001.expected b/src/tests/parser/inline/role/role_0001.expected
index 9f0cedf53..c1dba89e8 100644
--- a/src/tests/parser/inline/role/role_0001.expected
+++ b/src/tests/parser/inline/role/role_0001.expected
@@ -1,13 +1,13 @@
 Success! Final stack:
-  (Verso.Syntax.role
+  (Lean.Doc.Syntax.role
    "{"
    `hello
    []
    "}"
    "["
-   [(Verso.Syntax.bold
+   [(Lean.Doc.Syntax.bold
      "*"
-     [(Verso.Syntax.text (str "\"there\""))]
+     [(Lean.Doc.Syntax.text (str "\"there\""))]
      "*")]
    "]")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0002.expected b/src/tests/parser/inline/role/role_0002.expected
index 68704bd0f..f6f692160 100644
--- a/src/tests/parser/inline/role/role_0002.expected
+++ b/src/tests/parser/inline/role/role_0002.expected
@@ -1,10 +1,10 @@
 Success! Final stack:
-  (Verso.Syntax.role
+  (Lean.Doc.Syntax.role
    "{"
    `hello
    []
    "}"
    "["
-   [(Verso.Syntax.text (str "\"there\""))]
+   [(Lean.Doc.Syntax.text (str "\"there\""))]
    "]")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0003.expected b/src/tests/parser/inline/role/role_0003.expected
index b839fb5c3..8b13c052b 100644
--- a/src/tests/parser/inline/role/role_0003.expected
+++ b/src/tests/parser/inline/role/role_0003.expected
@@ -1,19 +1,19 @@
 Success! Final stack:
-  (Verso.Syntax.role
+  (Lean.Doc.Syntax.role
    "{"
    `ref
-   [(Verso.Syntax.anon
-     (Verso.Syntax.arg_ident `other))]
+   [(Lean.Doc.Syntax.anon
+     (Lean.Doc.Syntax.arg_ident `other))]
    "}"
    "["
-   [(Verso.Syntax.role
+   [(Lean.Doc.Syntax.role
      "{"
      `leanKw
      []
      "}"
      "["
-     [(Verso.Syntax.code "`" (str "\"cmd\"") "`")]
+     [(Lean.Doc.Syntax.code "`" (str "\"cmd\"") "`")]
      "]")
-    (Verso.Syntax.text (str "\" is great\""))]
+    (Lean.Doc.Syntax.text (str "\" is great\""))]
    "]")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0004.expected b/src/tests/parser/inline/role/role_0004.expected
index ff9b08027..759bf6389 100644
--- a/src/tests/parser/inline/role/role_0004.expected
+++ b/src/tests/parser/inline/role/role_0004.expected
@@ -1,13 +1,13 @@
 Success! Final stack:
-  (Verso.Syntax.role
+  (Lean.Doc.Syntax.role
    "{"
    `hello
-   [(Verso.Syntax.named_no_paren
+   [(Lean.Doc.Syntax.named_no_paren
      `world
      ":="
-     (Verso.Syntax.arg_ident `gaia))]
+     (Lean.Doc.Syntax.arg_ident `gaia))]
    "}"
    "["
-   [(Verso.Syntax.text (str "\"there\""))]
+   [(Lean.Doc.Syntax.text (str "\"there\""))]
    "]")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0005.expected b/src/tests/parser/inline/role/role_0005.expected
index 41eb440fe..64524609b 100644
--- a/src/tests/parser/inline/role/role_0005.expected
+++ b/src/tests/parser/inline/role/role_0005.expected
@@ -1,23 +1,23 @@
 Success! Final stack:
-  (Verso.Syntax.role
+  (Lean.Doc.Syntax.role
    "{"
    `hello
-   [(Verso.Syntax.named_no_paren
+   [(Lean.Doc.Syntax.named_no_paren
      `world
      ":="
-     (Verso.Syntax.arg_ident `gaia))]
+     (Lean.Doc.Syntax.arg_ident `gaia))]
    "}"
    "["
-   [(Verso.Syntax.text (str "\"there \""))
-    (Verso.Syntax.bold
+   [(Lean.Doc.Syntax.text (str "\"there \""))
+    (Lean.Doc.Syntax.bold
      "*"
-     [(Verso.Syntax.text (str "\"is\""))]
+     [(Lean.Doc.Syntax.text (str "\"is\""))]
      "*")
-    (Verso.Syntax.text (str "\" \""))
-    (Verso.Syntax.emph
+    (Lean.Doc.Syntax.text (str "\" \""))
+    (Lean.Doc.Syntax.emph
      "_"
-     [(Verso.Syntax.text (str "\"a meaning!\""))]
+     [(Lean.Doc.Syntax.text (str "\"a meaning!\""))]
      "_")
-    (Verso.Syntax.text (str "\" \""))]
+    (Lean.Doc.Syntax.text (str "\" \""))]
    "]")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/text/text_0001.expected b/src/tests/parser/inline/text/text_0001.expected
index 2977e07e1..d5fd8568d 100644
--- a/src/tests/parser/inline/text/text_0001.expected
+++ b/src/tests/parser/inline/text/text_0001.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.text (str "\" \""))
+  (Lean.Doc.Syntax.text (str "\" \""))
 Remaining:
 "[\\[link\\]](https://link.com)"
\ No newline at end of file
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0001.expected b/src/tests/parser/metadataBlock/metadataBlock_0001.expected
index 24e332352..606e773fc 100644
--- a/src/tests/parser/metadataBlock/metadataBlock_0001.expected
+++ b/src/tests/parser/metadataBlock/metadataBlock_0001.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.metadata_block
+  (Lean.Doc.Syntax.metadata_block
    "%%%"
    (Term.structInstFields [])
    "%%%")
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0002.expected b/src/tests/parser/metadataBlock/metadataBlock_0002.expected
index d45d3f516..c09d89257 100644
--- a/src/tests/parser/metadataBlock/metadataBlock_0002.expected
+++ b/src/tests/parser/metadataBlock/metadataBlock_0002.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.metadata_block
+  (Lean.Doc.Syntax.metadata_block
    "%%%"
    (Term.structInstFields
     [(Term.structInstField
diff --git a/src/tests/parser/metadataBlock/metadataBlock_0003.expected b/src/tests/parser/metadataBlock/metadataBlock_0003.expected
index 63f5783a4..aa689840f 100644
--- a/src/tests/parser/metadataBlock/metadataBlock_0003.expected
+++ b/src/tests/parser/metadataBlock/metadataBlock_0003.expected
@@ -1,5 +1,5 @@
 Success! Final stack:
-  (Verso.Syntax.metadata_block
+  (Lean.Doc.Syntax.metadata_block
    "%%%"
    (Term.structInstFields
     [(Term.structInstField
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0001.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0001.expected
index 857f12afe..c9820cb0c 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0001.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0001.expected
@@ -1,8 +1,8 @@
 Success! Final stack:
  • `leanExample
- • [(Verso.Syntax.named_no_paren
+ • [(Lean.Doc.Syntax.named_no_paren
       `context
       ":="
-      (Verso.Syntax.arg_num (num "2")))]
+      (Lean.Doc.Syntax.arg_num (num "2")))]
 
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
index ac3de7ea6..caa2fa138 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
@@ -1,10 +1,10 @@
 Success! Final stack:
  • `scheme
- • [(Verso.Syntax.named_no_paren
+ • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Verso.Syntax.arg_str (str "\"chicken\"")))
-     (Verso.Syntax.anon
-      (Verso.Syntax.arg_num (num "43")))]
+      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+     (Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_num (num "43")))]
 
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
index 942cabea4..99b139cff 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
@@ -1,11 +1,11 @@
 Success! Final stack:
  • `scheme
- • [(Verso.Syntax.named_no_paren
+ • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Verso.Syntax.arg_str (str "\"chicken\"")))
-     (Verso.Syntax.anon
-      (Verso.Syntax.arg_num (num "43")))
-     (Verso.Syntax.flag_on "+" `foo)]
+      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+     (Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_num (num "43")))
+     (Lean.Doc.Syntax.flag_on "+" `foo)]
 
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
index 0752e7089..0426937fb 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
@@ -1,12 +1,12 @@
 Failure @29 (⟨1, 29⟩): expected flag name
 Final stack:
  • `scheme
- • [(Verso.Syntax.named_no_paren
+ • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Verso.Syntax.arg_str (str "\"chicken\"")))
-     (Verso.Syntax.flag_on "+" <missing>)
-     (Verso.Syntax.anon
-      (Verso.Syntax.arg_num (num "99")))]
+      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+     (Lean.Doc.Syntax.flag_on "+" <missing>)
+     (Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_num (num "99")))]
 
 Remaining: " 99"
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
index 57248e902..57ab90840 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
@@ -1,12 +1,12 @@
 Failure @28 (⟨1, 28⟩): expected no space before
 Final stack:
  • `scheme
- • [(Verso.Syntax.named_no_paren
+ • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Verso.Syntax.arg_str (str "\"chicken\"")))
-     (Verso.Syntax.flag_on "+" `x)
-     (Verso.Syntax.anon
-      (Verso.Syntax.arg_num (num "99")))]
+      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+     (Lean.Doc.Syntax.flag_on "+" `x)
+     (Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_num (num "99")))]
 
 Remaining: "x 99"
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
index cfc92aa81..db8bdd078 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
@@ -1,11 +1,11 @@
 Success! Final stack:
  • `scheme
- • [(Verso.Syntax.named_no_paren
+ • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Verso.Syntax.arg_str (str "\"chicken\"")))
-     (Verso.Syntax.anon
-      (Verso.Syntax.arg_num (num "43")))]
+      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+     (Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_num (num "43")))]
 
 Remaining:
 "\n(foo)"
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0007.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0007.expected
index ddea45f16..5a0d8a8b3 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0007.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0007.expected
@@ -1,6 +1,6 @@
 Success! Final stack:
  • `leanExample
- • [(Verso.Syntax.anon
-      (Verso.Syntax.arg_ident `context))]
+ • [(Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_ident `context))]
 
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0008.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0008.expected
index 4e7a4518e..541147b6c 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0008.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0008.expected
@@ -1,8 +1,8 @@
 Success! Final stack:
  • `leanExample
- • [(Verso.Syntax.anon
-      (Verso.Syntax.arg_ident `context))
-     (Verso.Syntax.anon
-      (Verso.Syntax.arg_ident `more))]
+ • [(Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_ident `context))
+     (Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_ident `more))]
 
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
index b9eec4730..ee1aa7a5d 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
@@ -1,10 +1,10 @@
 Success! Final stack:
  • `leanExample
- • [(Verso.Syntax.anon
-      (Verso.Syntax.arg_ident `context))
-     (Verso.Syntax.named_no_paren
+ • [(Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_ident `context))
+     (Lean.Doc.Syntax.named_no_paren
       `more
       ":="
-      (Verso.Syntax.arg_str (str "\"stuff\"")))]
+      (Lean.Doc.Syntax.arg_str (str "\"stuff\"")))]
 
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
index 367b429bd..f69a300fd 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
@@ -1,11 +1,11 @@
 Success! Final stack:
  • `leanExample
- • [(Verso.Syntax.anon
-      (Verso.Syntax.arg_ident `context))
-     (Verso.Syntax.named_no_paren
+ • [(Lean.Doc.Syntax.anon
+      (Lean.Doc.Syntax.arg_ident `context))
+     (Lean.Doc.Syntax.named_no_paren
       `more
       ":="
-      (Verso.Syntax.arg_str (str "\"stuff\"")))]
+      (Lean.Doc.Syntax.arg_str (str "\"stuff\"")))]
 
 Remaining:
 "\n\nabc"
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0001.expected b/src/tests/parser/val/arg_val_0001.expected
index 4e818ea8b..a07cba777 100644
--- a/src/tests/parser/val/arg_val_0001.expected
+++ b/src/tests/parser/val/arg_val_0001.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.arg_num (num "1"))
+  (Lean.Doc.Syntax.arg_num (num "1"))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0002.expected b/src/tests/parser/val/arg_val_0002.expected
index b4bd90e9a..bb0af9adc 100644
--- a/src/tests/parser/val/arg_val_0002.expected
+++ b/src/tests/parser/val/arg_val_0002.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.arg_num (num "3"))
+  (Lean.Doc.Syntax.arg_num (num "3"))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0003.expected b/src/tests/parser/val/arg_val_0003.expected
index f7b61d60a..352b2df68 100644
--- a/src/tests/parser/val/arg_val_0003.expected
+++ b/src/tests/parser/val/arg_val_0003.expected
@@ -1,4 +1,4 @@
-Failure @0 (⟨1, 0⟩): unexpected end of input; expected identifier, numeral or string literal
+Failure @0 (⟨1, 0⟩): unexpected end of input; expected token, numeral or string literal
 Final stack:
-  (Verso.Syntax.arg_str <missing>)
+  (Lean.Doc.Syntax.arg_str <missing>)
 Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0004.expected b/src/tests/parser/val/arg_val_0004.expected
index e99159fbe..3473ba6e3 100644
--- a/src/tests/parser/val/arg_val_0004.expected
+++ b/src/tests/parser/val/arg_val_0004.expected
@@ -1,3 +1,3 @@
 Success! Final stack:
-  (Verso.Syntax.arg_str (str "\"a b c\t d\""))
+  (Lean.Doc.Syntax.arg_str (str "\"a b c\t d\""))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0005.expected b/src/tests/parser/val/arg_val_0005.expected
index 1fab98123..05c15691c 100644
--- a/src/tests/parser/val/arg_val_0005.expected
+++ b/src/tests/parser/val/arg_val_0005.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.arg_str (str "\"a b c\t d\""))
+  (Lean.Doc.Syntax.arg_str (str "\"a b c\t d\""))
 Remaining:
 "\n"
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0006.expected b/src/tests/parser/val/arg_val_0006.expected
index 1a98bd11d..37d5f420a 100644
--- a/src/tests/parser/val/arg_val_0006.expected
+++ b/src/tests/parser/val/arg_val_0006.expected
@@ -1,4 +1,4 @@
 Success! Final stack:
-  (Verso.Syntax.arg_num (num "43"))
+  (Lean.Doc.Syntax.arg_num (num "43"))
 Remaining:
 "\n\"foo\""
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0007.expected b/src/tests/parser/val/arg_val_0007.expected
index 2e157c1bb..b1fe7ba92 100644
--- a/src/tests/parser/val/arg_val_0007.expected
+++ b/src/tests/parser/val/arg_val_0007.expected
@@ -1,4 +1,4 @@
-Failure @0 (⟨1, 0⟩): unterminated string literal; expected identifier or numeral
+Failure @0 (⟨1, 0⟩): unterminated string literal; expected token or numeral
 Final stack:
-  (Verso.Syntax.arg_str <missing>)
+  (Lean.Doc.Syntax.arg_str <missing>)
 Remaining: "\"foo"
\ No newline at end of file

From 38881ad9d4642f99a6b7d662e524aa3325b03541 Mon Sep 17 00:00:00 2001
From: Jason Reed <jcreed@gmail.com>
Date: Tue, 30 Sep 2025 16:33:43 -0400
Subject: [PATCH 3/3] Apply lake test -- --update-expected

Manually inspected, all are mere whitespace changes or 'identifier' ~
'token' rewording changes.
---
 src/tests/parser/arg/arg_0001.expected               |  3 ++-
 src/tests/parser/arg/arg_0012.expected               |  2 +-
 src/tests/parser/arg/arg_0013.expected               |  2 +-
 src/tests/parser/arg/arg_0015.expected               |  2 +-
 src/tests/parser/arg/arg_0016.expected               |  2 +-
 src/tests/parser/block/block_0012.expected           |  6 ++++--
 src/tests/parser/block/blocks/blocks_0004.expected   | 12 ++++++++----
 src/tests/parser/block/blocks/blocks_0005.expected   |  6 ++++--
 src/tests/parser/block/blocks/blocks_0006.expected   |  6 ++++--
 src/tests/parser/block/blocks/blocks_0016.expected   |  3 ++-
 src/tests/parser/block/blocks/blocks_0018.expected   |  3 ++-
 src/tests/parser/block/blocks/blocks_0021.expected   |  6 ++++--
 src/tests/parser/block/blocks/blocks_0022.expected   |  3 ++-
 src/tests/parser/block/blocks/blocks_0035.expected   |  6 ++++--
 src/tests/parser/block/blocks/blocks_0038.expected   |  3 ++-
 src/tests/parser/block/blocks/blocks_0039.expected   |  3 ++-
 src/tests/parser/block/blocks/blocks_0043.expected   |  3 ++-
 src/tests/parser/block/blocks/blocks_0044.expected   |  3 ++-
 src/tests/parser/block/blocks/blocks_0049.expected   |  6 ++++--
 src/tests/parser/block/blocks/blocks_0051.expected   |  5 ++++-
 src/tests/parser/block/blocks/blocks_0054.expected   |  9 ++++++---
 src/tests/parser/block/code/codeBlock_0012.expected  |  3 ++-
 src/tests/parser/block/code/codeBlock_0013.expected  |  3 ++-
 src/tests/parser/block/code/codeBlock_0014.expected  |  3 ++-
 .../parser/block/directive/directive_0003.expected   |  3 ++-
 .../parser/block/recover/recoverBlock_0001.expected  | 10 ++++++++--
 src/tests/parser/inline/code/code_0010.expected      |  5 ++++-
 src/tests/parser/inline/oneInline_0006.expected      |  5 ++++-
 src/tests/parser/inline/oneInline_0016.expected      |  5 ++++-
 src/tests/parser/inline/role/role_0003.expected      |  5 ++++-
 src/tests/parser/inline/role/role_0005.expected      |  3 ++-
 .../parser/nameAndArgs/nameAndArgs_0002.expected     |  3 ++-
 .../parser/nameAndArgs/nameAndArgs_0003.expected     |  3 ++-
 .../parser/nameAndArgs/nameAndArgs_0004.expected     |  3 ++-
 .../parser/nameAndArgs/nameAndArgs_0005.expected     |  3 ++-
 .../parser/nameAndArgs/nameAndArgs_0006.expected     |  3 ++-
 .../parser/nameAndArgs/nameAndArgs_0009.expected     |  3 ++-
 .../parser/nameAndArgs/nameAndArgs_0010.expected     |  3 ++-
 src/tests/parser/val/arg_val_0003.expected           |  2 +-
 src/tests/parser/val/arg_val_0007.expected           |  2 +-
 40 files changed, 112 insertions(+), 52 deletions(-)

diff --git a/src/tests/parser/arg/arg_0001.expected b/src/tests/parser/arg/arg_0001.expected
index 07cca1148..e3baa4533 100644
--- a/src/tests/parser/arg/arg_0001.expected
+++ b/src/tests/parser/arg/arg_0001.expected
@@ -1,3 +1,4 @@
 Success! Final stack:
-  (Lean.Doc.Syntax.anon (Lean.Doc.Syntax.arg_ident `x))
+  (Lean.Doc.Syntax.anon
+   (Lean.Doc.Syntax.arg_ident `x))
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/arg/arg_0012.expected b/src/tests/parser/arg/arg_0012.expected
index f619c9f29..035ea4ed1 100644
--- a/src/tests/parser/arg/arg_0012.expected
+++ b/src/tests/parser/arg/arg_0012.expected
@@ -1,4 +1,4 @@
-Failure @3 (⟨1, 3⟩): unterminated string literal; expected token or numeral
+Failure @3 (⟨1, 3⟩): unterminated string literal; expected identifier or numeral
 Final stack:
  • `x
  • ":="
diff --git a/src/tests/parser/arg/arg_0013.expected b/src/tests/parser/arg/arg_0013.expected
index e4ee4e814..289e11307 100644
--- a/src/tests/parser/arg/arg_0013.expected
+++ b/src/tests/parser/arg/arg_0013.expected
@@ -1,7 +1,7 @@
 2 failures:
   @7 (⟨1, 7⟩): expected ')'
     ""
-  @7 (⟨1, 7⟩): unterminated string literal; expected token or numeral
+  @7 (⟨1, 7⟩): unterminated string literal; expected identifier or numeral
     ""
 
 Final stack:
diff --git a/src/tests/parser/arg/arg_0015.expected b/src/tests/parser/arg/arg_0015.expected
index 628222e1c..7e5eadbb8 100644
--- a/src/tests/parser/arg/arg_0015.expected
+++ b/src/tests/parser/arg/arg_0015.expected
@@ -5,7 +5,7 @@
     ""
   @4 (⟨1, 4⟩): expected argument name
     ""
-  @4 (⟨1, 4⟩): unexpected end of input; expected token, numeral or string literal
+  @4 (⟨1, 4⟩): unexpected end of input; expected identifier, numeral or string literal
     ""
 
 Final stack:
diff --git a/src/tests/parser/arg/arg_0016.expected b/src/tests/parser/arg/arg_0016.expected
index 830c2c266..a9100b217 100644
--- a/src/tests/parser/arg/arg_0016.expected
+++ b/src/tests/parser/arg/arg_0016.expected
@@ -3,7 +3,7 @@
     ""
   @6 (⟨1, 6⟩): expected ':='
     ""
-  @6 (⟨1, 6⟩): unexpected end of input; expected token, numeral or string literal
+  @6 (⟨1, 6⟩): unexpected end of input; expected identifier, numeral or string literal
     ""
 
 Final stack:
diff --git a/src/tests/parser/block/block_0012.expected b/src/tests/parser/block/block_0012.expected
index 4f9606fd2..5ae56c0c7 100644
--- a/src/tests/parser/block/block_0012.expected
+++ b/src/tests/parser/block/block_0012.expected
@@ -14,7 +14,8 @@ Success! Final stack:
          "`"
          (str "\"inductive\"")
          "`")
-        (Lean.Doc.Syntax.text (str "\" commands\""))]
+        (Lean.Doc.Syntax.text
+         (str "\" commands\""))]
        "}")
       (Lean.Doc.Syntax.ul
        "ul{"
@@ -32,7 +33,8 @@ Success! Final stack:
               (str
                "\"https://github.com/leanprover/lean4/pull/5842\"")
               ")"))
-            (Lean.Doc.Syntax.text (str "\" and \""))
+            (Lean.Doc.Syntax.text
+             (str "\" and \""))
             (Lean.Doc.Syntax.link
              "["
              [(Lean.Doc.Syntax.text
diff --git a/src/tests/parser/block/blocks/blocks_0004.expected b/src/tests/parser/block/blocks/blocks_0004.expected
index 13e93a33b..2d0cd8c73 100644
--- a/src/tests/parser/block/blocks/blocks_0004.expected
+++ b/src/tests/parser/block/blocks/blocks_0004.expected
@@ -9,13 +9,15 @@ Success! Final stack:
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"A1\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"A1\""))]
             "}")])
          (Lean.Doc.Syntax.li
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"A2\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"A2\""))]
             "}")])]
         "}")])
      (Lean.Doc.Syntax.li
@@ -30,13 +32,15 @@ Success! Final stack:
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"B1\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"B1\""))]
             "}")])
          (Lean.Doc.Syntax.li
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"B2\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"B2\""))]
             "}")])]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0005.expected b/src/tests/parser/block/blocks/blocks_0005.expected
index 065c8ea7c..af10e3c5e 100644
--- a/src/tests/parser/block/blocks/blocks_0005.expected
+++ b/src/tests/parser/block/blocks/blocks_0005.expected
@@ -9,7 +9,8 @@ Success! Final stack:
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"A1\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"A1\""))]
             "}")])
          (Lean.Doc.Syntax.li
           "*"
@@ -29,7 +30,8 @@ Success! Final stack:
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"B1\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"B1\""))]
             "}")])]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0006.expected b/src/tests/parser/block/blocks/blocks_0006.expected
index 065c8ea7c..af10e3c5e 100644
--- a/src/tests/parser/block/blocks/blocks_0006.expected
+++ b/src/tests/parser/block/blocks/blocks_0006.expected
@@ -9,7 +9,8 @@ Success! Final stack:
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"A1\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"A1\""))]
             "}")])
          (Lean.Doc.Syntax.li
           "*"
@@ -29,7 +30,8 @@ Success! Final stack:
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"B1\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"B1\""))]
             "}")])]
         "}")])]
     "}")]
diff --git a/src/tests/parser/block/blocks/blocks_0016.expected b/src/tests/parser/block/blocks/blocks_0016.expected
index cefd59770..13ff9a0f2 100644
--- a/src/tests/parser/block/blocks/blocks_0016.expected
+++ b/src/tests/parser/block/blocks/blocks_0016.expected
@@ -9,7 +9,8 @@ Success! Final stack:
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"foo\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"foo\""))]
             "}")])]
         "}")])
      (Lean.Doc.Syntax.ul
diff --git a/src/tests/parser/block/blocks/blocks_0018.expected b/src/tests/parser/block/blocks/blocks_0018.expected
index 3239c5f95..dde213295 100644
--- a/src/tests/parser/block/blocks/blocks_0018.expected
+++ b/src/tests/parser/block/blocks/blocks_0018.expected
@@ -9,7 +9,8 @@ Success! Final stack:
          (Lean.Doc.Syntax.linebreak
           "line!"
           (str "\"\\n\""))
-         (Lean.Doc.Syntax.text (str "\"  thing\""))]
+         (Lean.Doc.Syntax.text
+          (str "\"  thing\""))]
         "}")])]
     "}")]
 Remaining:
diff --git a/src/tests/parser/block/blocks/blocks_0021.expected b/src/tests/parser/block/blocks/blocks_0021.expected
index 492037f14..7bc24e656 100644
--- a/src/tests/parser/block/blocks/blocks_0021.expected
+++ b/src/tests/parser/block/blocks/blocks_0021.expected
@@ -9,13 +9,15 @@ Success! Final stack:
          (Lean.Doc.Syntax.linebreak
           "line!"
           (str "\"\\n\""))
-         (Lean.Doc.Syntax.text (str "\"  stuff\""))]
+         (Lean.Doc.Syntax.text
+          (str "\"  stuff\""))]
         "}")
        (Lean.Doc.Syntax.blockquote
         ">"
         [(Lean.Doc.Syntax.para
           "para{"
-          [(Lean.Doc.Syntax.text (str "\"more \""))]
+          [(Lean.Doc.Syntax.text
+            (str "\"more \""))]
           "}")])
        (Lean.Doc.Syntax.para
         "para{"
diff --git a/src/tests/parser/block/blocks/blocks_0022.expected b/src/tests/parser/block/blocks/blocks_0022.expected
index 155d39197..2b538eabf 100644
--- a/src/tests/parser/block/blocks/blocks_0022.expected
+++ b/src/tests/parser/block/blocks/blocks_0022.expected
@@ -13,7 +13,8 @@ Success! Final stack:
           "*"
           [(Lean.Doc.Syntax.para
             "para{"
-            [(Lean.Doc.Syntax.text (str "\"bar\""))]
+            [(Lean.Doc.Syntax.text
+              (str "\"bar\""))]
             "}")])]
         "}")])
      (Lean.Doc.Syntax.li
diff --git a/src/tests/parser/block/blocks/blocks_0035.expected b/src/tests/parser/block/blocks/blocks_0035.expected
index a5ec8b20d..2a2d253a4 100644
--- a/src/tests/parser/block/blocks/blocks_0035.expected
+++ b/src/tests/parser/block/blocks/blocks_0035.expected
@@ -7,9 +7,11 @@ Final stack:
       [(Lean.Doc.Syntax.text (str "\"This is \""))
        (Lean.Doc.Syntax.emph
         "_"
-        [(Lean.Doc.Syntax.text (str "\"strong\""))]
+        [(Lean.Doc.Syntax.text
+          (str "\"strong\""))]
         <missing>)]
       "*")
-     (Lean.Doc.Syntax.text (str "\" not regular\""))]
+     (Lean.Doc.Syntax.text
+      (str "\" not regular\""))]
     "}")]
 Remaining: "* not regular_ emphasis"
\ No newline at end of file
diff --git a/src/tests/parser/block/blocks/blocks_0038.expected b/src/tests/parser/block/blocks/blocks_0038.expected
index b887979dd..56b8a9459 100644
--- a/src/tests/parser/block/blocks/blocks_0038.expected
+++ b/src/tests/parser/block/blocks/blocks_0038.expected
@@ -3,7 +3,8 @@ Success! Final stack:
     ">"
     [(Lean.Doc.Syntax.para
       "para{"
-      [(Lean.Doc.Syntax.text (str "\"Quotation\""))
+      [(Lean.Doc.Syntax.text
+        (str "\"Quotation\""))
        (Lean.Doc.Syntax.linebreak
         "line!"
         (str "\"\\n\""))
diff --git a/src/tests/parser/block/blocks/blocks_0039.expected b/src/tests/parser/block/blocks/blocks_0039.expected
index b4a290108..9599c03b8 100644
--- a/src/tests/parser/block/blocks/blocks_0039.expected
+++ b/src/tests/parser/block/blocks/blocks_0039.expected
@@ -2,7 +2,8 @@ Failure @65 (⟨4, 0⟩): expected '`' to close inline code
 Final stack:
   [(Lean.Doc.Syntax.para
     "para{"
-    [(Lean.Doc.Syntax.text (str "\"Attention:\""))]
+    [(Lean.Doc.Syntax.text
+      (str "\"Attention:\""))]
     "}")
    (Lean.Doc.Syntax.para
     "para{"
diff --git a/src/tests/parser/block/blocks/blocks_0043.expected b/src/tests/parser/block/blocks/blocks_0043.expected
index 265a145b8..0e48c54b6 100644
--- a/src/tests/parser/block/blocks/blocks_0043.expected
+++ b/src/tests/parser/block/blocks/blocks_0043.expected
@@ -3,7 +3,8 @@ Success! Final stack:
     ">"
     [(Lean.Doc.Syntax.para
       "para{"
-      [(Lean.Doc.Syntax.text (str "\"Quotation\""))]
+      [(Lean.Doc.Syntax.text
+        (str "\"Quotation\""))]
       "}")
      (Lean.Doc.Syntax.para
       "para{"
diff --git a/src/tests/parser/block/blocks/blocks_0044.expected b/src/tests/parser/block/blocks/blocks_0044.expected
index 0686bbd75..e74ce250b 100644
--- a/src/tests/parser/block/blocks/blocks_0044.expected
+++ b/src/tests/parser/block/blocks/blocks_0044.expected
@@ -3,7 +3,8 @@ Success! Final stack:
     ">"
     [(Lean.Doc.Syntax.para
       "para{"
-      [(Lean.Doc.Syntax.text (str "\"Quotation\""))]
+      [(Lean.Doc.Syntax.text
+        (str "\"Quotation\""))]
       "}")])
    (Lean.Doc.Syntax.para
     "para{"
diff --git a/src/tests/parser/block/blocks/blocks_0049.expected b/src/tests/parser/block/blocks/blocks_0049.expected
index 966111668..6c761e9f8 100644
--- a/src/tests/parser/block/blocks/blocks_0049.expected
+++ b/src/tests/parser/block/blocks/blocks_0049.expected
@@ -3,7 +3,8 @@ Success! Final stack:
     "para{"
     [(Lean.Doc.Syntax.link
       "["
-      [(Lean.Doc.Syntax.text (str "\"[link A]\""))]
+      [(Lean.Doc.Syntax.text
+        (str "\"[link A]\""))]
       "]"
       (Lean.Doc.Syntax.url
        "("
@@ -12,7 +13,8 @@ Success! Final stack:
      (Lean.Doc.Syntax.text (str "\" \""))
      (Lean.Doc.Syntax.link
       "["
-      [(Lean.Doc.Syntax.text (str "\"[link B]\""))]
+      [(Lean.Doc.Syntax.text
+        (str "\"[link B]\""))]
       "]"
       (Lean.Doc.Syntax.url
        "("
diff --git a/src/tests/parser/block/blocks/blocks_0051.expected b/src/tests/parser/block/blocks/blocks_0051.expected
index f3a5f816c..2a79d1aa8 100644
--- a/src/tests/parser/block/blocks/blocks_0051.expected
+++ b/src/tests/parser/block/blocks/blocks_0051.expected
@@ -6,7 +6,10 @@ Final stack:
       "["
       [(Lean.Doc.Syntax.text (str "\"My link\""))]
       "]"
-      (Lean.Doc.Syntax.ref "[" (str "\"lean\"") "]"))
+      (Lean.Doc.Syntax.ref
+       "["
+       (str "\"lean\"")
+       "]"))
      (Lean.Doc.Syntax.linebreak
       "line!"
       (str "\"\\n\""))
diff --git a/src/tests/parser/block/blocks/blocks_0054.expected b/src/tests/parser/block/blocks/blocks_0054.expected
index 6617b4238..3639662ae 100644
--- a/src/tests/parser/block/blocks/blocks_0054.expected
+++ b/src/tests/parser/block/blocks/blocks_0054.expected
@@ -47,7 +47,8 @@ Final stack:
         "para{"
         [(Lean.Doc.Syntax.link
           "["
-          [(Lean.Doc.Syntax.text (str "\"busted\""))
+          [(Lean.Doc.Syntax.text
+            (str "\"busted\""))
            (Lean.Doc.Syntax.linebreak
             "line!"
             (str "\"\\n\""))
@@ -61,7 +62,8 @@ Final stack:
         "para{"
         [(Lean.Doc.Syntax.link
           "["
-          [(Lean.Doc.Syntax.text (str "\"busted\""))
+          [(Lean.Doc.Syntax.text
+            (str "\"busted\""))
            (Lean.Doc.Syntax.linebreak
             "line!"
             (str "\"\\n\""))
@@ -132,7 +134,8 @@ Final stack:
         [(Lean.Doc.Syntax.text (str "\"very \""))
          (Lean.Doc.Syntax.emph
           "_"
-          [(Lean.Doc.Syntax.text (str "\"italic \""))
+          [(Lean.Doc.Syntax.text
+            (str "\"italic \""))
            (Lean.Doc.Syntax.bold
             "*"
             [(Lean.Doc.Syntax.text
diff --git a/src/tests/parser/block/code/codeBlock_0012.expected b/src/tests/parser/block/code/codeBlock_0012.expected
index c69187b2f..2d816c0be 100644
--- a/src/tests/parser/block/code/codeBlock_0012.expected
+++ b/src/tests/parser/block/code/codeBlock_0012.expected
@@ -5,7 +5,8 @@ Success! Final stack:
     [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+      (Lean.Doc.Syntax.arg_str
+       (str "\"chicken\"")))
      (Lean.Doc.Syntax.anon
       (Lean.Doc.Syntax.arg_num (num "43")))]]
    "\n"
diff --git a/src/tests/parser/block/code/codeBlock_0013.expected b/src/tests/parser/block/code/codeBlock_0013.expected
index cb0e09fba..d2496c6ef 100644
--- a/src/tests/parser/block/code/codeBlock_0013.expected
+++ b/src/tests/parser/block/code/codeBlock_0013.expected
@@ -6,7 +6,8 @@ Success! Final stack:
       "("
       `dialect
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"chicken\""))
+      (Lean.Doc.Syntax.arg_str
+       (str "\"chicken\""))
       ")")]]
    "\n"
    (str "\"(define x 4)\\nx\\n\"")
diff --git a/src/tests/parser/block/code/codeBlock_0014.expected b/src/tests/parser/block/code/codeBlock_0014.expected
index 2c79fd4e3..988255269 100644
--- a/src/tests/parser/block/code/codeBlock_0014.expected
+++ b/src/tests/parser/block/code/codeBlock_0014.expected
@@ -7,7 +7,8 @@ Final stack:
       "("
       `dialect
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"chicken\""))
+      (Lean.Doc.Syntax.arg_str
+       (str "\"chicken\""))
       <missing>)]]
    "\n"
    (str "\"(define x 4)\\nx\\n\"")
diff --git a/src/tests/parser/block/directive/directive_0003.expected b/src/tests/parser/block/directive/directive_0003.expected
index ad92d1654..fc9e47de4 100644
--- a/src/tests/parser/block/directive/directive_0003.expected
+++ b/src/tests/parser/block/directive/directive_0003.expected
@@ -5,7 +5,8 @@ Success! Final stack:
    [(Lean.Doc.Syntax.named_no_paren
      `greatness
      ":="
-     (Lean.Doc.Syntax.arg_str (str "\"amazing!\"")))]
+     (Lean.Doc.Syntax.arg_str
+      (str "\"amazing!\"")))]
    "\n"
    [(Lean.Doc.Syntax.para
      "para{"
diff --git a/src/tests/parser/block/recover/recoverBlock_0001.expected b/src/tests/parser/block/recover/recoverBlock_0001.expected
index 9d5f3f6ad..c92769b4e 100644
--- a/src/tests/parser/block/recover/recoverBlock_0001.expected
+++ b/src/tests/parser/block/recover/recoverBlock_0001.expected
@@ -8,7 +8,10 @@ Final stack:
      []
      "}"
      "["
-     [(Lean.Doc.Syntax.code "`" (str "\"rw\"") "`")]
+     [(Lean.Doc.Syntax.code
+       "`"
+       (str "\"rw\"")
+       "`")]
      "]")
     (Lean.Doc.Syntax.role
      "{"
@@ -27,7 +30,10 @@ Final stack:
      []
      "}"
      "["
-     [(Lean.Doc.Syntax.code "`" (str "\"at\"") "`")]
+     [(Lean.Doc.Syntax.code
+       "`"
+       (str "\"at\"")
+       "`")]
      "]")
     (Lean.Doc.Syntax.role
      "{"
diff --git a/src/tests/parser/inline/code/code_0010.expected b/src/tests/parser/inline/code/code_0010.expected
index e8bab7f78..cccc91e0a 100644
--- a/src/tests/parser/inline/code/code_0010.expected
+++ b/src/tests/parser/inline/code/code_0010.expected
@@ -1,3 +1,6 @@
 Success! Final stack:
-  (Lean.Doc.Syntax.code "`" (str "\"fo\\no\"") "`")
+  (Lean.Doc.Syntax.code
+   "`"
+   (str "\"fo\\no\"")
+   "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0006.expected b/src/tests/parser/inline/oneInline_0006.expected
index e8bab7f78..cccc91e0a 100644
--- a/src/tests/parser/inline/oneInline_0006.expected
+++ b/src/tests/parser/inline/oneInline_0006.expected
@@ -1,3 +1,6 @@
 Success! Final stack:
-  (Lean.Doc.Syntax.code "`" (str "\"fo\\no\"") "`")
+  (Lean.Doc.Syntax.code
+   "`"
+   (str "\"fo\\no\"")
+   "`")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/oneInline_0016.expected b/src/tests/parser/inline/oneInline_0016.expected
index a782aac03..876a08e91 100644
--- a/src/tests/parser/inline/oneInline_0016.expected
+++ b/src/tests/parser/inline/oneInline_0016.expected
@@ -1,3 +1,6 @@
 Success! Final stack:
-  (Lean.Doc.Syntax.footnote "[^" (str "\"1\"") "]")
+  (Lean.Doc.Syntax.footnote
+   "[^"
+   (str "\"1\"")
+   "]")
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/inline/role/role_0003.expected b/src/tests/parser/inline/role/role_0003.expected
index 8b13c052b..83c54ca25 100644
--- a/src/tests/parser/inline/role/role_0003.expected
+++ b/src/tests/parser/inline/role/role_0003.expected
@@ -12,7 +12,10 @@ Success! Final stack:
      []
      "}"
      "["
-     [(Lean.Doc.Syntax.code "`" (str "\"cmd\"") "`")]
+     [(Lean.Doc.Syntax.code
+       "`"
+       (str "\"cmd\"")
+       "`")]
      "]")
     (Lean.Doc.Syntax.text (str "\" is great\""))]
    "]")
diff --git a/src/tests/parser/inline/role/role_0005.expected b/src/tests/parser/inline/role/role_0005.expected
index 64524609b..68f43c009 100644
--- a/src/tests/parser/inline/role/role_0005.expected
+++ b/src/tests/parser/inline/role/role_0005.expected
@@ -16,7 +16,8 @@ Success! Final stack:
     (Lean.Doc.Syntax.text (str "\" \""))
     (Lean.Doc.Syntax.emph
      "_"
-     [(Lean.Doc.Syntax.text (str "\"a meaning!\""))]
+     [(Lean.Doc.Syntax.text
+       (str "\"a meaning!\""))]
      "_")
     (Lean.Doc.Syntax.text (str "\" \""))]
    "]")
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
index caa2fa138..523e10673 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0002.expected
@@ -3,7 +3,8 @@ Success! Final stack:
  • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+      (Lean.Doc.Syntax.arg_str
+       (str "\"chicken\"")))
      (Lean.Doc.Syntax.anon
       (Lean.Doc.Syntax.arg_num (num "43")))]
 
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
index 99b139cff..bdc7273f5 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0003.expected
@@ -3,7 +3,8 @@ Success! Final stack:
  • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+      (Lean.Doc.Syntax.arg_str
+       (str "\"chicken\"")))
      (Lean.Doc.Syntax.anon
       (Lean.Doc.Syntax.arg_num (num "43")))
      (Lean.Doc.Syntax.flag_on "+" `foo)]
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
index 0426937fb..7f6b81f2d 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0004.expected
@@ -4,7 +4,8 @@ Final stack:
  • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+      (Lean.Doc.Syntax.arg_str
+       (str "\"chicken\"")))
      (Lean.Doc.Syntax.flag_on "+" <missing>)
      (Lean.Doc.Syntax.anon
       (Lean.Doc.Syntax.arg_num (num "99")))]
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
index 57ab90840..6ccf4f279 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0005.expected
@@ -4,7 +4,8 @@ Final stack:
  • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+      (Lean.Doc.Syntax.arg_str
+       (str "\"chicken\"")))
      (Lean.Doc.Syntax.flag_on "+" `x)
      (Lean.Doc.Syntax.anon
       (Lean.Doc.Syntax.arg_num (num "99")))]
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
index db8bdd078..0fd9fbb32 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0006.expected
@@ -3,7 +3,8 @@ Success! Final stack:
  • [(Lean.Doc.Syntax.named_no_paren
       `dialect
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"chicken\"")))
+      (Lean.Doc.Syntax.arg_str
+       (str "\"chicken\"")))
      (Lean.Doc.Syntax.anon
       (Lean.Doc.Syntax.arg_num (num "43")))]
 
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
index ee1aa7a5d..9369dc2c4 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0009.expected
@@ -5,6 +5,7 @@ Success! Final stack:
      (Lean.Doc.Syntax.named_no_paren
       `more
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"stuff\"")))]
+      (Lean.Doc.Syntax.arg_str
+       (str "\"stuff\"")))]
 
 All input consumed.
\ No newline at end of file
diff --git a/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected b/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
index f69a300fd..6b2cf8786 100644
--- a/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
+++ b/src/tests/parser/nameAndArgs/nameAndArgs_0010.expected
@@ -5,7 +5,8 @@ Success! Final stack:
      (Lean.Doc.Syntax.named_no_paren
       `more
       ":="
-      (Lean.Doc.Syntax.arg_str (str "\"stuff\"")))]
+      (Lean.Doc.Syntax.arg_str
+       (str "\"stuff\"")))]
 
 Remaining:
 "\n\nabc"
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0003.expected b/src/tests/parser/val/arg_val_0003.expected
index 352b2df68..b8a9299d1 100644
--- a/src/tests/parser/val/arg_val_0003.expected
+++ b/src/tests/parser/val/arg_val_0003.expected
@@ -1,4 +1,4 @@
-Failure @0 (⟨1, 0⟩): unexpected end of input; expected token, numeral or string literal
+Failure @0 (⟨1, 0⟩): unexpected end of input; expected identifier, numeral or string literal
 Final stack:
   (Lean.Doc.Syntax.arg_str <missing>)
 Remaining: ""
\ No newline at end of file
diff --git a/src/tests/parser/val/arg_val_0007.expected b/src/tests/parser/val/arg_val_0007.expected
index b1fe7ba92..8377e2396 100644
--- a/src/tests/parser/val/arg_val_0007.expected
+++ b/src/tests/parser/val/arg_val_0007.expected
@@ -1,4 +1,4 @@
-Failure @0 (⟨1, 0⟩): unterminated string literal; expected token or numeral
+Failure @0 (⟨1, 0⟩): unterminated string literal; expected identifier or numeral
 Final stack:
   (Lean.Doc.Syntax.arg_str <missing>)
 Remaining: "\"foo"
\ No newline at end of file