Improved upper- and lowercase s-swash