moved ExpandFormat() to print.c