Fix invalid generated line and column when EOL occurs in a chunk.

This fix #132.

It still requires some work because one unit test is failing.
Increment must be done after addMapping call