Typo fixes (issue 5622049)

[plroskin]

Reviewers: ,

Message:
Too bad I only reviewed the "unpure-pure containers" documentation
(issue 2040) after it was committed.

Description:
Typo fixes

Fix unneeded "ll" in "canceled", "canceling" and "labeled".  Replace
"and" with "an" in the documentation about unpure-pure containers.

Please review this at http://codereview.appspot.com/5622049/

Affected files:
  M Documentation/contributor/issues.itexi
  M Documentation/hu/learning/fundamental.itely
  M Documentation/learning/fundamental.itely
  M Documentation/music-glossary.tely
  M Documentation/nl/learning/fundamental.itely
  M Documentation/notation/changing-defaults.itely
  M input/regression/cue-clef.ly
  M lily/dynamic-engraver.cc
  M scm/music-functions.scm


Index: Documentation/contributor/issues.itexi
diff --git a/Documentation/contributor/issues.itexi  
b/Documentation/contributor/issues.itexi
index  
86976fd3242f450e6f3da96f91e78b2551f0702c..2316f95855d30eebde70d21afd1c44797b7f5640  
100644
--- a/Documentation/contributor/issues.itexi
+++ b/Documentation/contributor/issues.itexi
@@ -672,7 +672,7 @@ Performance: performance issue.

 If you particularly want to add a label not in the list, go
 ahead, but this is not recommended, except when an issue is marked
-as fixed.  In this case it should be labelled fixed_mm_MM_ss,
+as fixed.  In this case it should be labeled fixed_mm_MM_ss,
 where mm is major version, MM minor version and ss current
 release.

Index: Documentation/hu/learning/fundamental.itely
diff --git a/Documentation/hu/learning/fundamental.itely  
b/Documentation/hu/learning/fundamental.itely
index  
3004a17d0c65183bbdec36144dcfa053ec4341f6..2dc6fd71a966461fa7c9f25e1327313093c17fb6  
100644
--- a/Documentation/hu/learning/fundamental.itely
+++ b/Documentation/hu/learning/fundamental.itely
@@ -1864,7 +1864,7 @@ is specified, no error message is produced, but the  
expected
 action will not take place.  For example, the
 @code{instrumentName} clearly lives in the @code{Staff} context, since
 it is the staff that is to be named.
-In this example the first staff is labelled, but not the second,
+In this example the first staff is labeled, but not the second,
 because we omitted the context name.

 @lilypond[quote,verbatim,ragged-right]
Index: Documentation/learning/fundamental.itely
diff --git a/Documentation/learning/fundamental.itely  
b/Documentation/learning/fundamental.itely
index  
03eb7a2332548b4572148bab70c5f1190b848d05..423f6ee41f5e50a8c764baba1b86ec19dbc30e37  
100644
--- a/Documentation/learning/fundamental.itely
+++ b/Documentation/learning/fundamental.itely
@@ -1714,7 +1714,7 @@ is specified, no error message is produced, but the  
expected
 action will not take place.  For example, the
 @code{instrumentName} clearly lives in the @code{Staff} context, since
 it is the staff that is to be named.
-In this example the first staff is labelled, but not the second,
+In this example the first staff is labeled, but not the second,
 because we omitted the context name.

 @lilypond[quote,verbatim,ragged-right]
Index: Documentation/music-glossary.tely
diff --git a/Documentation/music-glossary.tely  
b/Documentation/music-glossary.tely
index  
b2df038dc722d5ec91047f054db0d7c9e0ccfe1f..ce41f4ec7d593b1ee11a222191162d3c8c69d8ab  
100644
--- a/Documentation/music-glossary.tely
+++ b/Documentation/music-glossary.tely
@@ -5882,7 +5882,7 @@ or bracket) to indicate that the music is to be  
played in a different octave:
 For longer passages, it may be more practical to mark the octave change at  
the
 beginning with a phrase (see the list below for examples), but without a  
bracket
 or extender line.  Then, when the music returns to the written pitch, the  
octave
-change is cancelled with the word @notation{loco} (q.v.).
+change is canceled with the word @notation{loco} (q.v.).

 To parallel the list above:

Index: Documentation/nl/learning/fundamental.itely
diff --git a/Documentation/nl/learning/fundamental.itely  
b/Documentation/nl/learning/fundamental.itely
index  
9f33f9a1da8a6d04ac36fa84b829813df72a6a6c..7c4e50896e39ca3a4c415bb51d68ff396e921ade  
100644
--- a/Documentation/nl/learning/fundamental.itely
+++ b/Documentation/nl/learning/fundamental.itely
@@ -1736,7 +1736,7 @@ is specified, no error message is produced, but the  
expected
 action will not take place.  For example, the
 @code{instrumentName} clearly lives in the @code{Staff} context, since
 it is the staff that is to be named.
-In this example the first staff is labelled, but not the second,
+In this example the first staff is labeled, but not the second,
 because we omitted the context name.

 @lilypond[quote,verbatim,ragged-right]
Index: Documentation/notation/changing-defaults.itely
diff --git a/Documentation/notation/changing-defaults.itely  
b/Documentation/notation/changing-defaults.itely
index  
68aa8b8c4943a78b3d9a247d26679f991cc8d8b1..1db53e061fdde7efb5039453b770738ea32ec668  
100644
--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -2309,7 +2309,7 @@ TrillPitchAccidental - not tried
 TrillPitchGroup - not tried
 @end ignore

