release: 1.3.36

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

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 65317776bbc7e51782b05f665d18a531618e12ee..5498b5b7f60f2db2d717bd5e41293609853932da 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -1,10 +1,10 @@
 /*
   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 "side-position-interface.hh"
 #include "musical-request.hh"
@@ -13,6 +13,25 @@
 #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,7 +54,7 @@ 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++)
     {
@@ -75,8 +94,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
@@ -99,6 +118,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++)
@@ -132,6 +157,8 @@ Script_engraver::do_pre_move_processing()
 {
   for (int i=0; i < script_p_arr_.size(); i++) 
     {
+      if (to_boolean (script_p_arr_[i]->remove_elt_property ("staff-support")))
+       side_position (script_p_arr_[i]).add_staff_support ();
       typeset_element (script_p_arr_[i]);
     }
   script_p_arr_.clear();