warning message for unspecified voicing; issue 4255

diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely
index bcf449f276274270cf8692172fd9d4860cd4ee17..108d200ca02a6298bb783ea019c07a25ebc58437 100644 (file)
--- a/Documentation/learning/fundamental.itely
+++ b/Documentation/learning/fundamental.itely
@@ -1167,7 +1167,8 @@ with stems up and one note (or chord) from a voice with stems
 down.  If notes from two voices which have their stems in the
 same direction are placed at the same position and both voices
 have no shift or the same shift specified, the error message
-@qq{Too many clashing note columns} will be produced.
+@qq{This voice needs a @code{@bs{}voiceXx} or @code{@bs{}shiftXx} setting}
+will be produced.
 
 
 @seealso

diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely
index 70846342e718020fb934a543fbff9ed956aac731..2f5915fe530e69207771489cd0d6634092e18d0b 100644 (file)
--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -286,7 +286,6 @@ generate multiple staves implicitly:
 Here different rhythms cause no problems because they are
 interpreted in different voices.
 
-@cindex collisions, clashing note columns
 @cindex collisions, ignoring
 
 @knownissues
@@ -294,7 +293,7 @@ If notes from two or more voices, with no shifts specified,
 have stems in the same direction, the message
 
 @example
-warning: ignoring too many clashing note columns
+warning: This voice needs a \voiceXx or \shiftXx setting
 @end example
 
 will appear during compilation.  This message can be suppressed by:

diff --git a/Documentation/usage/running.itely b/Documentation/usage/running.itely
index 01784ab75ab750ac588833982d77c9d254097fe6..c9051c71202b809df699b0e9c0f09053654b94e2 100644 (file)
--- a/Documentation/usage/running.itely
+++ b/Documentation/usage/running.itely
@@ -988,7 +988,7 @@ are easily handled.
 * Error message FT_Get_Glyph_Name::
 * Warning staff affinities should only decrease::
 * Error message unexpected new::
-* Warning ignoring too many clashing note columns::
+* Warning this voice needs a voiceXx or shiftXx setting::
 @end menu
 
 @node Music runs off the page
@@ -1137,13 +1137,14 @@ staves are introduced in parallel, i.e. simultaneously:
 }
 @end lilypond
 
-@node Warning ignoring too many clashing note columns
-@unnumberedsubsec Warning ignoring too many clashing note columns
+@node Warning this voice needs a voiceXx or shiftXx setting
+@unnumberedsubsec Warning this voice needs a @code{@bs{}voiceXx}
+ or @code{@bs{}shiftXx} setting
 
 If notes from two different voices with stems in the same direction
 occur at the same musical moment, but the voices have no
 voice-specific shifts specified, the warning message
-@samp{warning: ignoring too many clashing note columns} will appear
+@samp{warning: this voice needs a \voiceXx or \shiftXx setting} will appear
 when compiling the LilyPond file.  This warning will appear even when
 the notes have no visible stems, e.g. whole notes, if the stems for
 shorter notes at the same pitch would be in the same direction.

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 064abd4ccf8df310ccbc7c815bba223f3e9293b9..a0be58907a6547151b167f7bd6fe63fb2cdd6556 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -508,7 +508,7 @@ Note_collision_interface::automatic_shift (Grob *me,
               // Match the previous notecolumn offset,
               // but warn if the user did not set these equal shifts explictly
               if (!scm_is_number (sh))
-                col->warning (_ ("ignoring too many clashing note columns"));
+                col->warning (_ ("this Voice needs a \\voiceXx or \\shiftXx setting"));
             }
           else if (extents[d][i][UP] > extents[d][i - 1][DOWN]
                    && extents[d][i][DOWN] < extents[d][i - 1][UP])