port theorem-{1,2} to PartialShapeVec