Merge with master

[lilypond.git] / lily / context-property.cc

diff --git a/lily/context-property.cc b/lily/context-property.cc
index 68f8f5035e3c31380d5cc93150200a5891f07466..d2210b3e104501becfb5c17dd3cf4121f9a51e67 100644 (file)
--- a/lily/context-property.cc
+++ b/lily/context-property.cc
@@ -4,17 +4,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
 #include "engraver.hh"
+#include "international.hh"
 #include "item.hh"
 #include "main.hh"
+#include "simple-closure.hh"
 #include "spanner.hh"
 #include "warn.hh"
-#include "paper-column.hh"
-#include "simple-closure.hh"
 
 SCM
 lookup_nested_property (SCM alist,
@@ -117,7 +117,7 @@ execute_general_pushpop_property (Context *context,
        {
          SCM base = updated_grob_properties (context, context_property);
          current_context_val = scm_cons (base, base);
-         context->internal_set_property (context_property, current_context_val);
+         context->set_property (context_property, current_context_val);
        }
 
       if (!scm_is_pair (current_context_val))
@@ -179,7 +179,7 @@ execute_general_pushpop_property (Context *context,
       if (new_alist == daddy)
        context->unset_property (context_property);
       else
-       context->internal_set_property (context_property, scm_cons (new_alist, daddy));
+       context->set_property (context_property, scm_cons (new_alist, daddy));
     }
 }
 
@@ -223,7 +223,7 @@ apply_property_operations (Context *tg, SCM pre_init_ops)
          execute_general_pushpop_property (tg, context_prop, grob_prop_path, val);
        }
       else if (type == ly_symbol2scm ("assign"))
-       tg->internal_set_property (scm_car (entry), scm_cadr (entry));
+       tg->set_property (scm_car (entry), scm_cadr (entry));
     }
 }
 
@@ -273,51 +273,3 @@ updated_grob_properties (Context *tg, SCM sym)
       return copy;
     }
 }
-
-Grob *
-make_grob_from_properties (Engraver *tr, SCM symbol, SCM cause, char const *name)
-{
-  Context *context = tr->context ();
-
-  SCM props = updated_grob_properties (context, symbol);
-
-  Object_key const *key = context->get_grob_key (name);
-  Grob *grob = 0;
-
-  SCM handle = scm_sloppy_assq (ly_symbol2scm ("meta"), props);
-  SCM klass = scm_cdr (scm_sloppy_assq (ly_symbol2scm ("class"), scm_cdr (handle)));
-
-  if (klass == ly_symbol2scm ("Item"))
-    grob = new Item (props, key);
-  else if (klass == ly_symbol2scm ("Spanner"))
-    grob = new Spanner (props, key);
-  else if (klass == ly_symbol2scm ("Paper_column"))
-    grob = new Paper_column (props, key);
-
-  assert (grob);
-  dynamic_cast<Engraver *> (tr)->announce_grob (grob, cause);
-
-  return grob;
-}
-
-Item *
-make_item_from_properties (Engraver *tr, SCM x, SCM cause, char const *name)
-{
-  Item *it = dynamic_cast<Item *> (make_grob_from_properties (tr, x, cause, name));
-  assert (it);
-  return it;
-}
-
-Paper_column *
-make_paper_column_from_properties (Engraver *tr, SCM x, char const *name)
-{
-  return dynamic_cast<Paper_column *> (make_grob_from_properties (tr, x, SCM_EOL, name));
-}
-
-Spanner *
-make_spanner_from_properties (Engraver *tr, SCM x, SCM cause, char const *name)
-{
-  Spanner *sp = dynamic_cast<Spanner *> (make_grob_from_properties (tr, x, cause, name));
-  assert (sp);
-  return sp;
-}