($(outdir)/%.pdf): add DVIPS_FLAGS. This will

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 8ff25c098841ea1ac9bbb368bcfed23cf5a3acf9..619f4e420baaea8ee5218b7783a89665b1cbfa6d 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -3,41 +3,45 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 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");
+  SCM s = me->get_grob_property ("script-stencil");
   assert (gh_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;
       return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
-                                   ly_scm2string (index_cell (ly_cdr (s), d)));
+                                                                 ly_scm2string (str));
     }
-  else if (key == ly_symbol2scm ("accordion"))
+ else if (key == ly_symbol2scm ("accordion"))
     {
       return Lookup::accordion (ly_cdr (s), 1.0, Font_interface::get_default_font (me));
     }
   else
     assert (false);
 
-  return Molecule ();
+  return Stencil ();
 }
 
 MAKE_SCHEME_CALLBACK (Script_interface,before_line_breaking,1);
@@ -57,11 +61,11 @@ 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))
     {
-      Grob * stem = Note_column::stem_l (par);
+      Grob * stem = Note_column::get_stem (par);
       if (stem && Stem::first_head (stem))
        {
          me->set_parent (Stem::first_head (stem), X_AXIS);
@@ -72,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 ();
 }
 
 
@@ -107,5 +111,5 @@ ADD_INTERFACE (Text_script,"text-script-interface",
 
 ADD_INTERFACE (Script_interface, "script-interface",
   "",
-  "script-priority script-molecule staff-support");
+  "script-priority script-stencil");