Uniformize, internalize.

[lilypond.git] / lily / group-interface.cc

diff --git a/lily/group-interface.cc b/lily/group-interface.cc
index 9bb660cb6cd37341bbed11d253ab931c42d185a9..c498059fa2e344b31acdbd3a7ba4920a430fd4cd 100644 (file)
--- a/lily/group-interface.cc
+++ b/lily/group-interface.cc
@@ -3,53 +3,23 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
-#include "group-interface.hh"
-#include "grob.hh"
-
-
-/*
-  This special add_thing routine is slightly more efficient than
-
-    set_prop (name,cons (thing, get_prop (name)))
 
-  since it can reuse the handle returned by scm_assq().
-*/
+#include "group-interface.hh"
 
 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_);
-    }
+  me->add_to_list_property (sym, thing);
 }
 
-void
-Group_interface::add_thing (Grob*me, String name, SCM thing)
-{
-  add_thing (me, ly_symbol2scm (name.ch_C()), thing);
-}
 
 int
-Group_interface::count (Grob *me, String name)
+Group_interface::count (Grob *me, SCM sym)
 {
-  return scm_ilength (me->get_grob_property (name.ch_C ()));
+  return scm_ilength (me->internal_get_property (sym));
 }