release: 1.3.101

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index a0636017532ea5dd9ebf9b56f0ba65e7f1506e90..9670115c55ebf922c7a903825fe73d6d310edd4d 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,84 +1,77 @@
 /*   
-     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 "font-interface.hh"
+#include "side-position-interface.hh"
 #include "paper-def.hh"
-#include "dimension-cache.hh"
-
+#include "item.hh"
+#include "molecule.hh"
+#include "lookup.hh"
 
 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 Font_interface::get_default_font (me)->find_by_name ("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 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 = parent_l(X_AXIS);
-  translate_axis (e->extent (X_AXIS).center (), X_AXIS);
-}
+  Score_element * me = unsmob_element (smob);
 
-void
-Script::do_post_processing ()
-{
-  Direction d =  Side_position_interface (this).get_direction ();
-  Molecule m (get_molecule(d));
+  Direction d = Side_position::get_direction (me);
+  Side_position::set_direction (me,d);
 
-  /*
-    UGH UGH UGH
-   */
-#if 0
-  if (staff_side_l_->get_elt_property ("no-staff-support") == SCM_UNDEFINED) 
-    translate_axis (- m.dim_[Y_AXIS][Direction (-d)], Y_AXIS);
-#endif
+  return SCM_UNSPECIFIED;
 }
 
+MAKE_SCHEME_CALLBACK(Script,brew_molecule,1);
 
-Molecule*
-Script::do_brew_molecule_p () const
+SCM
+Script::brew_molecule (SCM smob)
 {
-  Direction dir = DOWN;
-  SCM d = get_elt_property ("direction");
-  if (isdir_b (d))
-    dir = to_dir (d);
-  
-  return new Molecule (get_molecule (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);
+  Direction dir = Side_position::get_direction(me);
+  return get_molecule (me, dir).create_scheme();
 }
 
+bool
+Script::has_interface (Score_element*me)
+{
+  return me->has_interface (ly_symbol2scm ("script-interface"));
+}
 
-
+void
+Script::set_interface (Score_element*me)
+{
+  return me->set_interface (ly_symbol2scm ("script-interface"));
+}