fix #35176: ottava layout in various special situations
Merge pull request #1376 from MarcSabatella/35176-ottava-end

fix #35176: ottava layout in various special situations