Revisiting the proton mass decomposition