release: 1.3.68

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 3bc415d077eb48b00ead9b977d60b2091da5a6cb..5ad45f28ca7c23a1c345e19bec6b804696f069e2 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,101 +1,74 @@
 /*   
-     script.cc --  implement Script
+  script.cc --  implement Script
   
   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>
   
  */
 
-/*
-
-  TODO: Quantisation support (staccato dots between stafflines)
-
-*/
 #include "debug.hh"
 #include "script.hh"
 #include "lookup.hh"
-#include "staff-side.hh"
+#include "side-position-interface.hh"
 #include "paper-def.hh"
 #include "dimension-cache.hh"
 
-Script::Script ()
-{
-  staff_side_l_ =0;
-}
-
-void
-Script::do_substitute_element_pointer (Score_element*o, Score_element*n)
+Script ::Script (SCM s)
+  : Item (s)
 {
-  if (o == staff_side_l_)
-    staff_side_l_ = dynamic_cast<Staff_side_item*>(n);
 }
 
-
-
 Molecule
-Script::get_molecule(Direction d) const
+Script::get_molecule(Score_element * me, Direction d)
 {
-  SCM s = get_elt_property (molecule_scm_sym);
-  assert  (s != SCM_BOOL_F);
+  SCM s = me->get_elt_property ("molecule");
+  assert (gh_pair_p (s));
 
-  s = SCM_CDR(s);
-  SCM key = SCM_CAR (s);
-  if (key == ly_symbol ("feta"))
+  SCM key = gh_car  (s);
+  if (key == ly_symbol2scm ("feta"))
     {
-      return lookup_l ()->afm_find ("scripts-" +
-                                   ly_scm2string (index_cell (SCM_CDR (s), d)));
+      return me->lookup_l ()->afm_find ("scripts-" +
+                                   ly_scm2string (index_cell (gh_cdr (s), d)));
     }
-  else if (key == ly_symbol ("accordion"))
+  else if (key == ly_symbol2scm ("accordion"))
     {
-      return lookup_l ()->accordion (SCM_CDR(s), paper_l()->get_realvar(interline_scm_sym));
+      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.
-   */
-  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_;
-  Molecule m (get_molecule(d));
-
-  /*
-    UGH UGH UGH
-   */
-  if (staff_side_l_->get_elt_property (no_staff_support_scm_sym) == SCM_BOOL_F) 
-    translate_axis (- m.dim_[Y_AXIS][Direction (-d)], Y_AXIS);
-}
 
-void
-Script::set_staff_side (Staff_side_item*g)
+GLUE_SCORE_ELEMENT(Script,after_line_breaking);
+SCM
+Script::member_after_line_breaking ()
 {
-  staff_side_l_ = g;
-  add_dependency (g);
-  set_parent (g, Y_AXIS);
+  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)
 {
-  return new Molecule (get_molecule (staff_side_l_->dir_));
+  Score_element *me= unsmob_element (smob);
+  Direction dir = DOWN;
+  SCM d = me->get_elt_property ("direction");
+  if (isdir_b (d))
+    dir = to_dir (d);
+  
+  return get_molecule (me, dir).create_scheme();
 }
 
-void
-Script::do_print () const
-{
 
-}
+