Correct reading of input lines still depend on formatting

[lucagl]

When reading last line "read from previous file" sometime depending on spacing I have errors

[lucagl]

Use map std class to map keys and strings for robust reading