Integrate $\tan x$ and $\sec x$ (#569)