X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-info.cc;h=ee79e4ec661aebbc5414d4794dc5b8c804385336;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=4ffbcf9c15da408c9c95f406e8b67c490a92781b;hpb=77d72a6b9e7e551dc4a3b365099f9fea339f9c72;p=lilypond.git

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 4ffbcf9c15..ee79e4ec66 100644
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -1,46 +1,66 @@
 /*
-  grob-info.cc -- implement Grob_info
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "context.hh"
 #include "grob-info.hh"
-#include "grob.hh"
+#include "item.hh"
 #include "music.hh"
-#include "translator-group.hh"
-#include "context.hh"
 #include "spanner.hh"
-#include "item.hh"
+#include "stream-event.hh"
+#include "translator-group.hh"
 
 Grob_info::Grob_info (Translator *t, Grob *g)
 {
   origin_trans_ = t;
   grob_ = g;
+  start_end_ = START;
+  rerouting_daddy_context_ = 0;
+
+  /*
+    assert here, because this is easier to debug.
+  */
+  assert (g);
 }
 
 Grob_info::Grob_info ()
 {
   grob_ = 0;
+  start_end_ = START;
   origin_trans_ = 0;
+  rerouting_daddy_context_ = 0;
 }
 
-Music *
-Grob_info::music_cause () const
+Stream_event *
+Grob_info::event_cause () const
 {
   SCM cause = grob_->get_property ("cause");
-  return unsmob_music (cause);
+  return Stream_event::unsmob (cause);
 }
 
-Link_array<Context>
+vector<Context *>
 Grob_info::origin_contexts (Translator *end) const
 {
   Context *t = origin_trans_->context ();
-  Link_array<Context> r;
+  vector<Context *> r;
   do
     {
-      r.push (t);
+      r.push_back (t);
       t = t->get_parent_context ();
     }
   while (t && t != end->context ());
@@ -66,15 +86,19 @@ Grob_info::item () const
   return dynamic_cast<Item *> (grob_);
 }
 
-Music *
-Grob_info::ultimate_music_cause () const
+Stream_event *
+Grob_info::ultimate_event_cause () const
 {
   SCM cause = grob_->self_scm ();
-  while (unsmob_grob (cause))
+  while (Grob::is_smob (cause))
     {
-      cause = unsmob_grob (cause)->get_property ("cause");
+      cause = Grob::unsmob (cause)->get_property ("cause");
     }
-
-  return unsmob_music (cause);
+  return Stream_event::unsmob (cause);
 }
 
+bool
+Grob_info::less (Grob_info i, Grob_info j)
+{
+  return Grob::less (i.grob (), j.grob ());
+}