X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=78fbff9db13ce8678631b6ea453822a993b1b0bf;hb=9f34e35c3cb97d2a1f0c7838590a574095fbee2e;hp=71adfd6339ef54403f4fd557e8632e8a85dfac30;hpb=61c4b07cddc6231c3ca4b45a0aa86d27e25110b9;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 71adfd6339..78fbff9db1 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,102 +1,85 @@
 /*   
-     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--2001 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 "font-interface.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)
-{
-  if (o == staff_side_l_)
-    staff_side_l_ = dynamic_cast<Staff_side_item*>(n);
-}
-
-
+#include "item.hh"
+#include "molecule.hh"
+#include "lookup.hh"
 
 Molecule
-Script::get_molecule(Direction d) const
+Script::get_molecule(Grob * me, Direction d)
 {
-  SCM s = get_elt_property (molecule_scm_sym);
-  assert  (s != SCM_BOOL_F);
+  SCM s = me->get_grob_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 Font_interface::get_default_font (me)->find_by_name ("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 Lookup::accordion (gh_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
-
-  else assert (false);
+  else
+    assert (false);
 
   return Molecule ();
 }
 
-
-void
-Script::do_pre_processing ()
+MAKE_SCHEME_CALLBACK(Script,after_line_breaking,1);
+SCM
+Script::after_line_breaking (SCM smob)
 {
-  /*
-    center my self on the note head.
-   */
-  Graphical_element * e
-    = staff_side_l_->dim_cache_[X_AXIS]->parent_l_->element_l();
-  translate_axis (e->extent (X_AXIS).center (), X_AXIS);
-}
+  Grob * me = unsmob_grob (smob);
 
-void
-Script::do_post_processing ()
-{
-  Direction d =  staff_side_l_->dir_;
-  Molecule m (get_molecule(d));
+  Direction d = Side_position_interface::get_direction (me);
+  Side_position_interface::set_direction (me,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);
+  return SCM_UNSPECIFIED;
 }
 
-void
-Script::set_staff_side (Staff_side_item*g)
+MAKE_SCHEME_CALLBACK(Script,brew_molecule,1);
+
+SCM
+Script::brew_molecule (SCM smob)
 {
-  staff_side_l_ = g;
-  add_dependency (g);
-  dim_cache_[Y_AXIS]->parent_l_ = g->dim_cache_[Y_AXIS];
+  Grob *me= unsmob_grob (smob);
+#if 0
+  
+   SCM d = me->get_grob_property ("direction");
+   if (isdir_b (d))
+     dir = to_dir (d);
+#endif
+  Direction dir = Side_position_interface::get_direction(me);
+  if (!dir)
+    {
+      programming_error ("Script direction not known, but molecule wanted.");
+      dir= DOWN;
+    }
+  
+  return get_molecule (me, dir).smobbed_copy();
 }
 
-Molecule*
-Script::do_brew_molecule_p () const
+bool
+Script::has_interface (Grob*me)
 {
-  return new Molecule (get_molecule (staff_side_l_->dir_));
+  return me->has_interface (ly_symbol2scm ("script-interface"));
 }
 
 void
-Script::do_print () const
+Script::set_interface (Grob*me)
 {
-
+  return me->set_interface (ly_symbol2scm ("script-interface"));
 }