X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=c00c2338d407f3572096805cf78e6b1ad050ed4f;hb=4275096e4a15134ab277b72d9828959d4f5712f1;hp=ddbf2829a61a611254602ad6d1986081ab9c2d14;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index ddbf2829a6..c00c2338d4 100644
--- 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,13 +29,13 @@ 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)
 
     --hwn.
   */
-  Real t = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   t *= robust_scm2double (me->get_property ("thickness"), 1.0);
 
   Direction d = LEFT;
@@ -65,24 +65,41 @@ Staff_symbol::print (SCM smob)
     }
   while (flip (&d) != LEFT);
 
-  int l = Staff_symbol::line_count (me);
+  Stencil m;
 
-  Real height = (l - 1) * staff_space (me) / 2;
-  Stencil a
+  SCM line_positions = me->get_property ("line-positions");
+  Stencil line
     = Lookup::horizontal_line (span_points
 			       -me->relative_coordinate (common, X_AXIS),
 			       t);
 
-  Stencil m;
-  for (int i = 0; i < l; i++)
+  Real space = staff_space (me);
+  if (scm_is_pair (line_positions))
     {
-      Stencil b (a);
-      b.translate_axis (height - i * staff_space (me), Y_AXIS);
-      m.add_stencil (b);
+      for (SCM s = line_positions; scm_is_pair (s);
+	   s = scm_cdr (s))
+	{
+	  Stencil b (line);
+	  b.translate_axis (scm_to_double (scm_car (s))
+			    * 0.5 * space, Y_AXIS);
+	  m.add_stencil (b);
+	}
+    }
+  else
+    {
+      int l = Staff_symbol::line_count (me);
+      Real height = (l - 1) * staff_space (me) / 2;
+      for (int i = 0; i < l; i++)
+	{
+	  Stencil b (line);
+	  b.translate_axis (height - i * space, Y_AXIS);
+	  m.add_stencil (b);
+	}
     }
   return m.smobbed_copy ();
 }
 
+
 int
 Staff_symbol::get_steps (Grob *me)
 {
@@ -108,7 +125,7 @@ Staff_symbol::staff_space (Grob *me)
 Real
 Staff_symbol::get_line_thickness (Grob *me)
 {
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   return robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
 }
@@ -122,12 +139,77 @@ Staff_symbol::get_ledger_line_thickness (Grob *me)
   return z[X_AXIS] * get_line_thickness (me) + z[Y_AXIS] * staff_space (me);
 }
 
-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. ",
+MAKE_SCHEME_CALLBACK (Staff_symbol, height,1);
+SCM
+Staff_symbol::height  (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
+  t *= robust_scm2double (me->get_property ("thickness"), 1.0);
+  
+  SCM line_positions = me->get_property ("line-positions");
+
+  Interval y_ext;
+  Real space = staff_space (me);
+  if (scm_is_pair (line_positions))
+    {
+      for (SCM s = line_positions; scm_is_pair (s);
+	   s = scm_cdr (s))
+	y_ext.add_point (scm_to_double (scm_car (s)) * 0.5 * space);
+    }
+  else
+    {
+      int l = Staff_symbol::line_count (me);
+      Real height = (l - 1) * staff_space (me) / 2;
+      y_ext = Interval (-height, height);
+    }
+  y_ext.widen (t/2);
+  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);
+}
 
-	       "ledger-line-thickness width staff-space thickness line-count");
+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 "
+	       "line-count "
+	       "line-positions "
+	       "staff-space "
+	       "thickness "
+	       "width "
+	       );