Fix measuring of extending characters, include all extending code points

Issue #2125
Issue #2115