Updated for new hinting standards