Second round of figure improvements

Fix figure box width when the caption exceeds image width. An example can be seen [here](http://castalio.info/johan-dahlin-stoq-gestor-comercial-livre.html).