Modify contour and component drawing.

[typesupply]

In drawing.py, the contour and component drawing is handled with separate pens. This is fine if the contour and component colors are different, but if they are the same, they both need to be drawn with the same pen to properly display winding directions. To solve this, introduce a new pen* (and factory) that has them combined and test the colors before choosing the paths to use.

*Or maybe combine the two NSBezierPaths into one?