Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond into tmp

[lilypond.git] / Documentation / user / rhythms.itely

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index 7a1dae4a817ea33f1603b529db2b9a074e8f9072..435210b4a65d54d29b7527e5f98e5eb620ab650f 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -118,16 +118,16 @@ polyphonic situations.  Predefined commands are available to
 force a particular direction manually, for details
 see @ref{Direction and placement}.
 
-@predefined
 
+@predefined
 @code{\autoBeamOff},
 @code{\dotsUp},
 @code{\dotsDown},
 @code{\dotsNeutral}.
+@endpredefined
 
 
 @seealso
-
 Music Glossary:
 @rglos{breve},
 @rglos{longa},
@@ -206,11 +206,12 @@ must be done with @code{\tweak}.
 To modify the duration of notes without printing a tuplet bracket,
 see @ref{Scaling durations}.
 
-@predefined
 
+@predefined
 @code{\tupletUp},
 @code{\tupletDown},
 @code{\tupletNeutral}.
+@endpredefined
 
 
 @snippets
@@ -232,8 +233,8 @@ see @ref{Scaling durations}.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {permitting-line-breaks-within-beamed-tuplets.ly}
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{triplet},
 @rglos{tuplet},
@@ -255,6 +256,7 @@ Internals Reference:
 @rinternals{TupletNumber},
 @rinternals{TimeScaledMusic}.
 
+
 @knownissues
 @cindex grace notes within tuplet brackets
 When the first note on a staff is a grace note followed by a
@@ -327,7 +329,6 @@ notation, see @ref{Polymetric notation}.
 
 
 @seealso
-
 Notation Reference:
 @ref{Tuplets},
 @ref{Invisible rests},
@@ -438,13 +439,13 @@ commands.
 
 
 @predefined
-
 @code{\tieUp},
 @code{\tieDown},
 @code{\tieNeutral},
 @code{\tieDotted},
 @code{\tieDashed},
 @code{\tieSolid}.
+@endpredefined
 
 
 @snippets
@@ -457,7 +458,6 @@ commands.
 
 
 @seealso
-
 Music Glossary:
 @rglos{tie},
 @rglos{laissez vibrer}.
@@ -559,7 +559,6 @@ a4\rest d4\rest
 
 
 @seealso
-
 Notation Reference:
 @ref{Full measure rests}.
 
@@ -632,8 +631,8 @@ any kind.
 \skip 1 \skip1 \skip 1
 @end lilypond
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Rhythms}.
 
@@ -754,12 +753,15 @@ R1^"right"
 When a multi-measure rest immediately follows a @code{\partial}
 setting, resulting bar-check warnings may not be displayed.
 
+
 @predefined
 @code{\textLengthOn},
 @code{\textLengthOff},
 @code{\fermataMarkup},
 @code{\compressFullBarRests},
 @code{\expandFullBarRests}.
+@endpredefined
+
 
 @snippets
 
@@ -779,8 +781,8 @@ setting, resulting bar-check warnings may not be displayed.
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {multi--measure-rest-markup.ly}
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{multi-measure rest}.
 
@@ -885,10 +887,12 @@ changed to a numeric style:
 Mensural time signatures are covered in
 @ref{Mensural time signatures}.
 
-@predefined
 
+@predefined
 @code{\numericTimeSignature},
 @code{\defaultTimeSignature}.
+@endpredefined
+
 
 @snippets
 
@@ -903,7 +907,6 @@ Mensural time signatures are covered in
 
 
 @seealso
-
 Music Glossary:
 @rglos{time signature}
 
@@ -965,8 +968,8 @@ that this is set to a negative number by the @code{\partial}
 command: i.e., @code{\partial 4} is internally translated to
 @code{-4}, meaning @qq{there is a quarter note left in the measure.}
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{anacrusis}.
 
@@ -979,6 +982,7 @@ Snippets:
 Internal Reference:
 @rinternals{Timing_translator}.
 
+
 @knownissues
 
 The @code{\partial} command is intended to be used only at the
@@ -1024,13 +1028,14 @@ c4 c d8 d d f4 g4.
 d4 e d c
 @end lilypond
 
-@predefined
 
+@predefined
 @code{\cadenzaOn},
 @code{\cadenzaOff}.
+@endpredefined
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{cadenza}.
 
@@ -1040,6 +1045,7 @@ Notation Reference:
 Snippets:
 @rlsr{Rhythms}.
 
+
 @knownissues
 
 LilyPond will insert line breaks and page breaks only at a
@@ -1162,7 +1168,6 @@ moving the @code{Timing_translator} and the
 
 
 @seealso
-
 Music Glossary:
 @rglos{polymetric},
 @rglos{polymetric time signature},
@@ -1181,6 +1186,7 @@ Internals Reference:
 @rinternals{Default_bar_line_engraver},
 @rinternals{Staff}.
 
+
 @knownissues
 
 When using different time signatures in parallel, notes
