Re #125 Create PDF using Unicode fonts, refactor