Calligraphy goes under typography these days, save for ones with special traditions like Japanese or Chinese typography, and very specific word styles like old English.

Oh there's also that calligraphy is very specifically by hand, but typography can be both.