X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=d314e976a899ea4428f93752d074afe48890b75f;hb=feb0b96b015c19f2c215326689924acabce0c9a5;hp=72d022130980d65d8d2ccb7b1a4fc676d6472df0;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 72d0221309..d314e976a8 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,33 +3,34 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
+#include "directional-element-interface.hh"
 #include "warn.hh"
 #include "script.hh"
 #include "font-interface.hh"
 #include "side-position-interface.hh"
 #include "paper-def.hh"
 #include "item.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "lookup.hh"
 #include "stem.hh"
 #include "note-column.hh"
 
-Molecule
-Script_interface::get_molecule (Grob * me, Direction d)
+Stencil
+Script_interface::get_stencil (Grob * me, Direction d)
 {
-  SCM s = me->get_grob_property ("script-molecule");
-  assert (gh_pair_p (s));
+  SCM s = me->get_property ("script-stencil");
+  assert (ly_c_pair_p (s));
 
   SCM key = ly_car (s);
   if (key == ly_symbol2scm ("feta"))
     {
       SCM name_entry = ly_cdr (s);
 
-      SCM str = (gh_pair_p (name_entry)) ? index_get_cell (name_entry, d) :  name_entry;
+      SCM str = (ly_c_pair_p (name_entry)) ? index_get_cell (name_entry, d) :  name_entry;
       return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
 								  ly_scm2string (str));
     }
@@ -40,7 +41,7 @@ Script_interface::get_molecule (Grob * me, Direction d)
   else
     assert (false);
 
-  return Molecule ();
+  return Stencil ();
 }
 
 MAKE_SCHEME_CALLBACK (Script_interface,before_line_breaking,1);
@@ -60,7 +61,7 @@ Script_interface::before_line_breaking (SCM smob)
       d = DOWN;
     }
   
-  Side_position_interface::set_direction (me,d);
+  set_grob_direction (me, d);
 
   if (Grob * par = me->get_parent (X_AXIS))
     {
@@ -75,21 +76,21 @@ Script_interface::before_line_breaking (SCM smob)
 }
 
 
-MAKE_SCHEME_CALLBACK (Script_interface,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Script_interface,print,1);
 
 SCM
-Script_interface::brew_molecule (SCM smob)
+Script_interface::print (SCM smob)
 {
   Grob *me= unsmob_grob (smob);
 
   Direction dir = Side_position_interface::get_direction (me);
   if (!dir)
     {
-      programming_error ("Script direction not known, but molecule wanted.");
+      programming_error ("Script direction not known, but stencil wanted.");
       dir= DOWN;
     }
   
-  return get_molecule (me, dir).smobbed_copy ();
+  return get_stencil (me, dir).smobbed_copy ();
 }
 
 
@@ -105,10 +106,10 @@ struct Skript
 };
 
 ADD_INTERFACE (Text_script,"text-script-interface",
-  "Any text script",
+  "An object that is put above or below a note",
   "script-priority");
 
 ADD_INTERFACE (Script_interface, "script-interface",
-  "",
-  "script-priority script-molecule");
+  "An object that is put above or below a note",
+  "script-priority script-stencil");