Initialize main_head to 0 (in Note_column::calc_main_extent)

[lilypond.git] / lily / note-column.cc

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 867542bdbd39fe497b6da103e66572e5840ddf4c..73b138757189d839ea510d86ef8d0a88ac116804 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -43,7 +43,7 @@ using namespace std;
 bool
 Note_column::has_rests (Grob *me)
 {
-  return unsmob_grob (me->get_object ("rest"));
+  return Grob::unsmob (me->get_object ("rest"));
 }
 
 bool
@@ -61,7 +61,7 @@ Item *
 Note_column::get_stem (Grob *me)
 {
   SCM s = me->get_object ("stem");
-  return unsmob_item (s);
+  return Item::unsmob (s);
 }
 
 Item *
@@ -71,7 +71,7 @@ Note_column::get_flag (Grob *me)
   if (stem)
     {
       SCM s = stem->get_object ("flag");
-      return unsmob_item (s);
+      return Item::unsmob (s);
     }
   return 0;
 }
@@ -97,7 +97,7 @@ Note_column::head_positions_interval (Grob *me)
 Direction
 Note_column::dir (Grob *me)
 {
-  Grob *stem = unsmob_grob (me->get_object ("stem"));
+  Grob *stem = Grob::unsmob (me->get_object ("stem"));
   if (stem && Stem::has_interface (stem))
     return get_grob_direction (stem);
   else
@@ -121,7 +121,7 @@ Note_column::set_stem (Grob *me, Grob *stem)
 Grob *
 Note_column::get_rest (Grob *me)
 {
-  return unsmob_grob (me->get_object ("rest"));
+  return Grob::unsmob (me->get_object ("rest"));
 }
 
 void
@@ -138,7 +138,7 @@ Note_column::add_head (Grob *me, Grob *h)
     }
   else if (Note_head::has_interface (h))
     {
-      if (unsmob_grob (me->get_object ("rest")))
+      if (Grob::unsmob (me->get_object ("rest")))
         both = true;
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h);
     }
@@ -156,6 +156,33 @@ Note_column::first_head (Grob *me)
   return st ? Stem::first_head (st) : 0;
 }
 
+/*
+  Return extent of the noteheads in the "main column",
+  (i.e. excluding any suspended noteheads), or extent
+  of the rest (if there are no heads).
+*/
+Interval
+Note_column::calc_main_extent (Grob *me)
+{
+    Grob *main_head = 0;
+    if (get_stem (me))
+        main_head = first_head (me);
+    else
+      {
+        // no stems => no suspended noteheads.
+        extract_grob_set (me, "note-heads", heads);
+        if (heads.size())
+        main_head = heads[0];
+      }
+    Grob *main_item = main_head
+            ? main_head
+            : Grob::unsmob (me->get_object ("rest"));
+
+    return main_item
+            ? main_item->extent (me, X_AXIS)
+            : Interval (0, 0);
+}
+
 /*
   Return the first AccidentalPlacement grob that we find in a note-head.
 */
@@ -167,7 +194,7 @@ Note_column::accidentals (Grob *me)
   for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *h = heads[i];
-      acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0;
+      acc = h ? Grob::unsmob (h->get_object ("accidental-grob")) : 0;
       if (acc)
         break;
     }
@@ -188,7 +215,7 @@ 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"));
+      Grob *dots = Grob::unsmob (heads[i]->get_object ("dot"));
       if (dots)
         return dots->get_parent (X_AXIS);
     }