@@ -1216,8 +1222,8 @@ inserts ties.  One of its uses is to debug complex scores: if the
 measures are not entirely filled, then the ties show exactly how
 much each measure is off.
 
-@seealso
 
+@seealso
 Music Glossary: @rglos{tie}
 
 Learning Manual:
@@ -1294,17 +1300,20 @@ be done with the @code{Pitch_squash_engraver} and
 >>
 @end lilypond
 
+
 @predefined
 @code{\improvisationOn},
 @code{\improvisationOff}.
+@endpredefined
+
 
 @snippets
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {guitar-strum-rhythms.ly}
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Rhythms}.
 
@@ -1312,6 +1321,7 @@ Internals Reference:
 @rinternals{RhythmicStaff},
 @rinternals{Pitch_squash_engraver}.
 
+
 @node Beams
 @subsection Beams
 
@@ -1366,9 +1376,12 @@ c4 c8 c8. c16 c8.
 c16 c8
 @end lilypond
 
+
 @predefined
 @code{\autoBeamOff},
 @code{\autoBeamOn}.
+@endpredefined
+
 
 @snippets
 
@@ -1382,8 +1395,8 @@ c16 c8
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {changing-beam-knee-gap.ly}
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Manual beams},
 @ref{Setting automatic beam behavior}.
@@ -1678,41 +1691,16 @@ a a a a
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
 {reverting-default-beam-endings.ly}
 
-@c TODO Convert to snippet called "Beam endings in Score context"
-@c Submitted to LSR 3 Nov 08
-
-Beam-ending rules specified in the Score context apply to all
-staves, but can be modified at both Staff and Voice levels:
-
-@lilypond[quote,verbatim,relative=2]
-  \time 5/4
-  % Set default beaming for all staves
-  #(override-auto-beam-setting '(end * * 5 4) 3 8 'Score)
-  #(override-auto-beam-setting '(end * * 5 4) 7 8 'Score)
-  <<
-    \new Staff {
-      c8 c c c c c c c c c
-    }
-    \new Staff {
-      % Modify beaming for just this staff
-      #(override-auto-beam-setting '(end * * 5 4) 6 8 'Staff)
-      #(revert-auto-beam-setting '(end * * 5 4) 7 8 'Staff)
-      c8 c c c c c c c c c
-    }
-    \new Staff {
-      % Inherit beaming from Score context
-      c8 c c c c c c c c c
-    }
-  >>
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{beam-endings-in-score-context.ly}
 
 
 @predefined
-
 @funindex \autoBeamOff
 @code{\autoBeamOff},
 @funindex \autoBeamOn
 @code{\autoBeamOn}.
+@endpredefined
 
 
 @knownissues
@@ -1723,8 +1711,8 @@ The same holds for polyphonic voices, entered with @code{<<
 @dots{} \\ @dots{} >>}.  If a polyphonic voice ends while an
 automatic beam is still accepting notes, it is not typeset.
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Rhythms}.
 
@@ -1838,13 +1826,12 @@ note durations only approximately, but the MIDI output is exact.
 The @code{\featherDurations} command only works with very short
 music snippets, and when numbers in the fraction are small.
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Rhythms}.
 
 
-
 @node Bars
 @subsection Bars
 
@@ -1992,8 +1979,8 @@ The default bar type used for automatically inserted bar lines is
 @code{"|"}.  This may be changed at any time
 with @code{\set Timing.defaultBarType = }@var{bartype}.
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{Line breaking},
 @ref{Repeats},
@@ -2141,7 +2128,6 @@ Bar numbers can be removed entirely by removing the
 
 
 @seealso
-
 Snippets:
 @rlsr{Rhythms}.
 
@@ -2243,8 +2229,8 @@ are entering from.  This can be checked with
 will print a warning if the @code{currentBarNumber} is not 123
 when it is processed.
 
-@seealso
 
+@seealso
 Snippets:
 @rlsr{Rhythms}.
 
@@ -2352,8 +2338,8 @@ printed with @code{\musicglyph}.
 For common tweaks to the positioning of rehearsal marks, see
 @ref{Formatting text}.
 
-@seealso
 
+@seealso
 Notation Reference:
 @ref{The Feta font},
 @ref{Formatting text}.
@@ -2369,6 +2355,7 @@ Snippets:
 
 Internals Reference: @rinternals{RehearsalMark}.
 
+
 @node Special rhythmic concerns
 @subsection Special rhythmic concerns
 
@@ -2547,7 +2534,6 @@ in other staves:
 
 
 @seealso
-
 Music Glossary:
 @rglos{grace notes},
 @rglos{acciaccatura},
@@ -2628,8 +2614,8 @@ MyCadenza = \relative c' {
 >>
 @end lilypond
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{cadenza}.
 
@@ -2710,7 +2696,6 @@ notes.
 
 
 @seealso
-
 This manual: @ref{Bar numbers}, @ref{Unmetered music}
 
 Snippets: