OK, all the bold type and hypens made my eyes hurt, and it is too late and I am too tired.
What the Merriam-Webster link said is how I have always said it. But then I really liked math in HS and went through geometry, trig, algebra and a little calculus - very little actually.