[xpdf303] Adapt better to what we did and what xpdf303 does
12 files changed