Added Square and Diamond convert() implementations, mostly correct.
Also have ability to rotate the grid for halftone, but not implemented yet.