X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=d9a8ce307827d59bb63cb9a974abaeef157e6201;hb=a1ac6142347beea8db846898b777b0e67cf9f83f;hp=9e6c4cdc1c1ab2a7cf4ff878c2e740bc67116c67;hpb=667d9bdb6227dd10819599c6d069a5eeb67eedd7;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 9e6c4cdc1c..d9a8ce3078 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>		// ceil
 
 #include "axis-group-interface.hh"
 #include "note-column.hh"
 #include "stem.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-def.hh"
 #include "group-interface.hh"
 #include "staff-symbol-referencer.hh"
@@ -18,17 +18,22 @@
 #include "note-head.hh"
 #include "accidental-placement.hh"
 
+/*
+  TODO: figure out if we can prune this class. This is just an
+  annoying layer between (rest)collision & (note-head + stem)
+ */
+
 bool
-Note_column::rest_b (Grob*me) 
+Note_column::has_rests (Grob*me) 
 {
-  return unsmob_grob (me->get_grob_property ("rest"));
+  return unsmob_grob (me->get_property ("rest"));
 }
 
 int
 Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
 {
-  SCM s1 = p1->get_grob_property ("horizontal-shift");
-  SCM s2 = p2->get_grob_property ("horizontal-shift");
+  SCM s1 = p1->get_property ("horizontal-shift");
+  SCM s2 = p2->get_property ("horizontal-shift");
 
   int h1 = (gh_number_p (s1))?  gh_scm2int (s1) :0;
   int h2 = (gh_number_p (s2)) ? gh_scm2int (s2):0;
@@ -36,9 +41,9 @@ Note_column::shift_compare (Grob *const &p1, Grob *const&p2)
 }
 
 Item *
-Note_column::stem_l (Grob*me) 
+Note_column::get_stem (Grob*me) 
 {
-  SCM s = me->get_grob_property ("stem");
+  SCM s = me->get_property ("stem");
   return  unsmob_item (s);
 }
   
@@ -49,12 +54,12 @@ Note_column::head_positions_interval (Grob *me)
 
   iv.set_empty ();
 
-  SCM h = me->get_grob_property ("note-heads");
+  SCM h = me->get_property ("note-heads");
   for (; gh_pair_p (h); h = ly_cdr (h))
     {
       Grob *se = unsmob_grob (ly_car (h));
       
-      int j = int (Staff_symbol_referencer::position_f (se));
+      int j = Staff_symbol_referencer::get_rounded_position (se);
       iv.unite (Slice (j,j));
     }
   return iv;
@@ -63,10 +68,10 @@ Note_column::head_positions_interval (Grob *me)
 Direction
 Note_column::dir (Grob*  me)
 {
-  Grob *stem = unsmob_grob (me->get_grob_property ("stem"));
+  Grob *stem = unsmob_grob (me->get_property ("stem"));
   if (stem && Stem::has_interface (stem))
     return Stem::get_direction (stem);
-  else if (gh_pair_p (me->get_grob_property ("note-heads")))
+  else if (gh_pair_p (me->get_property ("note-heads")))
     return (Direction)sign (head_positions_interval (me).center ());
 
   programming_error ("Note column without heads and stem!");
@@ -75,38 +80,55 @@ Note_column::dir (Grob*  me)
 
 
 void
-Note_column::set_stem (Grob*me,Grob * stem_l)
+Note_column::set_stem (Grob*me,Grob * stem)
 {
-  me->set_grob_property ("stem", stem_l->self_scm ());
-  me->add_dependency (stem_l);
-  Axis_group_interface::add_element (me, stem_l);
+  me->set_property ("stem", stem->self_scm ());
+  me->add_dependency (stem);
+  Axis_group_interface::add_element (me, stem);
 }
 
+
+Grob*
+Note_column::get_rest (Grob*me)
+{
+  return unsmob_grob (me->get_property ("rest"));
+}
+  
 void
 Note_column::add_head (Grob*me,Grob *h)
 {
+  bool both = false;
   if (Rest::has_interface (h))
     {
-      me->set_grob_property ("rest", h->self_scm ());
+      if (gh_pair_p (me->get_property ("note-heads")))
+	both = true;
+      else
+	me->set_property ("rest", h->self_scm ());
     }
   else if (Note_head::has_interface (h))
     {
+      if (unsmob_grob (me->get_property ("rest")))
+	both = true;
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h);
     }
-  Axis_group_interface::add_element (me, h);
+
+  if (both)
+    me->warning ("Can't have rests and note heads together on a stem.");
+  else
+    Axis_group_interface::add_element (me, h);
 }
 
 /**
-  translate the rest symbols vertically by amount DY_I, but only if
+  translate the rest symbols vertically by amount DY, but only if
   they have no staff-position set.
 */
 void
-Note_column::translate_rests (Grob*me,int dy_i)
+Note_column::translate_rests (Grob*me, int dy)
 {
-  Grob * r = unsmob_grob (me->get_grob_property ("rest"));
-  if (r && !gh_number_p (r->get_grob_property ("staff-position")))
+  Grob * r = unsmob_grob (me->get_property ("rest"));
+  if (r && !gh_number_p (r->get_property ("staff-position")))
     {
-      r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
+      r->translate_axis (dy * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
     }
 }
 
@@ -123,7 +145,7 @@ Note_column::set_dotcol (Grob*me,Grob *d)
 Grob*
 Note_column::first_head (Grob*me) 
 {
-  Grob * st = stem_l (me);
+  Grob * st = get_stem (me);
   return st?  Stem::first_head (st): 0; 
 }
 
@@ -134,12 +156,12 @@ Note_column::first_head (Grob*me)
 Grob* 
 Note_column::accidentals (Grob *me)
 {
-  SCM heads = me->get_grob_property ("note-heads");
+  SCM heads = me->get_property ("note-heads");
   Grob * acc = 0;
   for (;gh_pair_p (heads); heads =gh_cdr (heads))
     {
       Grob * h = unsmob_grob (gh_car (heads));
-      acc = h ? unsmob_grob (h->get_grob_property ("accidental-grob")) : 0;
+      acc = h ? unsmob_grob (h->get_property ("accidental-grob")) : 0;
       if (acc)
 	break;
     }