Here is what commercial macsyma gets. I don't know what it boils down to.
RJF
limit(((atan(((2 * tan(z + x))/(sqrt(2)))))/(sqrt(2))) + ((sqrt(2) * %pi *
floor((z/(%pi)) + (x/(%pi)) + (1/2)))/2) - ((sqrt(2) * %pi)/2),x,0,minus) +
((sqrt(2) * %pi)/2)
>