"Journey through genius" by William Dunham. It's not comprehensive, in the sense that it selectively samples the evolution of math from antiquity to about the 20th century, but it fits the bill of a pop-sci book that also shows the real math (at about a high school level) while covering the history and personalities involved. I've read it several times and really enjoy it.

Edit: I clicked though and I see that (for me) William Dunham is actually the author of the first article in the list.