layout: handle empty lines better

When using line-spacing, we were not giving empty lines their expected width. Fix that.

Fixes: #499 (closed)