release: 1.3.13

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

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 9c5749b8921ad8599432d825b27d22fdecaaf3c5..65317776bbc7e51782b05f665d18a531618e12ee 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -6,7 +6,7 @@
 
 #include "script-engraver.hh"
 #include "script.hh"
-#include "stem-staff-side.hh"
+#include "side-position-interface.hh"
 #include "musical-request.hh"
 #include "stem.hh"
 #include "staff-symbol.hh"
@@ -41,7 +41,7 @@ Script_engraver::do_process_requests()
     {
       Articulation_req* l=script_req_l_arr_[i];
 
-      SCM list = ly_ch_C_eval_scm (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C());
+      SCM list = ly_eval_str (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C());
       
       if (list == SCM_BOOL_F)
        {
@@ -50,56 +50,49 @@ Script_engraver::do_process_requests()
          continue;
        }
       Script *p =new Script;
-      Stem_staff_side_item * ss =new Stem_staff_side_item;
-      list = SCM_CDR (list);
-         
-      p->set_elt_property (molecule_scm_sym,
-                          SCM_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);
+      Side_position_interface stafy (p);
+      
+      
+      list = gh_cdr (list);
+      p->set_elt_property ("molecule",
+                          gh_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)
-         ss->relative_dir_ = (Direction)relative_stem_dir;
+         p->set_elt_property ("side-relative-direction", gh_int2scm (relative_stem_dir));
       else
-         ss->dir_ = (Direction)force_dir;
-
-      Scalar dir_prop (get_property ("articulationScriptVerticalDirection", 0));
-      if (dir_prop.isnum_b () && (int) dir_prop != CENTER)
-       ss->dir_ = (Direction)(int)dir_prop;
-
-      if (l->dir_)
-       ss->dir_ = l->dir_;
-
-      Real padding = 0.0;
-      Scalar paddingprop = get_property ("articulationScriptPadding", 0);
-      if (paddingprop.length_i() && paddingprop.isnum_b ())
-       {
-         padding = (Real)paddingprop;
-       }
+         stafy.set_direction ((Direction)force_dir);
 
-      Scalar axisprop = get_property ("scriptHorizontal",0);
-      if (axisprop.to_bool ())
-       ss->axis_ = X_AXIS;
+      if (l->get_direction ())
+       stafy.set_direction (l->get_direction ());
 
-      if (follow_staff && !axisprop.to_bool ())
-       ss->set_elt_property (no_staff_support_scm_sym, SCM_BOOL_T);
+      SCM axisprop = get_property ("scriptHorizontal",0);
+      bool xaxis = gh_boolean_p (axisprop) && gh_scm2bool (axisprop);
+      if (xaxis)
+       stafy.set_axis (X_AXIS);
+      else
+       stafy.set_axis (Y_AXIS);
+      
+      if (!follow_staff && ! xaxis)
+       p->set_elt_property ("staff-support", SCM_BOOL_T);
 
-      p->set_staff_side (ss);
-      ss->set_elt_property (script_priority_scm_sym, priority);
-      if (padding)
-       ss->set_elt_property (padding_scm_sym, gh_double2scm(padding));
+      if (!xaxis && follow_staff)
+       stafy.set_quantised (Y_AXIS);
+      
+      p->set_elt_property ("script-priority", priority);
+  
       script_p_arr_.push (p);
-      staff_side_p_arr_.push (ss);
       
       announce_element (Score_element_info (p, l));
-      announce_element (Score_element_info (ss, l));
     }
 }
 
@@ -108,28 +101,28 @@ Script_engraver::acknowledge_element (Score_element_info inf)
 {
   if (Stem *s = dynamic_cast<Stem*>(inf.elem_l_))
     {
-      for (int i=0; i < staff_side_p_arr_.size(); i++)
-       if (Stem_staff_side_item * ss = dynamic_cast<Stem_staff_side_item*>(staff_side_p_arr_[i]))
-         {
-           ss->set_stem (s);
-           ss->add_support (s);
-         }
+      for (int i=0; i < script_p_arr_.size(); i++)
+       {
+         Side_position_interface stafy (script_p_arr_[i]);
+         stafy.elt_l_->set_elt_property ("direction-source", s->self_scm_);
+         stafy.add_support (s);
+       }
     }
   else if (Rhythmic_head * rh = dynamic_cast<Rhythmic_head*>(inf.elem_l_))
     {
-      for (int i=0; i < staff_side_p_arr_.size(); i++)
+      for (int i=0; i < script_p_arr_.size(); i++)
        {
-         Staff_side_item * ss = dynamic_cast<Staff_side_item*>(staff_side_p_arr_[i]);
+         Side_position_interface stafy(script_p_arr_[i]);
          
-         if (!ss->parent_l (X_AXIS))
+         if (!stafy.elt_l_->parent_l (X_AXIS))
            {
-             ss->set_parent (inf.elem_l_, X_AXIS);
+             stafy.elt_l_->set_parent (inf.elem_l_, X_AXIS);
            }
-         if (ss->axis_ == X_AXIS
-             && !ss->parent_l (Y_AXIS))
-           ss->set_parent (rh, Y_AXIS);
+         if (stafy.get_axis () == X_AXIS
+             && !stafy.elt_l_->parent_l (Y_AXIS))
+           stafy.elt_l_->set_parent (rh, Y_AXIS);
          
-         ss->add_support (rh);
+         stafy.add_support (rh);
        }
     }  
 }
@@ -140,10 +133,8 @@ Script_engraver::do_pre_move_processing()
   for (int i=0; i < script_p_arr_.size(); i++) 
     {
       typeset_element (script_p_arr_[i]);
-      typeset_element (staff_side_p_arr_[i]);
     }
   script_p_arr_.clear();
-  staff_side_p_arr_.clear ();
 }
 
 void
@@ -152,7 +143,6 @@ Script_engraver::do_post_move_processing()
   script_req_l_arr_.clear();
 }
 
-
-
 ADD_THIS_TRANSLATOR(Script_engraver);
 
+