Fixed colspanning so that the cell state keeps track of the

width so far properly
Also some cleanup, jstyle

Code changes sponsored by Dresdner Bank, Germany


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193867 13f79535-47bb-0310-9956-ffa450edef68