s/staffs/staves/; fixing other typos; minor formatting

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index 4fe8a8f98ea72a1835f4b69c63df5bc48bc8bab6..fd65dfe0e63272f2d004add8addca6aa673c97da 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -1127,7 +1127,7 @@ stretched according to the data in the page layout file.
 @end enumerate
 
 The @code{ragged-bottom} property adds space between systems, while
-the two-pass technique adds space between staffs inside a system.
+the two-pass technique adds space between staves inside a system.
 
 To allow this behaviour, a @code{tweak-key} variable has to be set in
 each score @code{\layout} block, and the tweaks included in each score

diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely
index bcdfadcd16d542c68d0b868517150f4bcb5474cc..448c211c3f355471752ca02a5d186b5636acc64f 100644 (file)
--- a/Documentation/user/templates.itely
+++ b/Documentation/user/templates.itely
@@ -297,7 +297,7 @@ text = \lyricmode {
 @appendixsubsec Piano centered dynamics
 
 Many piano scores have the dynamics centered between the two
-staffs.  This requires a bit of tweaking to implement, but
+staves.  This requires a bit of tweaking to implement, but
 since the template is right here, you don't have to do the
 tweaking yourself.
 

diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly
index c1af9532356744e32a1787c91fd546de77285807..fb2e46f39752550a51e61607300ae633c9044689 100644 (file)
--- a/input/regression/spacing-multi-tuplet.ly
+++ b/input/regression/spacing-multi-tuplet.ly
@@ -1,12 +1,11 @@
-\version "2.10.0" \header{
+\version "2.10.0"
 
+ \header{
 
-  texidoc = "Concurrent tuplets should be equidistant on all staffs.
-Such equidistant spacing is it at odds with elegant engraver spacing;
+  texidoc = "Concurrent tuplets should be equidistant on all staves.
+Such equidistant spacing is at odds with elegant engraver spacing;
 hence it must be switched on explicitly with the
-@code{uniform-stretching} property of @code{SpacingSpanner}.
-"
-
+@code{uniform-stretching} property of @code{SpacingSpanner}."
 }
 
 

diff --git a/input/regression/system-separator.ly b/input/regression/system-separator.ly
index 865ff4fc48b15f2c99d42c1ed5ee251cdb2836e8..7667b237734188447cefd3c8da1efba33453296e 100644 (file)
--- a/input/regression/system-separator.ly
+++ b/input/regression/system-separator.ly
@@ -2,9 +2,9 @@
 
 \header {
 
-  texidoc = "System separators maybe defined as markups in the
-@code{systemSeparator} field of the paper block. They are centered
-between the boundary staffs of each system. "
+  texidoc = "System separators may be defined as markups in the
+@code{systemSeparator} field of the paper block.  They are centered
+between the boundary staves of each system."
 
 }
 

diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index 52aa67496d9e416b69484aa3895d1e48fcbd9a52..217f9525300420d96ff197bad64a1d3fa4b5c600 100644 (file)
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,12 +1,11 @@
 \version "2.10.0" 
 
-\header{ texidoc="@cindex Nested Staff Groups
-Staffs can be nested in various combinations. Here, @code{StaffGroup}
+\header{
+  texidoc="@cindex Nested Staff Groups
+Staves can be nested in various combinations.  Here, @code{StaffGroup}
 and @code{ChoirStaff} produce similar straight brackets, whereas 
-@code{GrandStaff} produces curly brackets. In @code{InnerStaffGroup} 
-and @code{InnerChoirStaff}, the brackets are shifted leftwards.
-
-"
+@code{GrandStaff} produces curly brackets.  In @code{InnerStaffGroup} 
+and @code{InnerChoirStaff}, the brackets are shifted leftwards."
 }
 
 \score { 

diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
index 28839e5fce33a379e121aca0a96831d96712678d..b46f3ac123db60b2faaabad89941c3b7277cb3fd 100644 (file)
--- a/input/test/vertical-extent.ly
+++ b/input/test/vertical-extent.ly
@@ -1,7 +1,7 @@
 \version "2.10.0"
 % TODO: huh?  what's this file about?  -gp
-% This file shows that Staffs can get a very deep or high; there is a lot
-% of room between the staffs. 
+% This file shows that Staff grobs can get very deep or high; there is a lot
+% of room between the staves. 
 
 \header { texidoc = "
 Vertical extents may increased by setting @code{\override VerticalAxisGroup #'minimum-Y-extent}, 

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index d7102ac15b33aa576425728e3c1917ecdd529a37..a6ab40d9093fcc1f58d4120be8a2f92da0a12783 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -29,7 +29,7 @@ Staff_symbol::print (SCM smob)
   Interval span_points (0, 0);
 
   /*
-    For raggedright without ragged staffs, simply set width to the linewidth.
+    For raggedright without ragged staves, simply set width to the linewidth.
 
     (ok -- lousy UI, since width is in staff spaces)
 

diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 64e7333f134d06bbbb0816ea819cb777bb56ba38..fe214ac48dee3fc7e0635c973bf95199a7360730 100644 (file)
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -37,7 +37,7 @@ protected:
 
 ADD_ACKNOWLEDGER (Vertical_align_engraver, axis_group);
 ADD_TRANSLATOR (Vertical_align_engraver,
-               "Catch groups (staffs, lyrics lines, etc.) and stack "
+               "Catch groups (staves, lyrics lines, etc.) and stack "
                "them vertically.",
                /* create */ "VerticalAlignment",
                /* read */

diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index d7611535a7bb9d9e0d9a5b5a062c5e17ddc0a29e..e9f845503c04cdbc3ec49c49d892bcb89796b551 100644 (file)
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -92,7 +92,7 @@ Volta_engraver::staff_eligible ()
      volta engraver in score context or somesuch. */
   if (!scm_is_pair (staffs))
     {
-      programming_error ("volta engraver can't find staffs");
+      programming_error ("volta engraver can't find staves");
       return false;
     }
   else if (scm_car (scm_last_pair (staffs)) != staff_)

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index a69c7ad16f34278fabefaf1913bd666af8a6393a..345e48755e201f58bbc73033cb63cc59d099270c 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -6,7 +6,7 @@
   \accepts "Score"
 
   \defaultchild "Score"
-  \description "Hard coded entry point for LilyPond. Cannot be tuned."
+  \description "Hard coded entry point for LilyPond.  Cannot be tuned."
   \grobdescriptions #all-grob-descriptions
 }
 
@@ -166,10 +166,8 @@ contained staves are not connected vertically."
   \accepts "CueVoice"
   \defaultchild "Voice"
 
-  \description  "
-    A context like @code{Staff} but for printing rhythms.  Pitches are
-    ignored; the notes are printed on one line.  
-"
+  \description "A context like @code{Staff} but for printing rhythms.
+Pitches are ignored; the notes are printed on one line."
 }
 
 
@@ -177,13 +175,12 @@ contained staves are not connected vertically."
   \type "Engraver_group"
   \name "Voice"
 
-  \description "
-    Corresponds to a voice on a staff.  This context handles the
-    conversion of dynamic signs, stems, beams, super- and subscripts,
-    slurs, ties, and rests.
+  \description "Corresponds to a voice on a staff.  This context
+handles the conversion of dynamic signs, stems, beams, super- and
+subscripts, slurs, ties, and rests.
 
-    You have to instantiate this explicitly if you want to have
-    multiple voices on the same staff."
+You have to instantiate this explicitly if you want to have
+multiple voices on the same staff."
 
   localKeySignature = #'()
   \consists "Font_size_engraver"
@@ -285,9 +282,9 @@ contained staves are not connected vertically."
   \name GrandStaff
   localKeySignature = #'()
   
-  \description " A group of staffs, with a brace on the left
-    side, grouping the staves together.  The bar lines of the
-    contained staves are connected vertically.  "
+  \description "A group of staves, with a brace on the left
+side, grouping the staves together.  The bar lines of the
+contained staves are connected vertically."
 
   \consists "Span_bar_engraver"
   \consists "Span_arpeggio_engraver"
@@ -303,9 +300,9 @@ contained staves are not connected vertically."
   \name "PianoStaff"
   \alias "GrandStaff"
 
-  \description
-  "Just like @code{GrandStaff} but with a forced distance between
-    the staves, so cross staff beaming and slurring can be used."
+  \description "Just like @code{GrandStaff} but with a forced
+distance between the staves, so cross staff beaming and slurring
+can be used."
 
   \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4)
   \consists "Instrument_name_engraver"
@@ -340,12 +337,10 @@ contained staves are not connected vertically."
   \InnerStaffGroup
   \name StaffGroup
   
-  \description
-
-  "Groups staffs while adding a bracket on the left side, grouping
-the staves together.  The bar lines of the contained staves are
-connected vertically.  StaffGroup only consists of a collection of
-staffs, with a bracket in front and spanning bar lines. "
+  \description "Groups staves while adding a bracket on the left
+side, grouping the staves together.  The bar lines of the contained
+staves are connected vertically.  @code{StaffGroup} only consists of
+a collection of staves, with a bracket in front and spanning bar lines."
   
   \accepts "InnerChoirStaff"
   \accepts "ChoirStaff"
@@ -358,8 +353,8 @@ staffs, with a bracket in front and spanning bar lines. "
   \type "Engraver_group"
   \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.75 . 2.0)
 
-  \description " Corresponds to a voice with lyrics.  Handles the
-printing of a single line of lyrics.  "
+  \description "Corresponds to a voice with lyrics.  Handles the
+printing of a single line of lyrics."
   
   \name "Lyrics"
   instrumentName = #'()
@@ -448,16 +443,15 @@ AncientRemoveEmptyStaffContext = \context {
   \name "Score"
   
   \description "This is the top level notation context.  No
-    other context can contain a @code{Score} context.  This context
-    handles the administration of time signatures.  It also makes sure
-    that items such as clefs, time signatures, and key-signatures are
-    aligned across staves.
-
-    You cannot explicitly instantiate a Score context (since it is
-    not contained in any other context).  It is instantiated
-    automatically when an output definition (a @code{\score} or
-    @code{\layout} block) is processed."
+other context can contain a @code{Score} context.  This context
+handles the administration of time signatures.  It also makes sure
+that items such as clefs, time signatures, and key-signatures are
+aligned across staves.
 
+You cannot explicitly instantiate a @code{Score} context (since it
+is not contained in any other context).  It is instantiated
+automatically when an output definition (a @code{\score} or
+@code{\layout} block) is processed."
 
   \consists "Paper_column_engraver"
   \consists "Vertically_spaced_contexts_engraver"
@@ -656,7 +650,8 @@ AncientRemoveEmptyStaffContext = \context {
   \alias "Staff"
   \alias "Voice"
   \consists "Swallow_engraver"
-  \description "Silently discards all musical information given to this context. "
+  \description "Silently discards all musical information given to this
+context."
 }
 
 \context {
@@ -670,7 +665,7 @@ AncientRemoveEmptyStaffContext = \context {
   \remove "Fingering_engraver"
   \remove "New_fingering_engraver"
 
-  \description "Context for drawing notes in a Tab staff. "
+  \description "Context for drawing notes in a Tab staff."
 
   %% TabStaff increase the staff-space, which in turn
   %% increases beam thickness and spacing; beams are
@@ -731,7 +726,9 @@ AncientRemoveEmptyStaffContext = \context {
   \Voice
   \name "VaticanaVoice"
   \alias "Voice"
-  \description "Same as @code{Voice} context, except that it is accommodated for tyepsetting Gregorian Chant in the notational style of Editio Vaticana."
+  \description "Same as @code{Voice} context, except that it is
+accommodated for typesetting Gregorian Chant in the notational style
+of Editio Vaticana."
 
   \remove "Slur_engraver"
   \remove "Stem_engraver"
@@ -770,7 +767,9 @@ AncientRemoveEmptyStaffContext = \context {
   \accepts "VaticanaVoice"
   \defaultchild "VaticanaVoice"
 
-  \description "Same as @code{Staff} context, except that it is accommodated for tyepsetting Gregorian Chant in the notational style of Editio Vaticana."
+  \description "Same as @code{Staff} context, except that it is
+accommodated for typesetting Gregorian Chant in the notational style
+of Editio Vaticana."
 
   \remove "Time_signature_engraver"
   \consists "Custos_engraver"
@@ -851,7 +850,8 @@ AncientRemoveEmptyStaffContext = \context {
   \Voice
   \name "MensuralVoice"
   \alias "Voice"
-  \description "Same as @code{Voice} context, except that it is accommodated for tyepsetting a piece in mensural style."
+  \description "Same as @code{Voice} context, except that it is
+accommodated for typesetting a piece in mensural style."
 
   \remove "Slur_engraver"
   \remove "Ligature_bracket_engraver"
@@ -871,7 +871,8 @@ AncientRemoveEmptyStaffContext = \context {
   \denies "Voice"
   \defaultchild "MensuralVoice"
   \accepts "MensuralVoice"
-  \description "Same as @code{Staff} context, except that it is accommodated for tyepsetting a piece in mensural style."
+  \description "Same as @code{Staff} context, except that it is
+accommodated for typesetting a piece in mensural style."
 
   \consists "Custos_engraver"
 

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index c421eefdf58690f562e9765d58e686441123e4df..03ac6f83e3dd3317bfec84ba56447d617dadd8ea 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -126,7 +126,7 @@ Syntax:
        )) 
     (ContextChange
      . (
-       (description .  "Change staffs in Piano staff. 
+       (description .  "Change staves in Piano staff. 
 
 Syntax @code{\\translator Staff = @var{new-id}}.")
        (iterator-ctor . , ly:change-iterator::constructor)
@@ -564,7 +564,7 @@ For example, transposed music.")
     (SkipMusic
      . (
        (description .  "Filler that takes up duration, does not print anything, and also
-does not create staffs or voices implicitly.
+does not create staves or voices implicitly.