New figure-markup for images and image captions