X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=44ee942f2a71775b14010fa5223d8d14379423b9;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=9cc53480a590a0b09c057661e3b741cfaa6849d6;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 9cc53480a5..44ee942f2a 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,32 +3,34 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 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 "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);
+  SCM key = ly_car (s);
   if (key == ly_symbol2scm ("feta"))
     {
-      return me->lookup_l ()->afm_find ("scripts-" +
-				    ly_scm2string (index_cell (gh_cdr (s), d)));
+      return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
+				    ly_scm2string (index_cell (ly_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 (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
   else
     assert (false);
@@ -36,40 +38,55 @@ Script::get_molecule(Score_element * me, Direction d)
   return Molecule ();
 }
 
-MAKE_SCHEME_CALLBACK(Script,after_line_breaking);
+MAKE_SCHEME_CALLBACK (Script,before_line_breaking,1);
 SCM
-Script::after_line_breaking (SCM smob)
+Script::before_line_breaking (SCM smob)
 {
-  Score_element * me = unsmob_element (smob);
+  Grob * me = unsmob_grob (smob);
+
+  Direction d = Side_position_interface::get_direction (me);
 
-  Direction d = Side_position::get_direction (me);
-  Side_position::set_direction (me,d);
+  if (!d)
+    {
+  /*
+    we should not have `arbitrary' directions. 
+   */
+      programming_error ("Script direction not yet known!");
+      d = DOWN;
+    }
+  
+  Side_position_interface::set_direction (me,d);
 
-  return SCM_UNDEFINED;
+  return SCM_UNSPECIFIED;
 }
 
-MAKE_SCHEME_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);
+
+  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).create_scheme();
+  return get_molecule (me, dir).smobbed_copy ();
 }
 
 bool
-Script::has_interface (Score_element*me)
+Script::has_interface (Grob*me)
 {
   return me->has_interface (ly_symbol2scm ("script-interface"));
 }
 
 void
-Script::set_interface (Score_element*me)
+Script::set_interface (Grob*me)
 {
   return me->set_interface (ly_symbol2scm ("script-interface"));
 }
+