 A new phase in the long contest between the continuous and the discrete has opened in the past few decades with the refounding of the concept of infinitesimal on a solid basis. This has been achieved in two essentially different ways, the one providing a rigorous formulation of the idea of infinitesimal number, the other of infinitesimal magnitude.