Added optional width and height to pspicture and tikzpicture in spec.