* Merged trunk commits [678] and [711], by henry: + Created a demo that can handle multiple fonts and command line options. + Updated for new compiler.