Issue #22975:correctly format margin and marginpercent
Merge pull request #140 from garyhgohoos/22975

Issue #22975:correctly format margin and marginpercent