X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental.cc;h=a017cf8dea80f6af9dafee897e2fc58a141461d8;hb=cb01be4028886109ecc4772234452965ce7dfb66;hp=0e81a6bea299105e2a66cf1459e2de6b8a03a588;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git diff --git a/lily/accidental.cc b/lily/accidental.cc index 0e81a6bea2..a017cf8dea 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -67,7 +67,8 @@ Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM) if (to_boolean (me->get_property ("forced")) || !unsmob_grob (me->get_object ("tie")) - || rank == start + 1) /* we are at the start of a line */ + || (rank == start + 1 && /* we are at the start of a line */ + !to_boolean (me->get_property ("hide-tied-accidental-after-break")))) { Stencil *s = unsmob_stencil (get_stencil (me)); if (s) @@ -163,8 +164,9 @@ Accidental_interface::print (SCM smob) Grob *me = unsmob_grob (smob); Grob *tie = unsmob_grob (me->get_object ("tie")); - if (tie && !tie->original () - && !to_boolean (me->get_property ("forced"))) + if (tie && + (to_boolean (me->get_property ("hide-tied-accidental-after-break")) + || (!tie->original () && !to_boolean (me->get_property ("forced"))))) { me->suicide (); return SCM_EOL; @@ -218,8 +220,9 @@ ADD_INTERFACE (Accidental_interface, "alteration " "avoid-slur " "forced " + "glyph-name-alist " + "hide-tied-accidental-after-break " "parenthesized " "restore-first " - "glyph-name-alist " "tie " );