Improve Groovy markup to support all XML constructs.

We can't produce some XML constructs using MarkupBuilder.

For example, you can create elements with attributes and text. The following is not possible:

<doc id='xyz123'>
<p class='normal'>Text Here</p>
</doc>