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

diff --git a/lily/script.cc b/lily/script.cc
index 5ad45f28ca..78fbff9db1 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,37 +3,34 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "debug.hh"
 #include "script.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 #include "side-position-interface.hh"
 #include "paper-def.hh"
-#include "dimension-cache.hh"
-
-Script ::Script (SCM s)
-  : Item (s)
-{
-}
+#include "item.hh"
+#include "molecule.hh"
+#include "lookup.hh"
 
 Molecule
-Script::get_molecule(Score_element * me, Direction d)
+Script::get_molecule(Grob * me, Direction d)
 {
-  SCM s = me->get_elt_property ("molecule");
+  SCM s = me->get_grob_property ("molecule");
   assert (gh_pair_p (s));
 
   SCM key = gh_car  (s);
   if (key == ly_symbol2scm ("feta"))
     {
-      return me->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 me->lookup_l ()->accordion (gh_cdr (s), me->paper_l()->get_var("interline"));
+      return Lookup::accordion (gh_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
   else
     assert (false);
@@ -41,34 +38,48 @@ Script::get_molecule(Score_element * me, Direction d)
   return Molecule ();
 }
 
-
-
-
-GLUE_SCORE_ELEMENT(Script,after_line_breaking);
+MAKE_SCHEME_CALLBACK(Script,after_line_breaking,1);
 SCM
-Script::member_after_line_breaking ()
+Script::after_line_breaking (SCM smob)
 {
-  Side_position_interface i (this);
-  Direction d =  i.get_direction ();
-  i.set_direction (d);
+  Grob * me = unsmob_grob (smob);
 
-  return SCM_UNDEFINED;
-}
+  Direction d = Side_position_interface::get_direction (me);
+  Side_position_interface::set_direction (me,d);
 
+  return SCM_UNSPECIFIED;
+}
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Script,brew_molecule);
+MAKE_SCHEME_CALLBACK(Script,brew_molecule,1);
 
 SCM
 Script::brew_molecule (SCM smob)
 {
-  Score_element *me= unsmob_element (smob);
-  Direction dir = DOWN;
-  SCM d = me->get_elt_property ("direction");
-  if (isdir_b (d))
-    dir = to_dir (d);
+  Grob *me= unsmob_grob (smob);
+#if 0
   
-  return get_molecule (me, dir).create_scheme();
+   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();
 }
 
+bool
+Script::has_interface (Grob*me)
+{
+  return me->has_interface (ly_symbol2scm ("script-interface"));
+}
 
-
+void
+Script::set_interface (Grob*me)
+{
+  return me->set_interface (ly_symbol2scm ("script-interface"));
+}