release: 1.3.68

[lilypond.git] / lily / script.cc

diff --git a/lily/script.cc b/lily/script.cc
index 578a8853208b72cbf353320ee99a73c73f5664e9..5ad45f28ca7c23a1c345e19bec6b804696f069e2 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -1,88 +1,74 @@
-/*
-  script.cc -- implement Script
-
+/*   
+  script.cc --  implement Script
+  
   source file of the GNU LilyPond music typesetter
+  
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
-
-#include "musical-request.hh"
-#include "paper-def.hh"
+#include "debug.hh"
 #include "script.hh"
-#include "stem.hh"
-#include "molecule.hh"
 #include "lookup.hh"
+#include "side-position-interface.hh"
+#include "paper-def.hh"
+#include "dimension-cache.hh"
 
-
-
-void
-Script::set_stem(Stem*st_l)
+Script ::Script (SCM s)
+  : Item (s)
 {
-    stem_l_ = st_l;
-    add_support(st_l);
 }
 
-
-Script::Script(Script_req* rq)
-{    
-    specs_l_ = rq->scriptdef_p_;
-    inside_staff_b_ = specs_l_->inside_b();
-    stem_l_ = 0;
-    pos_i_ = 0;
-    dir_i_ =rq->dir_i_;
-}
-void
-Script::set_default_dir()
+Molecule
+Script::get_molecule(Score_element * me, Direction d)
 {
-    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();
+  SCM s = me->get_elt_property ("molecule");
+  assert (gh_pair_p (s));
+
+  SCM key = gh_car  (s);
+  if (key == ly_symbol2scm ("feta"))
+    {
+      return me->lookup_l ()->afm_find ("scripts-" +
+                                   ly_scm2string (index_cell (gh_cdr (s), d)));
     }
-}
+  else if (key == ly_symbol2scm ("accordion"))
+    {
+      return me->lookup_l ()->accordion (gh_cdr (s), me->paper_l()->get_var("interline"));
+    }
+  else
+    assert (false);
 
-void
-Script::set_default_index()
-{
-    pos_i_ = get_position_i(specs_l_->get_atom(paper(), dir_i_).extent().y);
+  return Molecule ();
 }
 
-Interval
-Script::do_width() const
-{
-    return specs_l_->get_atom(paper(), dir_i_).extent().x;
-}
 
-void
-Script::do_pre_processing()
-{
-    if (!dir_i_)
-       set_default_dir();
 
-}
 
-void
-Script::do_post_processing()
+GLUE_SCORE_ELEMENT(Script,after_line_breaking);
+SCM
+Script::member_after_line_breaking ()
 {
-    set_default_index();
-}
+  Side_position_interface i (this);
+  Direction d =  i.get_direction ();
+  i.set_direction (d);
 
-Molecule*
-Script::brew_molecule_p() const
-{
-    Real dy = paper()->internote_f();
-    
-    Molecule*out = new Molecule(specs_l_->get_atom(paper(), dir_i_));
-    out->translate(Offset(0,dy * pos_i_));
-    return out;
+  return SCM_UNDEFINED;
 }
 
-IMPLEMENT_STATIC_NAME(Script);
 
-int 
-Script::compare(Script  *const&l1, Script *const&l2) 
+MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Script,brew_molecule);
+
+SCM
+Script::brew_molecule (SCM smob)
 {
-    return l1->specs_l_->priority_i() - l2->specs_l_->priority_i();
+  Score_element *me= unsmob_element (smob);
+  Direction dir = DOWN;
+  SCM d = me->get_elt_property ("direction");
+  if (isdir_b (d))
+    dir = to_dir (d);
+  
+  return get_molecule (me, dir).create_scheme();
 }
-    
+
+
+