* lily/main.cc (main_with_guile): switch debugging.

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

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 5187c581242c3b102264de3d2a5c0453fc9c8adf..a01a7c3d1fb7cc6153962199b44c53f15bbac2ff 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -1064,7 +1064,15 @@ indicating how much of the measure has passed at this point.
 Bar lines and bar numbers are calculated automatically. For unmetered
 music (e.g. cadenzas), this is not desirable.  By setting
 @code{Score.timing} to false, this automatic timing can be switched
-off.
+off. Empty bar lines,
+
+@example
+  \bar ""
+@end example
+
+@noindent
+indicate where line breaks can occur.
+
 
 
 @refcommands
@@ -1154,7 +1162,7 @@ In this manual: @ref{Repeats}.
 
 Program reference: the bar line objects that are created at
 @internalsref{Staff} level are called @internalsref{BarLine}, the bar
-lines that span staves are @internalsref{SpanBar}s.
+lines that span staves are @internalsref{SpanBar} objects.
 
 @cindex bar lines at start of system
 @cindex start of system
@@ -2486,7 +2494,7 @@ With alternative endings:
 
 @refbugs
 
-If you do a nested repeat like
+A nested repeat like
 
 @example 
 \repeat @dots{}
@@ -2495,10 +2503,10 @@ If you do a nested repeat like
 @end example 
 
 @noindent
-then it is ambiguous to which @code{\repeat} the @code{\alternative}
-belongs. This ambiguity is resolved by always having the
-@code{\alternative} belong to the inner @code{\repeat}.  For clarity,
-it is advisable to use braces in such situations.
+is ambiguous, since it is is not clear to which @code{\repeat} the
+@code{\alternative} belongs. This ambiguity is resolved by always
+having the @code{\alternative} belong to the inner @code{\repeat}.
+For clarity, it is advisable to use braces in such situations.
 @cindex ambiguity
 
 @node Repeats and MIDI
@@ -3439,7 +3447,7 @@ that identity followed by a dash.  In the preceding example, the
 @internalsref{Lyrics}s are marked @code{duet-1} and @code{duet-2}:
 @example
   \context Lyrics = "duet-1" @{
-    Hi, my name is bert. @}
+    Hi, my name is Bert. @}
   \context Lyrics = "duet-2" @{
     Ooooo, ch\'e -- ri, je t'aime. @}
 @end example
@@ -3451,7 +3459,7 @@ The complete example is shown here:
      g2 e4 a2 f4 g2.  }
   \lyrics << \lyricsto "duet" \new Lyrics {
     \set vocNam = "Bert"
-    Hi, my name is bert. }
+    Hi, my name is Bert. }
   \lyricsto "duet" \new Lyrics {
     \set vocNam = "Ernie"
     Ooooo, ch\'e -- ri, je t'aime.
@@ -3471,7 +3479,7 @@ Stanza numbers can be added by setting @code{stanza}, e.g.
      g2 e4 a2 f4 g2.  }
    \lyrics \lyricsto "duet" \new Lyrics {
        \set vocNam = "1. "
-       Hi, my name is bert.
+       Hi, my name is Bert.
    }
 >>
 @end lilypond
@@ -7281,11 +7289,8 @@ accurately.  Use @code{<g a>8 <e a>8} instead.
 
 
 Contemporary music notation frequently uses special fermata symbols to
-indicate fermatas of differing lengths.
-
-@syntax
-
-The following are supported
+indicate fermatas of differing lengths.  The following fermatas are
+supported
 
 @lilypond[raggedright]
 \score {
@@ -7376,7 +7381,7 @@ used in music for beginners:
 The command @code{\setEasyHeads} overrides settings for the
 @internalsref{NoteHead} object.  To make the letters readable, it has
 to be printed in a large font size.  To print with a larger font, see
-@ref{Font Size}.
+@ref{Setting global staff size}.
 
 @cindex Xdvi
 @cindex ghostscript
@@ -7395,7 +7400,7 @@ correct result.
 @cindex Sound
 
 Entered music can also be converted to MIDI output.  The performance
-is intented for proof-hearing the music for errors.
+is intended for proof-hearing the music for errors.
 
 Ties, dynamics and tempo changes are interpreted.  Dynamic marks,
 crescendi and decrescendi translate into MIDI volume levels.  Dynamic