From: Graham Percival Date: Sun, 31 Dec 2006 05:23:37 +0000 (-0800) Subject: merge-diffently-foo only applies to Voice 1 & 2 (fixes bug 202). X-Git-Tag: release/2.11.7-1~23^2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=85bdee5614761584d00fae61d9915bea7cff7c04;p=lilypond.git merge-diffently-foo only applies to Voice 1 & 2 (fixes bug 202). --- diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely index 342fe01ae7..aeeb5ed9d4 100644 --- a/Documentation/user/basic-notation.itely +++ b/Documentation/user/basic-notation.itely @@ -1140,6 +1140,10 @@ Similarly, you can merge half note heads with eighth notes, by setting c8 c4. } \\ { c2 c2 } >> @end lilypond +@noindent +@code{merge-differently-headed} and @code{merge-differently-dotted} +only apply to opposing stem directions (ie. Voice 1 & 2). + LilyPond also vertically shifts rests that are opposite of a stem, for example diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index e224bfaee4..9451952dcb 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -247,10 +247,14 @@ multimeasure rest.") note heads in collisions, even if they have different note heads. The smaller of the two heads will be rendered invisible. This used polyphonic guitar notation. The value of this setting is used by -@internalsref{note-collision-interface} .") +@internalsref{note-collision-interface} . +merge-differently-headed only applies to opposing stem dirs +(ie. Voice 1 & 2).") (merge-differently-dotted ,boolean? "Merge note heads in collisions, even if they have a different number of dots. This normal -notation for some types of polyphonic music. ") +notation for some types of polyphonic music. +merge-differently-dotted only applies to opposing stem dirs +(ie. Voice 1 & 2).") (minimum-length-fraction ,number? "Minimum length of ledger line as fraction of note head size.") (minimum-distance ,ly:dimension? "Minimum distance between rest and notes or beam.")