X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fsubdividing-beams.ly;h=05f6b9bc9b942be33adae0fbf81c6bf218fe7f0f;hb=2f048e40f3c6bb1fda769caf537741c57d15d4ee;hp=0d524d8e7256aa05f94e5584aa8e84978cfef3de;hpb=b83bb147ef00d2d3df5b9bb82abb1951ee279396;p=lilypond.git

diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly
index 0d524d8e72..05f6b9bc9b 100644
--- a/Documentation/snippets/subdividing-beams.ly
+++ b/Documentation/snippets/subdividing-beams.ly
@@ -1,57 +1,15 @@
-%% 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.40
+\version "2.19.40"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-
-  texidoces = "
-
-Las barras de semicorchea, o de figuras más breves, no se subdividen
-de forma predeterminada.  Esto es, las tres (o más) barras se amplían
-sin romperse sobre grupos completos de notas.  Este comportamiento se
-puede modificar para subdividir las barras en subgrupos mediante el
-establecimiento de la propiedad @code{subdivideBeams}.  Cuando está
-activada, las barras se subdividen a intervalos definidos por el valor
-actual de @code{baseMoment} mediante la reducción de las barras
-repetidas a una sola entre los subgrupos.  Observe que el valor
-predeterminado de @code{baseMoment} es uno más que el denominador del
-tipo de compás actual, si no se fija explícitamente.  Se debe ajustar
-a una fracción que da la duración del subgrupo de barras utilizando la
-función @code{ly:make-moment}, como se ve en este fragmento de código.
-Asimismo, cuando se modifica @code{baseMoment}, se debería cambiar
-también @code{beatStructure} para que corresponda al @code{baseMoment}
-nuevo:
-
-"
-  doctitlees = "Subdivisión de barras"
-
-%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
-  texidocfr = "
-Les ligatures d'une succession de notes de durée inférieure à la croche
-ne sont pas subdivisées par défaut.  Autrement dit, tous les traits de
-ligature (deux ou plus) seront continus.  Ce comportement peut être
-modifié afin de diviser la ligature en sous-groupes grâce à la propriété
-@code{subdivideBeams}.  Lorsqu'elle est activée, les ligatures seront
-subdivisées selon un intervalle défini par @code{baseMoment}@tie{}; il n'y
-aura alors plus qu'un seul trait de ligature entre chaque sous-groupe.
-Par défaut, @code{baseMoment} fixe la valeur de référence par rapport à
-la métrique en vigueur.  Il faudra donc lui fournir, à l'aide de la
-fonction @code{ly:make-moment}, une fraction correspondant à la durée du
-sous-groupe désiré comme dans l'exemple ci-dessous.  Gardez à l'esprit
-que, si vous venez à modifier @code{baseMoment}, vous devrez
-probablement adapter @code{beatStrusture} afin qu'il reste en adéquation
-avec les nouvelles valeurs de @code{baseMoment}.
-
-"
-  doctitlefr = "Subdivision des ligatures"
-
   texidoc = "
 The beams of consecutive 16th (or shorter) notes are, by default, not
 subdivided.  That is, the three (or more) beams stretch unbroken over
@@ -59,31 +17,46 @@ 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 @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}:
+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}:
 
 "
   doctitle = "Subdividing beams"
 } % begin verbatim
 
+
 \relative c'' {
   c32[ c c c c c c c]
   \set subdivideBeams = ##t
   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 beatStructure = #'(2 2 2 2)
+  \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 beatStructure = #'(4 4 4 4)
+  \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
+}