Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / staff-symbol.cc

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index f999346753e44620bbebde59233da9d8271ef1e0..d4aa9e116c8bb35abc95a6aaabe33f0baa0852af 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol.hh"
@@ -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)
 
@@ -139,7 +139,7 @@ Staff_symbol::get_ledger_line_thickness (Grob *me)
   return z[X_AXIS] * get_line_thickness (me) + z[Y_AXIS] * staff_space (me);
 }
 
-MAKE_SCHEME_CALLBACK(Staff_symbol,height,1);
+MAKE_SCHEME_CALLBACK (Staff_symbol, height,1);
 SCM
 Staff_symbol::height  (SCM smob)
 {
@@ -171,13 +171,12 @@ Staff_symbol::height  (SCM smob)
 
 
 ADD_INTERFACE (Staff_symbol,
-              "This spanner draws the lines of a staff. "
-              "A staff symbol definines a vertical unit, the staff space. "
-              "Quantities that go by a half staff space are called positions "
-              "The center (i.e. middle line "
-              "or space) is position 0. The length of the symbol may be set by hand "
-              "through the @code{width} property. ",
-
+              "This spanner draws the lines of a staff.  A staff symbol"
+              " defines a vertical unit, the @emph{staff space}.  Quantities"
+              " that go by a half staff space are called @emph{positions}."
+              "  The center (i.e., middle line or space) is position@tie{}0."
+              " The length of the symbol may be set by hand through the"
+              " @code{width} property.",
 
               /* properties */
               "ledger-line-thickness "