Run grand replace for 2015.

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 743f14ad79a2e9b0ef0c6ecdc364240419a1d1dd..7648f6d9a09825109e54f879442e3b3d1c2f2fca 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.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
@@ -73,10 +73,10 @@ Rest_collision::add_column (Grob *me, Grob *p)
   if (rest)
     {
       chain_offset_callback (rest,
-                             ly_make_unpure_pure_container
-                               (Rest_collision::force_shift_callback_rest_proc,
-                                ly_lily_module_constant ("pure-chain-offset-callback")),
-                              Y_AXIS);
+                             Unpure_pure_container::make_smob
+                             (Rest_collision::force_shift_callback_rest_proc,
+                              ly_lily_module_constant ("pure-chain-offset-callback")),
+                             Y_AXIS);
     }
 }
 
@@ -108,10 +108,13 @@ Rest_collision::calc_positioning_done (SCM smob)
   for (vsize i = 0; i < elts.size (); i++)
     {
       Grob *e = elts[i];
-      if (Grob::unsmob (e->get_object ("rest")))
-        rests.push_back (e);
-      else
-        notes.push_back (e);
+      if (Note_column::has_interface (e))
+        {
+          if (Grob::unsmob (e->get_object ("rest")))
+            rests.push_back (e);
+          else
+            notes.push_back (e);
+        }
     }
 
   /*