X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=76bde1c3d60f632cae6a3c338f2009fef5504632;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f49b65b986fe97ce49fa00377f770258a80590ff;hpb=889dc430ee110fc9f7b66d9f8768fb746bb2b12a;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index f49b65b986..76bde1c3d6 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-column.hh"
@@ -11,15 +11,18 @@
 #include <cmath>		// ceil
 using namespace std;
 
+#include "accidental-placement.hh"
 #include "axis-group-interface.hh"
-#include "stem.hh"
-#include "warn.hh"
-#include "output-def.hh"
-#include "staff-symbol-referencer.hh"
-#include "rest.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "item.hh"
 #include "note-head.hh"
-#include "accidental-placement.hh"
+#include "output-def.hh"
 #include "pointer-group-interface.hh"
+#include "rest.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
+#include "warn.hh"
 
 /*
   TODO: figure out if we can prune this class. This is just an
@@ -32,15 +35,15 @@ Note_column::has_rests (Grob *me)
   return unsmob_grob (me->get_object ("rest"));
 }
 
-int
-Note_column::shift_compare (Grob *const &p1, Grob *const &p2)
+bool
+Note_column::shift_less (Grob *const &p1, Grob *const &p2)
 {
   SCM s1 = p1->get_property ("horizontal-shift");
   SCM s2 = p2->get_property ("horizontal-shift");
 
   int h1 = (scm_is_number (s1)) ? scm_to_int (s1) : 0;
   int h2 = (scm_is_number (s2)) ? scm_to_int (s2) : 0;
-  return h1 - h2;
+  return h1 < h2;
 }
 
 Item *
@@ -58,7 +61,7 @@ Note_column::head_positions_interval (Grob *me)
   iv.set_empty ();
 
   extract_grob_set (me, "note-heads", heads);
-  for (int i = 0; i < heads.size (); i++)
+  for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *se = heads[i];
 
@@ -73,7 +76,7 @@ Note_column::dir (Grob *me)
 {
   Grob *stem = unsmob_grob (me->get_object ("stem"));
   if (stem && Stem::has_interface (stem))
-    return Stem::get_direction (stem);
+    return get_grob_direction (stem);
   else
     {
       extract_grob_set (me, "note-heads", heads);
@@ -118,7 +121,7 @@ Note_column::add_head (Grob *me, Grob *h)
     }
 
   if (both)
-    me->warning (_ ("can't have note heads and rests together on a stem"));
+    me->warning (_ ("cannot have note heads and rests together on a stem"));
   else
     Axis_group_interface::add_element (me, h);
 }
@@ -139,12 +142,6 @@ Note_column::translate_rests (Grob *me, int dy)
     }
 }
 
-void
-Note_column::set_dotcol (Grob *me, Grob *d)
-{
-  Axis_group_interface::add_element (me, d);
-}
-
 Grob *
 Note_column::first_head (Grob *me)
 {
@@ -160,7 +157,7 @@ Note_column::accidentals (Grob *me)
 {
   extract_grob_set (me, "note-heads", heads);
   Grob *acc = 0;
-  for (int i = 0; i < heads.size (); i++)
+  for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *h = heads[i];
       acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0;
@@ -178,12 +175,50 @@ Note_column::accidentals (Grob *me)
   return acc;
 }
 
+Grob *
+Note_column::dot_column (Grob *me)
+{
+  extract_grob_set (me, "note-heads", heads);
+  for (vsize i = 0; i < heads.size (); i++)
+    {
+      Grob *dots = unsmob_grob (heads[i]->get_object ("dot"));
+      if (dots)
+	return dots->get_parent (X_AXIS);
+    }
+  
+  return 0;
+}
+
 Grob *
 Note_column::arpeggio (Grob *me)
 {
   return unsmob_grob (me->get_object ("arpeggio"));
 }
 
-ADD_INTERFACE (Note_column, "note-column-interface",
-	       "Stem and noteheads combined",
-	       "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
+/* If a note-column contains a cross-staff stem then
+   nc->extent (Y_AXIS, refp) will not consider the extent of the stem.
+   If you want the extent of the stem to be included (and you are safe
+   from any cross-staff issues) then call this function instead. */
+Interval
+Note_column::cross_staff_extent (Grob *me, Grob *refp)
+{
+  Interval iv = me->extent (refp, Y_AXIS);
+  if (Grob *s = get_stem (me))
+    iv.unite (s->extent (refp, Y_AXIS));
+
+  return iv;
+}
+
+ADD_INTERFACE (Note_column,
+	       "Stem and noteheads combined.",
+
+	       /* properties */
+	       "arpeggio "
+	       "force-hshift "
+	       "horizontal-shift "
+	       "ignore-collision "
+	       "note-heads "
+	       "rest "
+	       "rest-collision "
+	       "stem "
+	       );