X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftweak-registration.cc;h=9604c5f202bde81dd60e7e7a6a7917e3f4d301fa;hb=f07f18bef861d6afa48b941b7579079d5d40df80;hp=ae8482941a66186014418eb589f092f8215edcbf;hpb=a8aed07c25a2b875b3e6dde590258d04735df868;p=lilypond.git

diff --git a/lily/tweak-registration.cc b/lily/tweak-registration.cc
index ae8482941a..9604c5f202 100644
--- a/lily/tweak-registration.cc
+++ b/lily/tweak-registration.cc
@@ -1,67 +1,80 @@
 /*
-  tweak-registration.cc --  implement Tweak_registry
+  tweak-registration.cc -- implement Tweak_registry
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "tweak-registration.hh"
 
 #include "object-key-undumper.hh"
-#include "tweak-registration.hh"
-#include "object-key.hh"
 #include "grob.hh"
 
 #include "ly-smobs.icc"
 
+Tweak_registry::Tweak_registry ()
+{
+  undumper_ = 0;
+  smobify_self ();
+  undumper_ = new Object_key_undumper ();
+  scm_gc_unprotect_object (undumper_->self_scm ());
+}
+
+Tweak_registry::~Tweak_registry ()
+{
+}
 
 void
 Tweak_registry::clear ()
 {
   tweaks_.clear ();
-  undumper_ = new Object_key_undumper();
+  undumper_ = new Object_key_undumper ();
   scm_gc_unprotect_object (undumper_->self_scm ());
 }
 
 void
-Tweak_registry::insert_tweak (SCM tweak)
+Tweak_registry::insert_tweak_from_file (SCM tweak)
 {
   SCM skey = scm_car (tweak);
 
-  assert(scm_is_pair (skey) &&
-	 scm_car (skey) == ly_symbol2scm ("key"));
+  assert (scm_is_pair (skey)
+	  && scm_car (skey) == ly_symbol2scm ("key"));
 
-  Object_key const * key =  undumper_->get_key (scm_to_int (scm_cadr (skey)));
-  if (tweaks_.find (key) == tweaks_.end())
-    {
-      tweaks_[key] = SCM_EOL;
-    }
+  Object_key const *key = undumper_->get_key (scm_to_int (scm_cadr (skey)));
 
-  tweaks_[key] = scm_cons (scm_cdr (tweak), tweaks_[key]);
+  SCM existing = SCM_EOL;
+  Tweak_map::const_iterator prev = tweaks_.find (key);
+  if (prev != tweaks_.end ())
+    existing = (*prev).second;
+
+  tweaks_[key] = scm_cons (scm_cdr (tweak), existing);
 }
 
-SCM
-Tweak_registry::get_tweaks (Grob *g) 
+void
+Tweak_registry::insert_grob_tweak (Grob *g, SCM tweak)
 {
-  Object_key const *key = g->get_key();
-  if (tweaks_.find (key) == tweaks_.end())
-    {
-      return SCM_EOL;
-    }
-  return tweaks_[key];
+  Object_key const *key = g->get_key ();
+  if (tweaks_.find (key) == tweaks_.end ())
+    tweaks_[key] = SCM_EOL;
+
+  tweaks_[key] = scm_cons (tweak, tweaks_[key]);
 }
 
-Tweak_registry::Tweak_registry ()
+void
+Tweak_registry::replace_grob_tweak (Grob *g, SCM tweak)
 {
-  undumper_ = 0;
-  smobify_self();
-  undumper_ = new Object_key_undumper();
-  scm_gc_unprotect_object (undumper_->self_scm ());
+  Object_key const *key = g->get_key ();
+  tweaks_[key] = scm_cons (tweak, SCM_EOL);
 }
 
-Tweak_registry::~Tweak_registry ()
+SCM
+Tweak_registry::get_tweaks (Grob *g)
 {
+  Object_key const *key = g->get_key ();
+  if (tweaks_.find (key) == tweaks_.end ())
+    return SCM_EOL;
+  return tweaks_[key];
 }
 
 SCM
@@ -69,14 +82,12 @@ Tweak_registry::list_tweaks ()
 {
   SCM retval = SCM_EOL;
   for (Tweak_map::const_iterator i (tweaks_.begin ());
-       i != tweaks_.end();
+       i != tweaks_.end ();
        i++)
     {
-      const Object_key *  key = (*i).first;
+      Object_key const *key = (*i).first;
       for (SCM t = (*i).second; scm_is_pair (t); t = scm_cdr (t))
-	{
-	  retval = scm_cons (key->self_scm(), scm_car (t));
-	}
+	retval = scm_cons (scm_cons (key->self_scm (), scm_car (t)), retval);
     }
 
   return retval;
@@ -85,74 +96,43 @@ Tweak_registry::list_tweaks ()
 SCM
 Tweak_registry::mark_smob (SCM smob)
 {
-  Tweak_registry *me = (Tweak_registry*) SCM_CELL_WORD_1(smob);
+  Tweak_registry *me = (Tweak_registry *) SCM_CELL_WORD_1 (smob);
 
   for (Tweak_map::const_iterator i (me->tweaks_.begin ());
-       i != me->tweaks_.end();
+       i != me->tweaks_.end ();
        i++)
     {
-      scm_gc_mark ((*i).first->self_scm());
+      scm_gc_mark ((*i).first->self_scm ());
       scm_gc_mark ((*i).second);
     }
 
-  return me->undumper_ ? me->undumper_->self_scm() : SCM_EOL;
-}
+  if (me->undumper_)
+    scm_gc_mark (me->undumper_->self_scm ());
 
+  return SCM_EOL;
+}
 
 int
 Tweak_registry::print_smob (SCM smob, SCM port, scm_print_state*)
 {
-  scm_puts ("#<Tweak_registry>", port); 
+  (void) smob;			// smother warning.
+  scm_puts ("#<Tweak_registry>", port);
   return 1;
 }
 
-Object_key_undumper*
+Object_key_undumper *
 Tweak_registry::undumper () const
 {
   return undumper_;
 }
 
-IMPLEMENT_DEFAULT_EQUAL_P(Tweak_registry);
-IMPLEMENT_SMOBS(Tweak_registry);
-
+IMPLEMENT_DEFAULT_EQUAL_P (Tweak_registry);
+IMPLEMENT_SMOBS (Tweak_registry);
 
-Tweak_registry  * global_registry_;
+Tweak_registry *global_registry_;
 
 void
-init_global_tweak_registry()
-{
-  global_registry_ = new Tweak_registry();
-}
-
-ADD_SCM_INIT_FUNC(init_global_tweak_registry,init_global_tweak_registry);
-
-LY_DEFINE(ly_clear_tweak_registry, "ly:clear-tweak-registry",
-	  0,0,0,(),
-	  "Clear global tweak registry"
-	  )
-{
-  global_registry_->clear ();
-  return SCM_UNSPECIFIED;
-}
-
-
-LY_DEFINE(ly_tweak_read_keys, "ly:tweak-read-keys",
-	  1,0,0,(SCM keys),
-	  "Read keys"
-	  )
+init_global_tweak_registry ()
 {
-  global_registry_->undumper ()->parse_contents (keys); 
-  return SCM_UNSPECIFIED;
-}
-
-LY_DEFINE(ly_tweak_read_tweaks, "ly:tweak-read-tweaks",
-	  1,0,0,(SCM tweaks),
-	  "Read  tweaks"
-	  )
-{
-  for (SCM s = tweaks; scm_is_pair (s); s = scm_cdr (s))
-    {
-      global_registry_->insert_tweak (scm_car (s));
-    }
-  return SCM_UNSPECIFIED;
+  global_registry_ = new Tweak_registry ();
 }