preserving the latest handshift on every surface
avoid lines containing only marginalia and move them to the preceding line