The geometry of the elementary catastrophes: (2). The hyperbolic and elliptic umbilics