X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeat-acknowledge-engraver.cc;h=a76484e086633345d888c88ea992b8a47ef9e2b6;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=6ebb7199940bb30d66765ec19b5bad54a0feb6ba;hpb=f3cacac4bafd2bace7dd23033618895cf11ef695;p=lilypond.git diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index 6ebb719994..a76484e086 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2012 Han-Wen Nienhuys + Copyright (C) 2000--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -102,23 +102,20 @@ Repeat_acknowledge_engraver::process_music () if (segno) if (start) if (end) // { segno, start, end } - s = robust_scm2string (get_property ("doubleRepeatSegnoType"), ":|S|:"); + s = robust_scm2string (get_property ("doubleRepeatSegnoType"), ":|.S.|:"); else // { segno, start } - s = robust_scm2string (get_property ("startRepeatSegnoType"), ".S|:"); - else - if (end) // { segno, end } - s = robust_scm2string (get_property ("endRepeatSegnoType"), ":|S"); - else // { segno } - s = robust_scm2string (get_property ("segnoType"), "S"); - else - if (start) - if (end) // { start, end } - s = robust_scm2string (get_property ("doubleRepeatType"), ":|:"); - else // { start } - s = robust_scm2string (get_property ("startRepeatType"), "|:"); - else - if (end) // { end } - s = robust_scm2string (get_property ("endRepeatType"), ":|"); + s = robust_scm2string (get_property ("startRepeatSegnoType"), "S.|:"); + else if (end) // { segno, end } + s = robust_scm2string (get_property ("endRepeatSegnoType"), ":|.S"); + else // { segno } + s = robust_scm2string (get_property ("segnoType"), "S"); + else if (start) + if (end) // { start, end } + s = robust_scm2string (get_property ("doubleRepeatType"), ":|.|:"); + else // { start } + s = robust_scm2string (get_property ("startRepeatType"), ".|:"); + else if (end) // { end } + s = robust_scm2string (get_property ("endRepeatType"), ":|."); /* TODO: line breaks might be allowed if we set whichBar to "".