Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / new / subdividing-beams.ly

diff --git a/Documentation/snippets/new/subdividing-beams.ly b/Documentation/snippets/new/subdividing-beams.ly
index c659f3b91764fe153065a6a05600825e71c9e38c..0030c5a1cb3f866f1f3348f3943e5d52bbbc9063 100644 (file)
--- a/Documentation/snippets/new/subdividing-beams.ly
+++ b/Documentation/snippets/new/subdividing-beams.ly
@@ -1,4 +1,4 @@
-\version "2.13.36"
+\version "2.19.34"
 
 \header {
   lsrtags = "rhythms"
@@ -6,17 +6,21 @@
   texidoc = "
 The beams of consecutive 16th (or shorter) notes are, by default, not
 subdivided.  That is, the three (or more) beams stretch unbroken over
-entire groups of notes.  This behavior can be modified to subdivide
-the beams into sub-groups by setting the property
-@code{subdivideBeams}. When set, multiple beams will be subdivided at
-intervals defined by the current value of @code{baseMoment} by reducing
-the multiple beams to just one beam between the sub-groups. Note that
-@code{baseMoment} defaults to one over the denominator of the current
-time signature if not set explicitly. It must be set to a fraction
-giving the duration of the beam sub-group using the
+entire groups of notes.  This behavior can be modified to subdivide the
+beams into sub-groups by setting the property @code{subdivideBeams}.
+When set, multiple beams will be subdivided at intervals defined by the
+current value of @code{baseMoment} by reducing the multiple beams to
+the number of beams that indicates the metric value of the subdivision.
+If the group following the division is shorter than the current metric
+value (usually because the beam is incomplete) the number of beams
+reflects the longest possible subdivision group.  However, if there is
+only one note left after the division this restriction isn't applied.
+Note that @code{baseMoment} defaults to one over the denominator of the
+current time signature if not set explicitly. It must be set to a
+fraction giving the duration of the beam sub-group using the
 @code{ly:make-moment} function, as shown in this snippet. Also, when
-@code{baseMoment} is changed, @code{beatStructure} should also be changed
-to match the new @code{baseMoment}:
+@code{baseMoment} is changed, @code{beatStructure} should also be
+changed to match the new @code{baseMoment}:
 
 "
   doctitle = "Subdividing beams"
@@ -28,13 +32,23 @@ to match the new @code{baseMoment}:
   c32[ c c c c c c c]
 
   % Set beam sub-group length to an eighth note
-  \set baseMoment = #(ly:make-moment 1 8)
+  \set baseMoment = #(ly:make-moment 1/8)
   \set beatStructure = #'(2 2 2 2)
   c32[ c c c c c c c]
 
   % Set beam sub-group length to a sixteenth note
-  \set baseMoment = #(ly:make-moment 1 16)
+  \set baseMoment = #(ly:make-moment 1/16)
   \set beatStructure = #'(4 4 4 4)
   c32[ c c c c c c c]
-}
 
+  % Shorten beam by 1/32
+  \set baseMoment = #(ly:make-moment 1/8)
+  \set beatStructure = #'(2 2 2 2)
+  c32[ c c c c c c] r32
+
+  % Shorten beam by 3/32
+  \set baseMoment = #(ly:make-moment 1/8)
+  \set beatStructure = #'(2 2 2 2)
+  c32[ c c c c] r16.
+  r2
+}