From: fred <fred>
Date: Tue, 26 Mar 2002 22:47:19 +0000 (+0000)
Subject: lilypond-1.3.37
X-Git-Tag: release/1.5.59~1808
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=da8515202968594f77302f5b77799018d477ec20;p=lilypond.git

lilypond-1.3.37
---

diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely
index 101274a2b8..3b92694c79 100644
--- a/Documentation/user/properties.itely
+++ b/Documentation/user/properties.itely
@@ -149,6 +149,11 @@ c''16 \property Staff.fontSize = -2 c''16
     automatic collision resolution.  The value is the shift amount
     expressed in @code{note_width}, as set in the paper section.
 
+@item @code{collisionMergeDotted}@indexcode{collisionMergeDotted} @propertytype{boolean}
+
+Merge noteheads in collisions, even if they have a different number of
+dots. This normal notation for polyphonic guitar music.
+
 @mudelafile[verbatim]{force-hshift.sly}