Some classes for figure printing that were not included in the previous
commit