X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=91a7690697e338a8fe054808d2aabc9c4401b19d;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c5d06cfb6831a6bd678c27289132a0120129c349;hpb=9066eeede909ace56324c905217c5b585ba42f90;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index c5d06cfb68..91a7690697 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 Grob::is_smob (me->get_object ("rest"));
 }
 
 bool
@@ -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 (me))
+    programming_error ("Note_column without heads and stem");
+  else
+    programming_error ("dir() given grob without Note_column interface");
   return CENTER;
 }
 
@@ -138,7 +141,7 @@ Note_column::add_head (Grob *me, Grob *h)
     }
   else if (Note_head::has_interface (h))
     {
-      if (Grob::unsmob (me->get_object ("rest")))
+      if (Grob::is_smob (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
+            : Grob::unsmob (me->get_object ("rest"));
+
+    return main_item
+            ? main_item->extent (me, X_AXIS)
+            : Interval (0, 0);
 }
 
 /*