Update poem integration test to incorporate indent/dedent for indentation of poems. Move \end{poem} to previous line to make sure closing special tokens are treated correctly.

2 files changed, 57 insertions, 25 deletions

diff --git a/testdata/integration/user_defined_syntax/poem.in.osml b/testdata/integration/user_defined_syntax/poem.in.osml
index f0deaba..f1986d9 100644
--- a/testdata/integration/user_defined_syntax/poem.in.osml
+++ b/testdata/integration/user_defined_syntax/poem.in.osml
@@ -16,9 +16,8 @@
 		\primitive[type=string]
 	\struct#indentation
 		\syntax
-% TODO: Fix this
-%			\open{\indent}
-%			\close{\dedent}
+			\open{\indent}
+			\close{\dedent}
 		\field
 			\childRef[ref=line]
 			\childRef[ref=indentation]
@@ -60,6 +59,5 @@ And sometimes like a gleaner thou dost keep
 Where are the songs of Spring? Ay, where are they?
 	Think not of them, thou hast thy music too,—
 While barred clouds bloom the soft-dying day,
-	And touch the stubble-plains with rosy hue;
-\end{poem}
+	And touch the stubble-plains with rosy hue;\end{poem}
 \end{document}
diff --git a/testdata/integration/user_defined_syntax/poem.out.osxml b/testdata/integration/user_defined_syntax/poem.out.osxml
index 6fe448d..76dfdcd 100644
--- a/testdata/integration/user_defined_syntax/poem.out.osxml
+++ b/testdata/integration/user_defined_syntax/poem.out.osxml
@@ -4,41 +4,75 @@
 	<poem:poem>
 		<poem:stanza>
 			<poem:line>Among the river sallows, borne aloft</poem:line>
-			<poem:line>Or sinking as the light wind lives or dies;</poem:line>
+			<poem:indentation>
+				<poem:line>Or sinking as the light wind lives or dies;</poem:line>
+			</poem:indentation>
 			<poem:line>And full-grown lambs loud bleat from hilly bourn;</poem:line>
-			<poem:line>Hedge-crickets sing; and now with treble soft</poem:line>
-			<poem:line>The red-breast whistles from a garden-croft;</poem:line>
-			<poem:line>And gathering swallows twitter in the skies.</poem:line>
+			<poem:indentation>
+				<poem:line>Hedge-crickets sing; and now with treble soft</poem:line>
+				<poem:line>The red-breast whistles from a garden-croft;</poem:line>
+				<poem:indentation>
+					<poem:line>And gathering swallows twitter in the skies.</poem:line>
+				</poem:indentation>
+			</poem:indentation>
 			<poem:line>Season of mists and mellow fruitfulness,</poem:line>
-			<poem:line>Close bosom-friend of the maturing sun;</poem:line>
+			<poem:indentation>
+				<poem:line>Close bosom-friend of the maturing sun;</poem:line>
+			</poem:indentation>
 			<poem:line>Conspiring with him how to load and bless</poem:line>
-			<poem:line>With fruit the vines that round the thatch-eves run;</poem:line>
+			<poem:indentation>
+				<poem:line>With fruit the vines that round the thatch-eves run;</poem:line>
+			</poem:indentation>
 			<poem:line>To bend with apples the moss&apos;d cottage-trees,</poem:line>
-			<poem:line>And fill all fruit with ripeness to the core;</poem:line>
-			<poem:line>To swell the gourd, and plump the hazel shells</poem:line>
+			<poem:indentation>
+				<poem:line>And fill all fruit with ripeness to the core;</poem:line>
+				<poem:indentation>
+					<poem:line>To swell the gourd, and plump the hazel shells</poem:line>
+				</poem:indentation>
+			</poem:indentation>
 			<poem:line>With a sweet kernel; to set budding more,</poem:line>
-			<poem:line>And still more, later flowers for the bees,</poem:line>
-			<poem:line>Until they think warm days will never cease,</poem:line>
-			<poem:line>For Summer has o&apos;er-brimm&apos;d their clammy cells.</poem:line>
+			<poem:indentation>
+				<poem:line>And still more, later flowers for the bees,</poem:line>
+				<poem:line>Until they think warm days will never cease,</poem:line>
+				<poem:indentation>
+					<poem:line>For Summer has o&apos;er-brimm&apos;d their clammy cells.</poem:line>
+				</poem:indentation>
+			</poem:indentation>
 		</poem:stanza>
 		<poem:stanza>
 			<poem:line>Who hath not seen thee oft amid thy store?</poem:line>
-			<poem:line>Sometimes whoever seeks abroad may find</poem:line>
+			<poem:indentation>
+				<poem:line>Sometimes whoever seeks abroad may find</poem:line>
+			</poem:indentation>
 			<poem:line>Thee sitting careless on a granary floor,</poem:line>
-			<poem:line>Thy hair soft-lifted by the winnowing wind;</poem:line>
+			<poem:indentation>
+				<poem:line>Thy hair soft-lifted by the winnowing wind;</poem:line>
+			</poem:indentation>
 			<poem:line>Or on a half-reap&apos;d furrow sound asleep,</poem:line>
-			<poem:line>Drows&apos;d with the fume of poppies, while thy hook</poem:line>
-			<poem:line>Spares the next swath and all its twined flowers:</poem:line>
+			<poem:indentation>
+				<poem:line>Drows&apos;d with the fume of poppies, while thy hook</poem:line>
+				<poem:indentation>
+					<poem:line>Spares the next swath and all its twined flowers:</poem:line>
+				</poem:indentation>
+			</poem:indentation>
 			<poem:line>And sometimes like a gleaner thou dost keep</poem:line>
-			<poem:line>Steady thy laden head across a brook;</poem:line>
-			<poem:line>Or by a cyder-press, with patient look,</poem:line>
-			<poem:line>Thou watchest the last oozings hours by hours.</poem:line>
+			<poem:indentation>
+				<poem:line>Steady thy laden head across a brook;</poem:line>
+				<poem:line>Or by a cyder-press, with patient look,</poem:line>
+				<poem:indentation>
+					<poem:line>Thou watchest the last oozings hours by hours.</poem:line>
+				</poem:indentation>
+			</poem:indentation>
 		</poem:stanza>
 		<poem:stanza>
 			<poem:line>Where are the songs of Spring? Ay, where are they?</poem:line>
-			<poem:line>Think not of them, thou hast thy music too,—</poem:line>
+			<poem:indentation>
+				<poem:line>Think not of them, thou hast thy music too,—</poem:line>
+			</poem:indentation>
 			<poem:line>While barred clouds bloom the soft-dying day,</poem:line>
-			<poem:line>And touch the stubble-plains with rosy hue;</poem:line>
+			<poem:indentation>
+				<poem:line>And touch the stubble-plains with rosy hue;</poem:line>
+			</poem:indentation>
 		</poem:stanza>
 	</poem:poem>
 </document>