Fixed issue with linebreaks in the middle of words by adding <line> markup; added -l option to suppress lines
Merge branch 'version2.0_SGML_aware'