Doc-fr: NR-1.5.2 merging rests

[lilypond.git] / input / regression / autobeam-3-4-rules.ly

diff --git a/input/regression/autobeam-3-4-rules.ly b/input/regression/autobeam-3-4-rules.ly
index 5730b6c42449a89b825dc23f12cabc83911e7562..04fabcb0210f7d2833905c01c445719543165fb4 100644 (file)
--- a/input/regression/autobeam-3-4-rules.ly
+++ b/input/regression/autobeam-3-4-rules.ly
@@ -1,24 +1,34 @@
-\version "2.15.31"
+\version "2.19.40"
 
 \header {
 
   doctitle = "Special beaming rules for 3/4 time"
 
-  texinfo = "
-Whole-measure and half-measure beaming in 3/4 time can be controlled.
-The first measure should be beamed in one.  The second measure should
-be beamed in three.  The third and fourth measures should be beamed
-at 3/8.
-  "
+  texinfo = "Beaming in 3/4 time has special treatment.  By default
+six eighth notes are beamed in one. Beams that would imply 6/8 time
+may be avoided with @code{beamHalfMeasure = ##f}.  When the beaming
+is changed, beams should start at the beginning of the measure.
+"
 
 }
 
 \relative c' {
-    \time 3/4
-    c8^\markup "Beam in one" c c c c c
-    \set Timing.beamWholeMeasure = ##f
-    c8^\markup "Beam in three" c c c c c
-    \set Timing.beamHalfMeasure = ##t
-    r4.^\markup "Beam in Two" c8 c c
-    c8 c c  r4.
+  \time 3/4
+  \set Timing.beamHalfMeasure = ##f
+  r4.^\markup "Prevent beams that imply 6/8 time" c8 c c |
+  c8 c r c c r |
+  r8_"but these beams are okay" c c c c c | c c c r r4 \bar "||"
+
+  \set Timing.beamHalfMeasure = ##t
+  r4.^\markup "Or allow them" c8 c c c c r c c r
+  \break
+
+  \unset Timing.beamExceptions
+  r8^\markup "Beam to the beat" c c c c c
+  c c c r r4 \bar "||"
+
+  \set Timing.baseMoment = #(ly:make-moment 1/8)
+  \set Timing.beatStructure = 3,3
+  r8^\markup "Override to beam groups of 3 eighth notes" c c c c c
+  r4. c8 c c c c c r4.
 }