renamed some grammar symbols upper-line instead of upper-octave-line etc. Fixed ornament octave bug