Consistent macroscopic treatment of L = 0 and L = 1 transitions in inelastic proton scattering