Update for new measure and size spec.

Text scaling needs checking.