From 68e430c4ae9c5ed48a0cb06f957f03e88c1289c4 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Fri, 3 Apr 2015 01:07:45 +0200 Subject: 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. --- .../integration/user_defined_syntax/poem.in.osml | 8 +-- .../integration/user_defined_syntax/poem.out.osxml | 74 ++++++++++++++++------ 2 files changed, 57 insertions(+), 25 deletions(-) (limited to 'testdata') 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 @@ Among the river sallows, borne aloft - Or sinking as the light wind lives or dies; + + Or sinking as the light wind lives or dies; + And full-grown lambs loud bleat from hilly bourn; - Hedge-crickets sing; and now with treble soft - The red-breast whistles from a garden-croft; - And gathering swallows twitter in the skies. + + Hedge-crickets sing; and now with treble soft + The red-breast whistles from a garden-croft; + + And gathering swallows twitter in the skies. + + Season of mists and mellow fruitfulness, - Close bosom-friend of the maturing sun; + + Close bosom-friend of the maturing sun; + Conspiring with him how to load and bless - With fruit the vines that round the thatch-eves run; + + With fruit the vines that round the thatch-eves run; + To bend with apples the moss'd cottage-trees, - And fill all fruit with ripeness to the core; - To swell the gourd, and plump the hazel shells + + And fill all fruit with ripeness to the core; + + To swell the gourd, and plump the hazel shells + + With a sweet kernel; to set budding more, - And still more, later flowers for the bees, - Until they think warm days will never cease, - For Summer has o'er-brimm'd their clammy cells. + + And still more, later flowers for the bees, + Until they think warm days will never cease, + + For Summer has o'er-brimm'd their clammy cells. + + Who hath not seen thee oft amid thy store? - Sometimes whoever seeks abroad may find + + Sometimes whoever seeks abroad may find + Thee sitting careless on a granary floor, - Thy hair soft-lifted by the winnowing wind; + + Thy hair soft-lifted by the winnowing wind; + Or on a half-reap'd furrow sound asleep, - Drows'd with the fume of poppies, while thy hook - Spares the next swath and all its twined flowers: + + Drows'd with the fume of poppies, while thy hook + + Spares the next swath and all its twined flowers: + + And sometimes like a gleaner thou dost keep - Steady thy laden head across a brook; - Or by a cyder-press, with patient look, - Thou watchest the last oozings hours by hours. + + Steady thy laden head across a brook; + Or by a cyder-press, with patient look, + + Thou watchest the last oozings hours by hours. + + Where are the songs of Spring? Ay, where are they? - Think not of them, thou hast thy music too,— + + 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; + + And touch the stubble-plains with rosy hue; + -- cgit v1.2.3