-These indications affect all notes until they are cancelled.
+These indications affect all notes until they are canceled.

 @lilypond[verbatim,quote,relative=2]
 c2( c)
@@ -3707,7 +3707,7 @@ Scheme function instead of a literal (i.e. a number  
or pair).

 For certain grobs, the @code{Y-extent} is based on the @code{stencil}
 property, overriding the stencil property of one of these will
-require and additional @code{Y-extent} override with an unpure-pure
+require an additional @code{Y-extent} override with an unpure-pure
 container.  When a function overrides a @code{Y-offset} and/or
 @code{Y-extent} it is assumed that this will trigger line breaking
 calculations too early during compilation.  So the function is not
@@ -3733,7 +3733,7 @@ An unpure-pure container is constructed as follows;

 where @code{f0} is a function taking @var{n} arguments (@var{n >= 1})
 and the first argument must always be the grob.  This is the function
-that gives the actual result.  @var{f1} is the function being labelled
+that gives the actual result.  @var{f1} is the function being labeled
 as @q{pure} that takes @var{n + 2} arguments.  Again, the first argument
 must always still be the grob but the second and third are @q{start}
 and @q{end} arguments.
@@ -3791,7 +3791,7 @@ Usually for simple calculations nearly-identical  
functions for both the
 @q{unpure} and @q{pure} parts can be used, by only changing the number
 of arguments passed to, and the scope of, the function.

address@hidden a function is labelled as @q{pure} and it turns out not to
address@hidden a function is labeled as @q{pure} and it turns out not to
 be, the results can be unexpected.}


Index: input/regression/cue-clef.ly
diff --git a/input/regression/cue-clef.ly b/input/regression/cue-clef.ly
index  
1b5ee627d484e39bca036c4fbf7864d05f82e175..936009b3fcb75b454b449ced5d5aab01de7c00d1  
100644
--- a/input/regression/cue-clef.ly
+++ b/input/regression/cue-clef.ly
@@ -2,7 +2,7 @@

 \header {
   texidoc = "Clefs for cue notes: Print a cue clef at the begin of the cue
-notes and a cancelling clef after the cue notes."
+notes and a canceling clef after the cue notes."
 }

 vI = \relative c'' { \clef "treble" \repeat unfold 16 g4 }
Index: lily/dynamic-engraver.cc
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index  
0dec856cb08073553c83b89b1012613e73af87d3..a3cb7795212c98da8bdd25a68c13e826064f5a82  
100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -121,7 +121,7 @@ Dynamic_engraver::listen_span_dynamic (Stream_event *ev)

   /* Cancel any ongoing crescendo, either explicitly by \! or
      implicitly by a new crescendo. Also avoid warning if cresc is
-     cancelled both implicitly and explicitly. */
+     canceled both implicitly and explicitly. */
   if ((d == STOP || current_cresc_ev_) && !accepted_spanevents_drul_[STOP])
     ASSIGN_EVENT_ONCE (accepted_spanevents_drul_[STOP], ev);
 }
Index: scm/music-functions.scm
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index  
6114e144d6bc8e6b5d8400fd7b5b2d3bd04ed132..dc60f84078b1b73457d492e56bf59d841c9706cd  
100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -1308,14 +1308,14 @@ as a context."
                                   `(Staff ,(make-accidental-rule 'same-octave 
0))
                                   '()
                                   context))
-      ;; accidentals from one voice do NOT get cancelled in other voices
+      ;; accidentals from one voice do NOT get canceled in other voices
       ((equal? style 'voice)
        (set-accidentals-properties #t
                                   `(Voice ,(make-accidental-rule 'same-octave 
0))
                                   '()
                                   context))
       ;; accidentals as suggested by Kurt Stone, Music Notation in the  
20th century.
-      ;; This includes all the default accidentals, but accidentals also  
needs cancelling
+      ;; This includes all the default accidentals, but accidentals also  
needs canceling
       ;; in other octaves and in the next measure.
       ((equal? style 'modern)
        (set-accidentals-properties #f
@@ -1380,7 +1380,7 @@ as a context."
                                   context))
       ;; Multivoice accidentals to be read both by musicians playing one  
voice
       ;; and musicians playing all voices.
-      ;; Accidentals are typeset for each voice, but they ARE cancelled  
across voices.
+      ;; Accidentals are typeset for each voice, but they ARE canceled  
across voices.
       ((equal? style 'modern-voice)
        (set-accidentals-properties  #f
                                    `(Voice ,(make-accidental-rule 'same-octave 
0)
@@ -1403,7 +1403,7 @@ as a context."
                                           ,(make-accidental-rule 'same-octave 
1))
                                   context))
       ;; stone's suggestions for accidentals on grand staff.
-      ;; Accidentals are cancelled across the staves in the same grand  
staff as well
+      ;; Accidentals are canceled across the staves in the same grand  
staff as well
       ((equal? style 'piano)
        (set-accidentals-properties #f
                                   `(Staff ,(make-accidental-rule 'same-octave 
0)