Revising the line-shape parameters for air- and self-broadened CO2 lines toward a sub-percent accuracy level. (November 2020)