patch::: 1.3.57.jcn2

[lilypond.git] / lily / script-engraver.cc

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index cde149793f4e4b721691dd8fdd2c677d5a48a462..d53c47648f418e72eb6610a4a8e95b6dfcb91693 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -1,18 +1,37 @@
 /*
   script-engraver.cc -- implement Script_engraver
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "script-engraver.hh"
+
 #include "script.hh"
-#include "staff-side.hh"
+#include "side-position-interface.hh"
 #include "musical-request.hh"
 #include "stem.hh"
 #include "staff-symbol.hh"
 #include "rhythmic-head.hh"
 #include "dimension-cache.hh"
 
+#include "engraver.hh"
+
+class Script_engraver : public Engraver {
+  Link_array<Script> script_p_arr_;
+  Link_array<Articulation_req> script_req_l_arr_;
+
+public:
+  VIRTUAL_COPY_CONS(Translator);
+  
+  Script_engraver();
+protected:
+  virtual bool do_try_music (Music*);
+  virtual void do_process_music ();
+  virtual void do_pre_move_processing ();
+  virtual void do_post_move_processing ();
+  virtual void acknowledge_element (Score_element_info);
+};
+
+
 Script_engraver::Script_engraver()
 {
   do_post_move_processing();
@@ -35,13 +54,15 @@ Script_engraver::do_try_music (Music *r_l)
 }
 
 void
-Script_engraver::do_process_requests()
+Script_engraver::do_process_music()
 {
   for (int i=0; i < script_req_l_arr_.size(); i++)
     {
       Articulation_req* l=script_req_l_arr_[i];
 
-      SCM list = ly_eval_str (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C());
+      SCM list = scm_eval (gh_list (ly_symbol2scm ("articulation-to-scriptdef"),
+                                   ly_str02scm (l->articulation_str_.ch_C()),
+                                   SCM_UNDEFINED));
       
       if (list == SCM_BOOL_F)
        {
@@ -49,21 +70,23 @@ Script_engraver::do_process_requests()
                        l->articulation_str_.ch_C ()));
          continue;
        }
-      Script *p =new Script;
-      Side_position_interface stafy (p); 
+      // todo -> use result of articulation-to-scriptdef directly as basic prop list.
+      Script *p =new Script (get_property ("basicScriptProperties"));
+      Side_position_interface stafy (p);
+      
       
       list = gh_cdr (list);
       p->set_elt_property ("molecule",
-                          SCM_CAR(list));
+                          gh_car (list));
 
-      list = SCM_CDR(list);
-      bool follow_staff = gh_scm2bool (SCM_CAR(list));
-      list = SCM_CDR(list);
-      int relative_stem_dir = gh_scm2int (SCM_CAR(list));
-      list = SCM_CDR(list);
-      int force_dir =gh_scm2int (SCM_CAR(list));
-      list = SCM_CDR(list);
-      SCM priority = SCM_CAR(list);
+      list = gh_cdr(list);
+      bool follow_staff = gh_scm2bool (gh_car (list));
+      list = gh_cdr(list);
+      int relative_stem_dir = gh_scm2int (gh_car (list));
+      list = gh_cdr(list);
+      int force_dir =gh_scm2int (gh_car (list));
+      list = gh_cdr(list);
+      SCM priority = gh_car (list);
 
       
       if (relative_stem_dir)
@@ -74,8 +97,8 @@ Script_engraver::do_process_requests()
       if (l->get_direction ())
        stafy.set_direction (l->get_direction ());
 
-      SCM axisprop = get_property ("scriptHorizontal",0);
-      bool xaxis = gh_boolean_p (axisprop) && gh_scm2bool (axisprop);
+      SCM axisprop = get_property ("scriptHorizontal");
+      bool xaxis = to_boolean (axisprop);
       if (xaxis)
        stafy.set_axis (X_AXIS);
       else
@@ -98,6 +121,12 @@ Script_engraver::do_process_requests()
 void
 Script_engraver::acknowledge_element (Score_element_info inf)
 {
+  bool them_grace = to_boolean (inf.elem_l_->get_elt_property ("grace"));
+  bool us_grace = to_boolean (get_property ("weAreGraceContext"));
+
+  if (us_grace != them_grace)
+    return;
+  
   if (Stem *s = dynamic_cast<Stem*>(inf.elem_l_))
     {
       for (int i=0; i < script_p_arr_.size(); i++)
@@ -131,7 +160,12 @@ Script_engraver::do_pre_move_processing()
 {
   for (int i=0; i < script_p_arr_.size(); i++) 
     {
-      typeset_element (script_p_arr_[i]);
+      Script * sc = script_p_arr_[i];
+      if (to_boolean (sc->remove_elt_property ("staff-support")))
+       {
+         Side_position_interface (sc).add_staff_support ();
+       }
+      typeset_element (sc);
     }
   script_p_arr_.clear();
 }