Adrian Robert writes:
> Thanks a lot for this patch.  Could you try this one instead?

I tried your patch and it has the desired effect.  I agree that this patch is better because it does have the benefit of keeping the "width"-handling in one place.  As a result, I actually prefer your patch to mine.

Thanks.