X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=7483b07a79318cdf30cac54eb54d4cdc9a52c0ff;hb=286fcad779ede8a2d08ce42842f7ae0ae1df74cb;hp=10f9627184312dfb374d73c7a45deae8695b4d30;hpb=e0833e924a7b626154c66170d98335c6c4985dfe;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 10f9627184..7483b07a79 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,34 +1,38 @@
 /*   
-  script.cc --  implement Script
+  script.cc --  implement Script_interface
   
   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"
+#include "stem.hh"
+#include "note-column.hh"
 
 Molecule
-Script::get_molecule(Score_element * me, Direction d)
+Script_interface::get_molecule (Grob * me, Direction d)
 {
-  SCM s = me->get_elt_property ("molecule");
+  SCM s = me->get_grob_property ("script-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("staffspace"));
+      return Lookup::accordion (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
   else
     assert (false);
@@ -36,40 +40,72 @@ Script::get_molecule(Score_element * me, Direction d)
   return Molecule ();
 }
 
-MAKE_SCHEME_CALLBACK(Script,after_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Script_interface,before_line_breaking,1);
 SCM
-Script::after_line_breaking (SCM smob)
+Script_interface::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);
 
+  if (Grob * par = me->get_parent (X_AXIS))
+    {
+      Grob * stem = Note_column::stem_l (par);
+      if (stem && Stem::first_head (stem))
+	{
+	  me->set_parent (Stem::first_head (stem), X_AXIS);
+	}
+    }
+  
   return SCM_UNSPECIFIED;
 }
 
-MAKE_SCHEME_CALLBACK(Script,brew_molecule,1);
+
+MAKE_SCHEME_CALLBACK (Script_interface,brew_molecule,1);
 
 SCM
-Script::brew_molecule (SCM smob)
+Script_interface::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);
-  Direction dir = Side_position::get_direction(me);
-  return get_molecule (me, dir).create_scheme();
+  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).smobbed_copy ();
 }
 
-bool
-Script::has_interface (Score_element*me)
+
+
+struct Text_script
 {
-  return me->has_interface (ly_symbol2scm ("script-interface"));
-}
+    static bool has_interface (Grob*);
+};
 
-void
-Script::set_interface (Score_element*me)
+struct Skript
 {
-  return me->set_interface (ly_symbol2scm ("script-interface"));
-}
+    static bool has_interface (Grob*);
+};
+
+ADD_INTERFACE (Text_script,"text-script-interface",
+  "Any text script",
+  "script-priority");
+
+ADD_INTERFACE (Script_interface, "script-interface",
+  "",
+  "script-priority script-molecule staff-support");
+