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

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

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index 864ed0a0450963467d3e796acc53a47ab8952a5d..8bd6c24b7ef1a9b436758d553d06a5890f1182a2 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -9,8 +9,7 @@
 @node Rhythms
 @section Rhythms
 
-@lilypondfile[ragged-right,line-width=16\cm,staffsize=14,quote]
-{rhythms-headword.ly}
+@lilypondfile[quote]{rhythms-headword.ly}
 
 This section discusses rhythms, rests, durations, beaming and bars.
 
@@ -153,7 +152,7 @@ rests from 128th to maxima (8 x whole) may be printed.
 @cindex triplets
 @funindex \times
 
-Tuplets are made out of a music expression by multiplying all
+Tuplets are made from a music expression by multiplying all the
 durations with a fraction:
 
 @example
@@ -164,7 +163,7 @@ durations with a fraction:
 The duration of @var{musicexpr} will be multiplied by the 
 fraction.  The fraction's denominator will be printed over or 
 under the notes, optionally with a bracket.  The most common 
-tuplet is the triplet in which 3 notes have the length of 2, so 
+tuplet is the triplet in which 3 notes have the duration of 2, so
 the notes are 2/3 of their written length.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
@@ -175,13 +174,15 @@ c4 c \times 2/3 {b4 a g}
 
 Tuplets may be nested:
 
-@lilypond[fragment,ragged-right,verbatim,relative=2]
-\relative c'' {
-  \autoBeamOff
-  c4 \times 4/5 { f8 e f \times 2/3 {e[ f g] } } f4 |
-}
+@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
+\autoBeamOff
+c4 \times 4/5 { f8 e f \times 2/3 {e[ f g] } } f4 |
 @end lilypond
 
+Modifying nested tuplets which begin at the same musical moment
+must be done with @code{\tweak}.
+@c TODO Add link to LM section which deals with this.
+
 @predefined
 
 @funindex \tupletUp
@@ -200,24 +201,8 @@ Tuplets may be nested:
 @funindex tupletNumberFormatFunction
 @funindex tupletSpannerDuration
 
-@c when available
-@c @lilypondfile [ragged-right,line-width=16\cm,staffsize=14,quote]
-@c {Entering-several-tuplets-using-only-one-\times-command.ly}
-
-@ignore
-@c TODO Remove when snippet works ok
-@c Sent to Snippet 5 Feb 08
-The property @code{tupletSpannerDuration} specifies how long each
-bracket should last.  With this, you can make lots of tuplets
-while typing @code{\times} only once, thus saving lots of typing.
-In the next example, there are two triplets shown, while
-@code{\times} was only used once.
-
-@lilypond[quote,fragment,relative=2,ragged-right,verbatim]
-\set tupletSpannerDuration = #(ly:make-moment 1 4)
-\times 2/3 { c8 c c c c c }
-@end lilypond
-@end ignore
+@lilypondfile [verbatim,lilyquote,ragged-right,texidoc]
+{entering-several-tuplets-using-only-one--times-command.ly}
 
 @noindent
 For more information about @code{make-moment}, see
@@ -245,6 +230,8 @@ Tuplets may extend over bar lines, but they will inhibit a
 line break unless the @code{Forbid_line_break_engraver} is
 removed from the @code{Voice context}.
 
+@c TODO Move to LM 4
+@ignore
 @subheading Modifying nested tuplets
 
 @cindex tuplets, nested
@@ -322,7 +309,16 @@ below the staff, we can use @code{\override} in the usual way.
    \times 2/3 { c8[ c8 c8] }
 }
 @end lilypond
+@end ignore
 
+@c TODO - tidy up
+@c Sent to Valentin for LSR (general list of Rhythm snippets) 22 Feb
+@c Maybe try referencing with:
+@c For example of modifying bracket length see @lsr{..}
+@c Index entries could then be added above this.
+@c Delete ignore block when available in LSR
+
+@ignore
 @subheading Modifying tuplet bracket length
 
 @cindex tuplet bracket length
@@ -358,20 +354,19 @@ full length mode and how to modify what material they cover.
   c4
 }
 @end lilypond
+@end ignore
 
-@subheading Compressing music
+@c Compressing music
 
 @cindex compressing music
 @funindex \compressMusic
 
 @code{\compressMusic} works similarly to \times, but does not
 create a tuplet bracket.  One application is in polymetric
-notation, as shown in the following example.  See
-@ref{Polymetric notation}.
+notation, see @ref{Polymetric notation}.
 
-@c when available
-@c @lilypondfile [ragged-right,line-width=16\cm,staffsize=14,quote]
-@c {printing-music-with-different-time-signatures.ly}
+@lilypondfile [verbatim,lilyquote,ragged-right,texidoc]
+{printing-music-with-different-time-signatures.ly}
 
 
 @seealso
@@ -501,7 +496,7 @@ be entered using @code{\laissezVibrer}:
 @end lilypond
 
 The vertical placement of ties may be controlled; see
-@ref{Controlling direction}.
+@ref{Controlling direction and placement}.
 
 @quotation
 DELETE THIS ?
@@ -1903,7 +1898,8 @@ with @code{\set Timing.defaultBarType = }@var{bartype}.
 @seealso
 
 Notation Reference: @ref{Line breaking}, @ref{Repeats},
-@ref{System start delimiters}.
+@c FIXME: node name changed, but is subject to further changes.
+@c @ref{System start delimiters}.
 
 Snippets: @lsrdir{Rhythms,Rhythms}
 
@@ -2600,3 +2596,6 @@ Internals Reference: @internalsref{Timing_translator},
 
 
 
+
+
+