Bugfixes around improvements to draw_bitmap
Creating branch of trunk to do some mathtext improvements