fixed token line numbering (now determined at token start)