release: 1.3.68

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index cc5db9d7482c1952807dd8cdf10ae2ff7eb4f5c3..5ad45f28ca7c23a1c345e19bec6b804696f069e2 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,56 +14,60 @@
 #include "paper-def.hh"
 #include "dimension-cache.hh"
 
+Script ::Script (SCM s)
+  : Item (s)
+{
+}
 
 Molecule
-Script::get_molecule(Direction d) const
+Script::get_molecule(Score_element * me, Direction d)
 {
-  SCM s = get_elt_property ("molecule");
-  assert (s != SCM_UNDEFINED);
+  SCM s = me->get_elt_property ("molecule");
+  assert (gh_pair_p (s));
 
-  SCM key = SCM_CAR (s);
+  SCM key = gh_car  (s);
   if (key == ly_symbol2scm ("feta"))
     {
-      return lookup_l ()->afm_find ("scripts-" +
+      return me->lookup_l ()->afm_find ("scripts-" +
                                    ly_scm2string (index_cell (gh_cdr (s), d)));
     }
   else if (key == ly_symbol2scm ("accordion"))
     {
-      return lookup_l ()->accordion (s, paper_l()->get_var("interline"));
+      return me->lookup_l ()->accordion (gh_cdr (s), me->paper_l()->get_var("interline"));
     }
-
-  else assert (false);
+  else
+    assert (false);
 
   return Molecule ();
 }
 
 
-void
-Script::do_pre_processing ()
-{
-  /*
-    center my self on the note head.
-   */
-  Score_element * e = parent_l(X_AXIS);
-  translate_axis (e->extent (X_AXIS).center (), X_AXIS);
-}
 
-void
-Script::do_post_processing ()
+
+GLUE_SCORE_ELEMENT(Script,after_line_breaking);
+SCM
+Script::member_after_line_breaking ()
 {
-  Direction d =  Side_position_interface (this).get_direction ();
-  Molecule m (get_molecule(d));
+  Side_position_interface i (this);
+  Direction d =  i.get_direction ();
+  i.set_direction (d);
+
+  return SCM_UNDEFINED;
 }
 
-Molecule*
-Script::do_brew_molecule_p () const
+
+MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Script,brew_molecule);
+
+SCM
+Script::brew_molecule (SCM smob)
 {
+  Score_element *me= unsmob_element (smob);
   Direction dir = DOWN;
-  SCM d = get_elt_property ("direction");
+  SCM d = me->get_elt_property ("direction");
   if (isdir_b (d))
     dir = to_dir (d);
   
-  return new Molecule (get_molecule (dir));
+  return get_molecule (me, dir).create_scheme();
 }