Unfolding a diabolic point: a generalized crossing scenario