ENH: add option shape to functions in draw v2

This PR replaces #1020