Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 951bb6bd1b0ca40b4282232e99f4b32e32b83635..7c4c5be8cf0597a1c8efa088e9e30a6dffd1c83a 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -413,6 +413,7 @@ Languages in this order.
 * triplet::                     
 * tritone::                     
 * tuning fork::                 
+* tuplet::                      
 * turn::                        
 * unison::                      
 * upbeat::                      
@@ -2860,6 +2861,9 @@ symbol indicates playing an octave lower (for example, on double bass
 
 @ref{baritone clef}
 
+@c F:  'point d'orgue' on a note, 'point d'arret' on a rest.
+
+
 @node feathered beam
 @section feathered beam
 
@@ -2887,7 +2891,7 @@ Internals Reference: @ruser{Manual beams}
 
 ES: calderón,
 I: corona,
-F: point d'orgue, point d'arrêt, @c 'point d'orgue' on a note, 'point d'arret' on a rest.
+F: point d'orgue, point d'arrêt,
 D: Fermate,
 NL: fermate,
 DK: fermat,
@@ -6066,6 +6070,18 @@ forks give the international pitch for the tone @emph{a} (440
 vibrations per second).
 
 
+@node tuplet
+@section tuplet
+
+A non-standard subdivision of a beat or part of a beat, usually
+indicated with a bracket and a number indicating the number of
+subdivisions.
+
+@seealso
+
+@ref{triplet}, @ref{note value}.
+
+
 @node turn
 @section turn
 

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index eeb15d2cd9bad215534aaf59698a245a7be44540..47c346af13f5b70f1c9315f8f134e37c070539ab 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -147,8 +147,6 @@ are rests from 128th to maxima (8 x whole).
 @cindex triplets
 @funindex \times
 
-@c TODO Add Tuplet to glossary
-
 Tuplets are made out of a music expression by multiplying all
 durations with a fraction:
 
@@ -304,8 +302,7 @@ point.
 
 @seealso
 
-Music Glossary:
-@c TODO Add @rglos{Tuplet} when Tuplet has been added to the Glossary
+Music Glossary: @rglos{tuplet}.
 
 Notation Reference: @ref{Time administration},
 @ref{Objects connected to the input}, @ref{Polymetric notation}.
@@ -1161,8 +1158,8 @@ aligned vertically, but bar lines distort the regular spacing.
 @seealso
 
 @ignore
-TODO: add @rglos{signature, polymetric}, {polymetric}, {time
-signature, double}, and {meter, polymetric}. when glossary entries
+TODO: add @rglos{polymetric time signature}, {polymetric}, {double time
+signature}, and {polymetric meter}. when glossary entries
 exist.
 @end ignore
 
@@ -1282,7 +1279,7 @@ The property @code{subdivideBeams} can be set in order to
 subdivide all 16th or shorter beams.  When set, multiple beams
 will be sub-divided at beat positions, defined by the current
 value of @code{beatLength} (defaults to a quarter note), by
-drawing only one beam over the beat.
+drawing only one beam over the connection between beats.
 
 @lilypond[fragment,ragged-right,quote,relative=2,verbatim]
 c32[ c c c c c c c]