Doc-fr: NR-1.5.2 merging rests

[lilypond.git] / Documentation / snippets / cross-staff-chords---beaming-problems-workaround.ly

diff --git a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
index d830f3930cb012ed0a968d41e1b89beae4a06fcf..f0929dc32c9cfb89dd781497db642c671b5b4fb6 100644 (file)
--- a/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
+++ b/Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
@@ -1,26 +1,13 @@
 %% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% generated from LSR http://lsr.di.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"
+\version "2.18.0"
 
 \header {
-%% Translation of GIT committish: 1cda7b7b8219cb97399b8e7b56c1115aaf82c002
-  texidocfr = "
-Il est parfois préférable d'utiliser les hampes de la portée supérieure
-pour créer des accords distribués, afin d'éviter tout risque de
-collision au niveau des ligatures automatiques.  Dans l'exemple suivant,
-le fait de partir des hampes de la portée inférieure aurait rendu
-nécessaire l'adaptation du détecteur de collision des ligatures, par une
-clause @code{\\override Staff.Beam #'collision-voice-only = ##t}, afin
-qu'il ne tienne pas compte des collisions entre portées.
-
-"
-  doctitlefr = "Accord distribué et problème de hampe - solution"
-
-  lsrtags = "keyboards, workaround, chords, tweaks-and-overrides"
+  lsrtags = "chords, keyboards, tweaks-and-overrides, workaround"
 
   texidoc = "
 Sometimes it is better to use stems from the upper staff for creating
@@ -28,30 +15,29 @@ cross-staff chords, because no problems with automatic beam collision
 avoidance then arise.  If the stems from the lower staff were used in
 the following example, it would be necessary to change the automatic
 beam collision avoidance settings so that it doesn't detect collisions
-between staves using @code{\\override Staff.Beam #'collision-voice-only
-= ##t}
+between staves using @code{\\override Staff.Beam.collision-voice-only =
+##t}
 
 "
   doctitle = "Cross-staff chords - beaming problems workaround"
 } % begin verbatim
 
-
 \new PianoStaff <<
   \new Staff = up
     \relative c' {
       <<
         { r4
-          \override Stem #'cross-staff = ##t
-          \override Stem #'length = #19 % this is in half-spaces,
+          \override Stem.cross-staff = ##t
+          \override Stem.length = #19 % this is in half-spaces,
               % so it makes stems 9.5 staffspaces long
-          \override Stem #'Y-offset = #-6 % stems are normally lengthened
+          \override Stem.Y-offset = #-6 % stems are normally lengthened
               % upwards, so here we must lower the stem by the amount
               % equal to the lengthening - in this case (19 - 7) / 2
               % (7 is default stem length)
           e e e }
         { s4
           \change Staff = "bottom"
-          \override NoteColumn #'ignore-collision = ##t
+          \override NoteColumn.ignore-collision = ##t
           c, c c
         }
       >>