Run `make grand-replace'.

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

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 6edb1f910e4afb8b520e5e67eeb6e23504ee44c6..c00c2338d407f3572096805cf78e6b1ad050ed4f 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--2008 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)
 {
@@ -167,17 +167,43 @@ Staff_symbol::height  (SCM smob)
   return ly_interval2scm (y_ext);
 }
 
+bool
+Staff_symbol::on_line (Grob *me, int pos)
+{
+  SCM line_positions = me->get_property ("line-positions");
+  if (scm_is_pair (line_positions))
+    {
+      Real min_line = HUGE_VAL;
+      Real max_line = -HUGE_VAL;
+      for (SCM s = line_positions; scm_is_pair (s); s = scm_cdr (s))
+       {
+         Real current_line = scm_to_double (scm_car (s));
+         if (pos == current_line)
+           return true;
+         if (current_line > max_line)
+           max_line = current_line;
+         if (current_line < min_line)
+           min_line = current_line;
+       
+       }
+      if (pos < min_line)
+       return (( (int) (rint (pos - min_line)) % 2) == 0);
+      if (pos > max_line)
+       return (( (int) (rint (pos - max_line)) % 2) == 0);
 
+      return false;
+    }
+  else
+    return ((abs (pos + line_count (me)) % 2) == 1);
+}
 
-
-ADD_INTERFACE (Staff_symbol, "staff-symbol-interface",
-              "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. ",
-
+ADD_INTERFACE (Staff_symbol,
+              "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 "