X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgroup-interface.cc;h=c7991793faece177e63b7fea8fe6161dfd9c5dac;hb=9fe1f948145ed4ae347b2a2cc50b0594c7b15a64;hp=b91d50e9367e28d99598dfff4629041dc866523b;hpb=9bc467a994787949def91708bf3bd50d088db982;p=lilypond.git

diff --git a/lily/group-interface.cc b/lily/group-interface.cc
index b91d50e936..c7991793fa 100644
--- a/lily/group-interface.cc
+++ b/lily/group-interface.cc
@@ -3,51 +3,58 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "group-interface.hh"
-#include "score-element.hh"
+#include "grob.hh"
 
-Group_interface::Group_interface (Score_element* e)
-{
-  elt_l_ = e;
-  name_ = "elements";
-}
 
+/*
+  This special add_thing routine is slightly more efficient than
 
-Group_interface::Group_interface (Score_element *e, String s)
-{
-  elt_l_ =e;
-  name_ = s;
-} 
-bool
-Group_interface::supports_interface_b () 
-{
-  SCM el = elt_l_->get_elt_property (name_);
+    set_prop (name,cons (thing, get_prop (name)))
 
-  return el == SCM_EOL || gh_pair_p (el);
-}
+  since it can reuse the handle returned by scm_assq().
+*/
 
+void
+Group_interface::add_thing (Grob*me, SCM sym, SCM thing)
+{
+
 SCM handle = scm_sloppy_assq (sym, me->mutable_property_alist_);
+  if (handle != SCM_BOOL_F)
+    {
+      gh_set_cdr_x (handle, gh_cons (thing, gh_cdr (handle)));
+      
+    }
+  else
+    {
+      /*
+	There is no mutable prop yet, so create an entry, and put it in front of the
+	mutable prop list.
+      */
+      handle = scm_sloppy_assq (sym, me->immutable_property_alist_);
+      SCM tail = (handle != SCM_BOOL_F) ? gh_cdr(handle) : SCM_EOL;
+      me->mutable_property_alist_ = gh_cons (gh_cons (sym, gh_cons (thing, tail)),
+					     me->mutable_property_alist_);
+    }
+}
 
 void
-Group_interface::add_element (Score_element*p) 
+Group_interface::add_thing (Grob*me, String name, SCM thing)
 {
-  elt_l_->set_elt_property (name_,
-			    gh_cons (p->self_scm_, elt_l_->get_elt_property (name_)));
+  add_thing (me, ly_symbol2scm (name.ch_C()), thing);
 }
 
 int
-Group_interface::count ()
+Group_interface::count (Grob *me, String name)
 {
-  return scm_ilength (elt_l_->get_elt_property ("name"));
+  return scm_ilength (me->get_grob_property (name.ch_C ()));
 }
 
+
 void
-Group_interface::set_interface ()
+Pointer_group_interface::add_grob (Grob*me, SCM name, Grob*p) 
 {
-  if (!supports_interface_b ())
-    {
-      elt_l_->set_elt_property (name_, SCM_EOL);
-    }
+  Group_interface::add_thing (me, name, p->self_scm ());
 }