patch::: 1.3.8.uu1

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index e02325ee5e94d12ab5e9b227cc608f8388348a19..408fde144e29bf9eeb674b211d578b8bc14160c4 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -7,15 +7,14 @@
 */
 #include "debug.hh"
 #include "crescendo.hh"
-#include "dynamic-engraver.hh"
 #include "musical-request.hh"
 #include "lookup.hh"
 #include "paper-def.hh"
 #include "score-column.hh"
 #include "staff-symbol.hh"
 #include "note-column.hh"
-#include "g-text-item.hh"
-#include "g-staff-side.hh"
+#include "text-item.hh"
+#include "staff-side.hh"
 #include "engraver.hh"
 #include "stem.hh"
 #include "note-head.hh"
@@ -25,14 +24,10 @@
  */
 class Dynamic_engraver : public Engraver
 {
-  G_text_item * text_p_;
-  G_staff_side_item * staff_side_p_;
-  G_staff_side_spanner * ss_span_p_;
-  G_staff_side_spanner * to_end_ss_span_p_;
-  
-  
+  Text_item * text_p_;
   Crescendo * to_end_cresc_p_;
   Crescendo * cresc_p_;
+
   Span_req * cresc_req_l_;
   Array<Request*> dynamic_req_l_arr_;
   void  typeset_all ();
@@ -55,9 +50,9 @@ Dynamic_engraver::Dynamic_engraver()
 {
   do_post_move_processing();
   text_p_ =0;
-  staff_side_p_ =0;
+
   to_end_cresc_p_ = cresc_p_ = 0;
-  ss_span_p_ = to_end_ss_span_p_=0;
+
   cresc_req_l_ = 0;
 }
 
@@ -99,7 +94,7 @@ void
 Dynamic_engraver::do_process_requests()
 {
   Crescendo*  new_cresc_p=0;
-  G_staff_side_spanner * new_sss_p =0;
+
   for (int i=0; i < dynamic_req_l_arr_.size(); i++)
     {
       if (Text_script_req *absd =
@@ -107,64 +102,61 @@ Dynamic_engraver::do_process_requests()
        {
          if (text_p_)
            {
-             dynamic_req_l_arr_[i]->warning (_("Got a dynamic already.  Continuing dazed and confused"));
+             dynamic_req_l_arr_[i]->warning (_("Got a dynamic already.  Continuing dazed and confused."));
              continue;
            }
          
          String loud = absd->text_str_;
 
-         text_p_ = new G_text_item;
+         text_p_ = new Text_item;
          text_p_->text_str_ =  loud; // ugh
-         Scalar prop = get_property ("dynamicStyle", 0);
-
-         text_p_->style_str_ = prop.length_i () ? prop :  "dynamic";
+         text_p_->set_elt_property ("style", gh_str02scm ("dynamic"));
+         text_p_->set_elt_property ("script-priority",
+                                    gh_int2scm (100));
+         Side_position_interface (text_p_).set_axis (Y_AXIS);
 
-         staff_side_p_ = new G_staff_side_item;
-         staff_side_p_->set_elt_property (script_priority_scm_sym,
-                                          gh_int2scm (100));
-                                          
-         staff_side_p_->set_victim (text_p_);
-         staff_side_p_->axis_ = Y_AXIS;
          
+         if (absd->get_direction ())
+           {
+             text_p_->set_elt_property ("direction", gh_int2scm (absd->get_direction ()));
+           }
+
 
-         prop = get_property ("dynamicDir", 0);
-         if (prop.isnum_b ())
+         /*
+           UGH UGH 
+          */
+         SCM prop = get_property ("dynamicDirection", 0);
+         if (!isdir_b (prop))
            {
-             staff_side_p_->dir_ = (Direction) (int) prop;
+             prop = get_property ("verticalDirection", 0);
            }
 
-     prop = get_property ("dynamicPadding", 0);
-         if (prop.isnum_b ())
-           {
-             staff_side_p_->set_elt_property (padding_scm_sym, 
-                                              gh_double2scm(Real(prop)));
-           }
+         if (isdir_b (prop) && to_dir (prop))
+           text_p_->set_elt_property ("direction", prop);
+
+
+         prop = get_property ("dynamicPadding", 0);
+         if (gh_number_p(prop))
+           {
+             text_p_->set_elt_property ("padding", prop);
+           }
          announce_element (Score_element_info (text_p_, absd));
-         announce_element (Score_element_info (staff_side_p_, absd));
        }
       else if (Span_req *span_l
-                      = dynamic_cast <Span_req *> (dynamic_req_l_arr_[i]))
+              = dynamic_cast <Span_req *> (dynamic_req_l_arr_[i]))
        {
          if (span_l->span_dir_ == STOP)
            {
              if (!cresc_p_)
                {
-                 span_l->warning (_ ("can't find (de)crescendo to end"));
+                 span_l->warning (_ ("Can't find (de)crescendo to end"));
                }
              else
                {
                  assert (!to_end_cresc_p_);
                  to_end_cresc_p_ =cresc_p_;
-                 to_end_ss_span_p_ = ss_span_p_ ;
                  
                  cresc_p_ = 0;
-                 ss_span_p_ =0;
-                 Scalar prop = get_property ("dynamicDir", 0);
-                 if (prop.isnum_b ())
-                   {
-                     to_end_ss_span_p_->dir_ = (Direction) (int) prop;
-                   }
-                 
                }
            }
          else if (span_l->span_dir_ == START)
@@ -173,12 +165,9 @@ Dynamic_engraver::do_process_requests()
              assert (!new_cresc_p);
              new_cresc_p  = new Crescendo;
              new_cresc_p->grow_dir_ = (span_l->span_type_str_ == "crescendo")  ? BIGGER : SMALLER;
-             announce_element (Score_element_info (new_cresc_p, span_l));
 
-             new_sss_p = new G_staff_side_spanner;
-             new_sss_p->set_victim (new_cresc_p);
-             new_sss_p->axis_ = Y_AXIS;
-             announce_element (Score_element_info (new_sss_p, span_l));
+             Side_position_interface (new_cresc_p).set_axis (Y_AXIS);
+             announce_element (Score_element_info (new_cresc_p, span_l));
            }
        }
     }
@@ -189,15 +178,13 @@ Dynamic_engraver::do_process_requests()
        {
          ::warning (_ ("Too many crescendi here"));
          typeset_element (cresc_p_);
-         typeset_element (ss_span_p_);
+
          cresc_p_ = 0;
-         ss_span_p_ =0;
        }
       
       cresc_p_ = new_cresc_p;
-      ss_span_p_ = new_sss_p;
       cresc_p_->set_bounds(LEFT,get_staff_info().musical_pcol_l ());
-      ss_span_p_->set_bounds (LEFT,get_staff_info().musical_pcol_l ());
+
       if (text_p_)
        {
          cresc_p_->dyn_b_drul_[LEFT] = true;
@@ -223,8 +210,6 @@ Dynamic_engraver::do_removal_processing ()
   if (cresc_p_)
     {
       typeset_element (cresc_p_ );
-      typeset_element (ss_span_p_);
-      ss_span_p_ =0;
       cresc_req_l_->warning (_ ("unended crescendo"));
       cresc_p_ =0;
     }
@@ -238,19 +223,17 @@ Dynamic_engraver::typeset_all ()
   if (to_end_cresc_p_)
     {
       to_end_cresc_p_->set_bounds(RIGHT,get_staff_info().musical_pcol_l ());
-      to_end_ss_span_p_->set_bounds(RIGHT,get_staff_info().musical_pcol_l ());
+
       typeset_element (to_end_cresc_p_);
-      typeset_element (to_end_ss_span_p_);
+
       to_end_cresc_p_ =0;
-      to_end_ss_span_p_ =0;
+
     }
   
   if (text_p_)
     {
       typeset_element (text_p_);
-      typeset_element (staff_side_p_);
       text_p_ =0;
-      staff_side_p_ =0;
     }
 }
 
@@ -262,13 +245,14 @@ Dynamic_engraver::acknowledge_element (Score_element_info i)
       || dynamic_cast<Note_head *> (i.elem_l_)
       )
     {
-      if (staff_side_p_)
-       staff_side_p_->add_support (i.elem_l_);
+      if (text_p_)
+       Side_position_interface (text_p_).add_support (i.elem_l_);
 
-      if (to_end_ss_span_p_)
-       to_end_ss_span_p_->add_support (i.elem_l_);
+      if (to_end_cresc_p_)
+       Side_position_interface (to_end_cresc_p_).add_support (i.elem_l_);
 
-      if (ss_span_p_)
-       ss_span_p_->add_support (i.elem_l_);
+      if (cresc_p_)
+       Side_position_interface(cresc_p_).add_support (i.elem_l_);
     }
 }
+