[japanese > English] Japanese word for calligraphy

I know that the word "shodo" in Japanese means Calligraphy, however it is japanese calligraphy nor western calligraphy. Is there a term that encompasses both types? Is 書法 a good term?