Canonical transformation for trapped/passing guiding-center orbits in axisymmetric tokamak geometry