support pixel and millimeter text unit prefs
Merge branch 'master' into generator-assets