General formulation for the analysis of scalar diffraction-free beams using angular modulation: Mathieu and Bessel beams