release: 1.3.0

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 833e40c83b8982268254e0ae7f2fdc3371b9f501..2933131c8d26b62339cb48bd4a07469e56230ef7 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -7,7 +7,6 @@
 */
 #include "debug.hh"
 #include "crescendo.hh"
-#include "dynamic-engraver.hh"
 #include "musical-request.hh"
 #include "lookup.hh"
 #include "paper-def.hh"
@@ -107,7 +106,7 @@ 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;
            }
          
@@ -115,9 +114,6 @@ Dynamic_engraver::do_process_requests()
 
          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";
 
          staff_side_p_ = new Staff_side_item;
          staff_side_p_->set_elt_property (script_priority_scm_sym,
@@ -125,31 +121,41 @@ Dynamic_engraver::do_process_requests()
                                           
          staff_side_p_->set_victim (text_p_);
          staff_side_p_->axis_ = Y_AXIS;
+         staff_side_p_->dir_ = DOWN;
+
          
+         SCM prop = get_property ("verticalDirection", 0);
+         if (isdir_b (prop))
+           {
+             staff_side_p_->dir_ = to_dir (prop);
+           }
 
-         prop = get_property ("dynamicDir", 0);
-         if (prop.isnum_b ())
+         prop = get_property ("dynamicDirection", 0);
+         if (SCM_NUMBERP(prop))
            {
-             staff_side_p_->dir_ = (Direction) (int) prop;
+             staff_side_p_->dir_ = to_dir (prop);
+           }
+         if (absd->dir_)
+           {
+             staff_side_p_->dir_ = absd->dir_;
            }
 
-     prop = get_property ("dynamicPadding", 0);
-         if (prop.isnum_b ())
-           {
-             staff_side_p_->set_elt_property (padding_scm_sym, 
-                                              gh_double2scm(Real(prop)));
-           }
+         prop = get_property ("dynamicPadding", 0);
+         if (SCM_NUMBERP(prop))
+           {
+             staff_side_p_->set_elt_property (padding_scm_sym, 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
                {
@@ -159,12 +165,25 @@ Dynamic_engraver::do_process_requests()
                  
                  cresc_p_ = 0;
                  ss_span_p_ =0;
-                 Scalar prop = get_property ("dynamicDir", 0);
-                 if (prop.isnum_b ())
+
+
+
+                 
+                 SCM prop = get_property ("verticalDirection", 0);
+                 if (isdir_b (prop))
                    {
-                     to_end_ss_span_p_->dir_ = (Direction) (int) prop;
+                     to_end_ss_span_p_->dir_ = to_dir (prop);
+                   }
+                 prop = get_property ("dynamicDirection", 0);
+                 if (isdir_b (prop))
+                   {
+                     to_end_ss_span_p_->dir_ = to_dir (prop);
+                   }
+                 prop = get_property ("dynamicPadding", 0);
+                 if (SCM_NUMBERP(prop))
+                   {
+                     to_end_ss_span_p_->set_elt_property (padding_scm_sym,prop);
                    }
-                 
                }
            }
          else if (span_l->span_dir_ == START)
@@ -178,6 +197,8 @@ Dynamic_engraver::do_process_requests()
              new_sss_p = new Staff_side_spanner;
              new_sss_p->set_victim (new_cresc_p);
              new_sss_p->axis_ = Y_AXIS;
+             // UGH.!
+             // new_sss_p->set_elt_property (dangling_scm_sym, SCM_BOOL_T);
              announce_element (Score_element_info (new_sss_p, span_l));
            }
        }