initial fork modifications: two classes, one xetex file