X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=b3f7e4aab9e350d22b64d3e536b69b50f8cd9f0b;hb=054061bf9f0c00f8c2fa45e608bb20a5eb0c5be8;hp=28a0b13d77e0a0c808054245a0cc7e2e715dbd44;hpb=5bbfc22fce036b9b69df5e420de93e11da23c05e;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 28a0b13d77..b3f7e4aab9 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ using namespace std;
 bool
 Note_column::has_rests (Grob *me)
 {
-  return Grob::unsmob (me->get_object ("rest"));
+  return unsmob<Grob> (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 unsmob<Item> (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 unsmob<Item> (s);
     }
   return 0;
 }
@@ -97,8 +97,8 @@ Note_column::head_positions_interval (Grob *me)
 Direction
 Note_column::dir (Grob *me)
 {
-  Grob *stem = Grob::unsmob (me->get_object ("stem"));
-  if (stem && Stem::has_interface (stem))
+  Grob *stem = unsmob<Grob> (me->get_object ("stem"));
+  if (has_interface<Stem> (stem))
     return get_grob_direction (stem);
   else
     {
@@ -107,7 +107,10 @@ Note_column::dir (Grob *me)
         return (Direction)sign (head_positions_interval (me).center ());
     }
 
-  programming_error ("note column without heads and stem");
+  if (has_interface<Note_column> (me))
+    programming_error ("Note_column without heads and stem");
+  else
+    programming_error ("dir() given grob without Note_column interface");
   return CENTER;
 }
 
@@ -121,14 +124,14 @@ Note_column::set_stem (Grob *me, Grob *stem)
 Grob *
 Note_column::get_rest (Grob *me)
 {
-  return Grob::unsmob (me->get_object ("rest"));
+  return unsmob<Grob> (me->get_object ("rest"));
 }
 
 void
 Note_column::add_head (Grob *me, Grob *h)
 {
   bool both = false;
-  if (Rest::has_interface (h))
+  if (has_interface<Rest> (h))
     {
       extract_grob_set (me, "note-heads", heads);
       if (heads.size ())
@@ -136,9 +139,9 @@ Note_column::add_head (Grob *me, Grob *h)
       else
         me->set_object ("rest", h->self_scm ());
     }
-  else if (Note_head::has_interface (h))
+  else if (has_interface<Note_head> (h))
     {
-      if (Grob::unsmob (me->get_object ("rest")))
+      if (unsmob<Grob> (me->get_object ("rest")))
         both = true;
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"), h);
     }
@@ -158,22 +161,29 @@ Note_column::first_head (Grob *me)
 
 /*
   Return extent of the noteheads in the "main column",
-  i.e. excluding any suspended noteheads.
+  (i.e. excluding any suspended noteheads), or extent
+  of the rest (if there are no heads).
 */
 Interval
-Note_column::calc_main_heads_extent (Grob *me)
+Note_column::calc_main_extent (Grob *me)
 {
-  if (get_stem (me))
-    return first_head (me)->extent (me, X_AXIS);
-  else
-    {
-      // no stems => no suspended noteheads.
-      extract_grob_set (me, "note-heads", heads);
-      if (heads.size())
-        return heads[0]->extent (me, X_AXIS);
-      else
-        return Interval (0, 0);
-    }
+    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
+            : unsmob<Grob> (me->get_object ("rest"));
+
+    return main_item
+            ? main_item->extent (me, X_AXIS)
+            : Interval (0, 0);
 }
 
 /*
@@ -187,7 +197,7 @@ Note_column::accidentals (Grob *me)
   for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *h = heads[i];
-      acc = h ? Grob::unsmob (h->get_object ("accidental-grob")) : 0;
+      acc = h ? unsmob<Grob> (h->get_object ("accidental-grob")) : 0;
       if (acc)
         break;
     }
@@ -195,7 +205,7 @@ Note_column::accidentals (Grob *me)
   if (!acc)
     return 0;
 
-  if (Accidental_placement::has_interface (acc->get_parent (X_AXIS)))
+  if (has_interface<Accidental_placement> (acc->get_parent (X_AXIS)))
     return acc->get_parent (X_AXIS);
 
   /* compatibility. */
@@ -208,7 +218,7 @@ Note_column::dot_column (Grob *me)
   extract_grob_set (me, "note-heads", heads);
   for (vsize i = 0; i < heads.size (); i++)
     {
-      Grob *dots = Grob::unsmob (heads[i]->get_object ("dot"));
+      Grob *dots = unsmob<Grob> (heads[i]->get_object ("dot"));
       if (dots)
         return dots->get_parent (X_AXIS);
     }
@@ -241,4 +251,5 @@ ADD_INTERFACE (Note_column,
                "rest "
                "rest-collision "
                "stem "
+               "glissando-skip "
               );