More accidental stuff from Valentin.

[lilypond.git] / Documentation / user / basic-notation.itely

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index a105e4a242b9df89740f303345be465c5ea3a05b..40b089878f186c945e10f375a8f6acbef1135e43 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -486,7 +486,7 @@ existing music with another @code{transpose}
 
 Program reference: @internalsref{TransposedMusic}.
 
-Example: @inputfileref{input/@/test,smart@/-transpose@/.ly}.
+Example: @lsr{scheme,transpose-pitches-with-minimum-accidentals.ly}.
 
 
 @refbugs
@@ -941,7 +941,7 @@ is off.
 
 If you want to allow line breaking on the bar lines where
 @internalsref{Completion_heads_engraver} splits notes, you must
-also remove @internalsref{Forbid_line_breaks_engraver}.
+also remove @internalsref{Forbid_line_break_engraver}.
 
 
 @refbugs
@@ -1054,7 +1054,7 @@ These voices are all separate from the voice that contains the notes just
 outside the @code{<< \\ >>} construct.  This should be noted when making
 changes at the voice level.  This also means that slurs and ties cannot go
 into or out of a @code{<< \\ >>} construct.  Conversely, parallel voices
-from separate @code{<< \\ >>} constructs on the same staff are the the
+from separate @code{<< \\ >>} constructs on the same staff are the
 same voice.  Here is the same example, with different noteheads for each
 voice.  Note that the change to the note-head style in the main voice does
 not affect
@@ -1612,7 +1612,7 @@ measure is subdivided in 2, 2, 2 and 3.  This is passed to
 Program reference: @internalsref{TimeSignature}, and
 @internalsref{Timing_translator}.
 
-Examples: @inputfileref{input/@/test,compound@/-time@/.ly}.
+Examples: @lsr{contemporary,compound-time-signature.ly}.
 
 
 @refbugs
@@ -1716,7 +1716,7 @@ point (without increasing the bar number counter).
 In scores with many staves, a @code{\bar} command in one staff is
 automatically applied to all staves.  The resulting bar lines are
 connected between different staves of a @code{StaffGroup},
-@code{PianoStaff}, or @code{ChoirStaff}.
+@code{PianoStaff}, or @code{GrandStaff}.
 
 @lilypond[quote,ragged-right,fragment,verbatim]
 <<
@@ -1873,7 +1873,7 @@ in every context, and that type is determined by the property
 System start delimiters may be deeply nested,
 
 @lilypond[quote,ragged-right,verbatim]
-\new StaffGroup 
+\new StaffGroup
 \relative <<
   \set StaffGroup.systemStartDelimiterHierarchy
     = #'(SystemStartSquare (SystemStartBracket a (SystemStartSquare b)) d)
@@ -1898,8 +1898,8 @@ LilyPond, these lines are drawn using a separate layout object called
 
 The staff symbol may be tuned in the number, thickness and distance
 of lines, using properties.  This is demonstrated in the example files
-@inputfileref{input/@/test,staff@/-lines@/.ly},
-@inputfileref{input/@/test,staff@/-size@/.ly}.
+@lsr{staff,changing-the-number-of-lines-in-a-staff.ly} and
+@lsr{staff,changing-the-staff-size.ly}.
 
 In addition, staves may be started and stopped at will. This is done
 with @code{\startStaff} and @code{\stopStaff}.
@@ -1930,10 +1930,7 @@ sections. An example is shown here
 
 Program reference: @internalsref{StaffSymbol}.
 
-Examples: @inputfileref{input/@/test,staff@/-lines@/.ly},
-@inputfileref{input/@/test@/,ossia.ly},
-@inputfileref{input/@/test,staff@/-size@/.ly},
-@lsr{staff,staff-line-positions.ly}
+Examples: @lsrdir{staff}
 
 
 @node Writing music in parallel
@@ -2450,7 +2447,7 @@ length of the main note.  The fraction 3/4 can be changed by setting
 @code{afterGraceFraction}, ie.
 
 @example
-afterGraceFraction = #(cons 7 8)
+#(define afterGraceFraction (cons 7 8))
 @end example
 
 @noindent
@@ -3201,18 +3198,13 @@ c1
 \alternative { {d2 d} {f f,} }
 @end lilypond
 
-In the following example, the first ending is not a complete
-bar (it only had 3 beats).  The beginning of the second ending
-contains the 4th beat from the first ending.  This @q{extra}
-beat in the second ending is due to the first time ending,
-and has nothing to do with the @code{\partial} at the
-beginning of the example.
+Repeats with upbeats may be created.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 \new Staff {
-  \partial 4
-  \repeat volta 4 { e | c2 d2 | e2 f2 | }
-  \alternative { { g4 g g } { a | a a a a | b2. } }
+  \partial 4 e |
+  \repeat volta 4 { c2 d2 | e2 f2 | }
+  \alternative { { g4 g g e } { a a a a | b2. } }
 }
 @end lilypond
 
@@ -3241,14 +3233,22 @@ bracket only lasts one measure, which is a duration of 3/4.
 }
 @end lilypond
 
+If you want to start a repeat at the beginning of a line and have a
+double bar at the end of the previous line, use
+@example
+@dots{} \bar "||:" \break 
+\repeat volta 2 @{ @dots{} 
+@end example
+see @ref{Bar lines} for more information.
 
 @seealso
 
 Examples:
 
 Brackets for the repeat are normally only printed over the topmost
-staff.  This can be adjusted by setting the @code{voltaOnThisStaff}
-property; see
+staff.  This can be adjusted by moving @code{Volta_engraver} to the
+Staff context where you want the brackets to appear;
+see @ref{Modifying context plug-ins} and
 
 @lsr{repeats,volta@/-multi@/-staff@/.ly}.
 
@@ -3358,9 +3358,8 @@ c4 c4
 
 Program reference: @internalsref{VoltaBracket},
 @internalsref{RepeatedMusic},
-@internalsref{VoltaRepeatedMusic},
-@internalsref{UnfoldedRepeatedMusic}, and
-@internalsref{FoldedRepeatedMusic}.
+@internalsref{VoltaRepeatedMusic}, and
+@internalsref{UnfoldedRepeatedMusic}.
 
 
 @node Tremolo repeats