X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript.cc;h=7a8630dd7c0485de154cc68bcd4cd5f9d4931a33;hb=839133759fa353574cf9323ad9da4b39d5b4eb34;hp=2f471e6ef2344f416b22b5954e2c8091feb17702;hpb=7f0a3b682bebc864fbca295deba301238d805274;p=lilypond.git

diff --git a/lily/script.cc b/lily/script.cc
index 2f471e6ef2..7a8630dd7c 100644
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,103 +1,111 @@
-/*
-  script.cc -- implement Script
-
-  source file of the LilyPond music typesetter
-
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-#include "musical-request.hh"
-#include "paper-def.hh"
+/*   
+  script.cc --  implement Script_interface
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
+#include "warn.hh"
 #include "script.hh"
-#include "stem.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_interface::get_molecule (Grob * me, Direction d)
+{
+  SCM s = me->get_grob_property ("script-molecule");
+  assert (gh_pair_p (s));
+
+  SCM key = ly_car (s);
+  if (key == ly_symbol2scm ("feta"))
+    {
+      return Font_interface::get_default_font (me)->find_by_name ("scripts-" +
+				    ly_scm2string (index_get_cell (ly_cdr (s), d)));
+    }
+  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 ();
+}
 
-void
-Script::set_stem(Stem*st_l)
+MAKE_SCHEME_CALLBACK (Script_interface,before_line_breaking,1);
+SCM
+Script_interface::before_line_breaking (SCM smob)
 {
-    stem_l_ = st_l;
-    add_support(st_l);
-}
+  Grob * me = unsmob_grob (smob);
 
+  Direction d = Side_position_interface::get_direction (me);
 
-Script::Script(Script_req* rq)
-    :Staff_side(this)
-{    
-    specs_l_ = rq->scriptdef_p_;
-    inside_staff_b_ = specs_l_->inside_staff_b_;
-    stem_l_ = 0;
-    pos_i_ = 0;
-    symdir_i_=1;
-    dir_i_ =rq->dir_i_;
+  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::get_stem (par);
+      if (stem && Stem::first_head (stem))
+	{
+	  me->set_parent (Stem::first_head (stem), X_AXIS);
+	}
+    }
+  
+  return SCM_UNSPECIFIED;
 }
 
-void
-Script::set_symdir()
-{
-    if (specs_l_->invertsym_b_)
-	symdir_i_ = (dir_i_ < 0) ? -1:1;
-}
 
-void
-Script::set_default_dir()
+MAKE_SCHEME_CALLBACK (Script_interface,brew_molecule,1);
+
+SCM
+Script_interface::brew_molecule (SCM smob)
 {
-    int s_i=specs_l_->rel_stem_dir_i_;
-    if (s_i && stem_l_)
-	dir_i_ = stem_l_->dir_i_ * s_i;
-    else {
-	dir_i_ =specs_l_->staff_dir_i_;
+  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 ();
 }
 
-void
-Script::set_default_index()
-{
-    pos_i_ = get_position_i();
-}
 
-Interval
-Script::do_width() const
-{
-    return symbol().dim.x;
-}
 
-Symbol
-Script::symbol()const
+struct Text_script
 {
-    String preidx_str = (symdir_i_ < 0) ?"-" :"";
-    return paper()->lookup_l()->script(preidx_str + specs_l_->symidx);
-}
+    static bool has_interface (Grob*);
+};
 
-void
-Script::do_pre_processing()
+struct Skript
 {
-    set_default_dir();
-    set_symdir();
-}
+    static bool has_interface (Grob*);
+};
 
-void
-Script::do_post_processing()
-{
-    set_default_index();
-}
+ADD_INTERFACE (Text_script,"text-script-interface",
+  "Any text script",
+  "script-priority");
 
-Molecule*
-Script::brew_molecule_p() const
-{
-    Real dy = paper()->internote();
-    
-    Molecule*out = new Molecule(Atom(symbol()));
-    out->translate(Offset(0,dy * pos_i_));
-    return out;
-}
-IMPLEMENT_STATIC_NAME(Script);
+ADD_INTERFACE (Script_interface, "script-interface",
+  "",
+  "script-priority script-molecule staff-support");
 
-int 
-Script::compare(Script  *const&l1, Script *const&l2) 
-{
-    return l1->specs_l_->priority_i_ - l2->specs_l_->priority_i_;
-}
-