Optimal Redistributive Taxation with both Extensive and Intensive