indent changes to support complex nesting

adds a test.html with various macros file to compare/improve indenting