release: 1.3.4

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 71adfd6339ef54403f4fd557e8632e8a85dfac30..ebceea43abc3d8cd95eaaa0e8b1ff7e011b79159 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -36,19 +36,18 @@ Script::do_substitute_element_pointer (Score_element*o, Score_element*n)
 Molecule
 Script::get_molecule(Direction d) const
 {
-  SCM s = get_elt_property (molecule_scm_sym);
-  assert  (s != SCM_BOOL_F);
+  SCM s = get_elt_property ("molecule");
+  assert (s != SCM_UNDEFINED);
 
-  s = SCM_CDR(s);
   SCM key = SCM_CAR (s);
   if (key == ly_symbol ("feta"))
     {
       return lookup_l ()->afm_find ("scripts-" +
-                                   ly_scm2string (index_cell (SCM_CDR (s), d)));
+                                   ly_scm2string (index_cell (gh_cdr (s), d)));
     }
   else if (key == ly_symbol ("accordion"))
     {
-      return lookup_l ()->accordion (SCM_CDR(s), paper_l()->get_realvar(interline_scm_sym));
+      return lookup_l ()->accordion (s, paper_l()->get_var("interline"));
     }
 
   else assert (false);
@@ -63,21 +62,20 @@ Script::do_pre_processing ()
   /*
     center my self on the note head.
    */
-  Graphical_element * e
-    = staff_side_l_->dim_cache_[X_AXIS]->parent_l_->element_l();
+  Graphical_element * e = staff_side_l_->parent_l(X_AXIS);
   translate_axis (e->extent (X_AXIS).center (), X_AXIS);
 }
 
 void
 Script::do_post_processing ()
 {
-  Direction d =  staff_side_l_->dir_;
+  Direction d =  staff_side_l_->get_direction ();
   Molecule m (get_molecule(d));
 
   /*
     UGH UGH UGH
    */
-  if (staff_side_l_->get_elt_property (no_staff_support_scm_sym) == SCM_BOOL_F) 
+  if (staff_side_l_->get_elt_property ("no-staff-support") == SCM_UNDEFINED) 
     translate_axis (- m.dim_[Y_AXIS][Direction (-d)], Y_AXIS);
 }
 
@@ -86,13 +84,13 @@ Script::set_staff_side (Staff_side_item*g)
 {
   staff_side_l_ = g;
   add_dependency (g);
-  dim_cache_[Y_AXIS]->parent_l_ = g->dim_cache_[Y_AXIS];
+  set_parent (g, Y_AXIS);
 }
 
 Molecule*
 Script::do_brew_molecule_p () const
 {
-  return new Molecule (get_molecule (staff_side_l_->dir_));
+  return new Molecule (get_molecule (staff_side_l_->get_direction ()));
 }
 
 void
@@ -100,3 +98,4 @@ Script::do_print () const
 {
 
 }
+