stack order of @stroke and @line
reflect recent spec changes