X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=b1c6b9f272204417ddf050f2ebd1a2a036068bb4;hb=e81c133991d5a43a8177b8fe391fa328dca2e6b4;hp=a53c06006943921f0f8b594e73f4025908003468;hpb=44ad1d66c072e4d6545e75c769c86a460cb1df13;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index a53c060069..b1c6b9f272 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-column.hh"
@@ -121,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);
 }
@@ -142,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)
 {
@@ -181,6 +175,20 @@ 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)
 {
@@ -191,7 +199,6 @@ ADD_INTERFACE (Note_column,
 	       "Stem and noteheads combined",
 
 	       /* properties */
-	       "accidentals "
 	       "arpeggio "
 	       "force-hshift "
 	       "horizontal-shift "