Update incipit snippets

[lilypond.git] / Documentation / snippets / suppressing-warnings-for-clashing-note-columns.ly

diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
index ab0559dfbf24c92d790388c0034a7f871464ae36..ec7f763945d507c507ebbad29f264f1310180267 100644 (file)
--- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
+++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,33 +1,18 @@
-%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
-%% and then run scripts/auxiliar/makelsr.py
-%%
-%% This file is in the public domain.
-\version "2.14.2"
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.19.14
+\version "2.19.14"
 
 \header {
-  lsrtags = "tweaks-and-overrides, simultaneous-notes"
-
-%% Translation of GIT committish: 28097cf54698db364afeb75658e4c8e0e0ccd716
-  texidoc = "
-Lorsque des notes simultanées appartenant à des voix différentes ont la
-même orientation de hampe et qu'aucun décalage n'a été appliqué ou qu'il
-est identique, LilyPond émettra l'avertissement « @emph{ignoring too
-many clashing note columns} » (trop d'empilements de notes se
-chevauchent. On fera au mieux).  On peut s'exonérer de cet avertissement
-en activant la propriété @code{'ignore-collision} de l'objet
-@code{NoteColumn}.  Notez bien que ceci n'aura pas pour seul effet de
-supprimer les avertissement ; les routines de résolution de collisions
-sont par la même occasion déactivées, ce qui peut engendrer certains
-désagréments si vous en abusez.
-
-"
-  doctitlefr = "Suppression des avertissements de chevauchement"
+  lsrtags = "simultaneous-notes, tweaks-and-overrides"
 
   texidoc = "
 If notes from two voices with stems in the same direction are placed at
-the same position, and both voices have no shift or the same shift
+the same position, but the voices have no voice-specific shifts
 specified, the error message @samp{warning: ignoring too many clashing
 note columns} will appear when compiling the LilyPond file.  This
 message can be suppressed by setting the @code{'ignore-collision}
@@ -35,19 +20,16 @@ property of the @code{NoteColumn} object to @code{#t}. Please note that
 this does not just suppress warnings  but stops LilyPond trying to
 resolve collisions at all and so may have  unintended results unless
 used with care.
-
 "
   doctitle = "Suppressing warnings for clashing note columns"
 } % begin verbatim
 
 
-ignore = \override NoteColumn #'ignore-collision = ##t
+ignore = \override NoteColumn.ignore-collision = ##t
 
 \relative c' {
-  <<
-    \ignore
-    { \stemDown f2 g }
-    \\
-    { c2 c, }
+  \new Staff <<
+    \new Voice{ \ignore \stemDown f2 g }
+    \new Voice{ c2 \stemDown c, }
   >>
 }