Code

Updated gofon macro parsing