release: 1.3.106

[lilypond.git] / lily / piano-pedal-engraver.cc

diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index b8a69703a7f9a9e985ca67bf98d6bdaa217b2611..3f09f169e1579d2bddc1ca60bc7f59fa1453ed00 100644 (file)
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -10,30 +10,14 @@
 #include "musical-request.hh"
 #include "score-element.hh"
 #include "item.hh"
-#include "lookup.hh"
 #include "lily-guile.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
 #include "stem.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
-#include "text-item.hh"
-#include "sustain-pedal.hh"
-
-/*
-   TODO:
-     * it would be really cool if an engraver could be initialised with a
-       string, ie:
-
-          Piano_pedal_engraver::"sostenuto"
-          Piano_pedal_engraver::"sustain"
-          Piano_pedal_engraver::"una-chorda"
+#include "item.hh"
 
- */
 
-/*
-  Would it? The semantics are unclear, and real benefits are muddy
-  too.  --hwn
-*/
 
 
 
@@ -111,18 +95,17 @@ Piano_pedal_engraver::acknowledge_element (Score_element_info info)
     {
       if (p->item_p_)
        {
-         if (Note_head* n = dynamic_cast<Note_head*> (info.elem_l_))
+         if (Rhythmic_head::has_interface (info.elem_l_))
            {
-             Side_position_interface st (p->item_p_);
-             st.add_support (n);
-             if (st.get_axis( ) == X_AXIS
+             Side_position::add_support (p->item_p_, info.elem_l_);
+
+             if (Side_position::get_axis(p->item_p_) == X_AXIS
                  && !p->item_p_->parent_l (Y_AXIS))
-               p->item_p_->set_parent (n, Y_AXIS);
+               p->item_p_->set_parent (info.elem_l_, Y_AXIS);
            }
-         if (Stem* s = dynamic_cast<Stem*> (info.elem_l_))
+         if (Stem::has_interface (info.elem_l_))
            {
-             Side_position_interface st (p->item_p_);
-             st.add_support (s);
+             Side_position::add_support (p->item_p_,info.elem_l_);
            }
        }
     }
@@ -135,9 +118,10 @@ Piano_pedal_engraver::do_try_music (Music *m)
     {
       for (Pedal_info*p = info_list_; p->name_; p ++)
        {
-         if (s->span_type_str_ == p->name_)
+         if (scm_equal_p (s->get_mus_property ("span-type"),
+                          ly_str02scm (p->name_))==SCM_BOOL_T)
            {
-             p->req_l_drul_[s->span_dir_] = s;
+             p->req_l_drul_[s->get_span_dir()] = s;
              return true;
            }
        }
@@ -150,16 +134,16 @@ Piano_pedal_engraver::do_process_music ()
 {
   for (Pedal_info*p = info_list_; p->name_; p ++)
     {
-      SCM s = SCM_UNDEFINED;
+      SCM s = SCM_EOL;
       if (p->req_l_drul_[STOP] && p->req_l_drul_[START])
        {
          if (!p->start_req_l_)
            {
-             p->req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s",  p->name_ ));
+             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: %s",  p->name_ ));
            }
          else
            {
-             s = get_property ("stopStart" + String (p->name_ ));
+             s = get_property (("stopStart" + String (p->name_ )).ch_C());
            }
          p->start_req_l_ = p->req_l_drul_[START];
        }
@@ -167,44 +151,30 @@ Piano_pedal_engraver::do_process_music ()
        {
          if (!p->start_req_l_)
            {
-             p->req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s", p->name_ ));
+             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: %s", p->name_ ));
            }
          else
            {
-             s = get_property ("stop" + String (p->name_ ));
+             s = get_property (("stop" + String (p->name_ )).ch_C());
            }
          p->start_req_l_ = 0;
        }
       else if (p->req_l_drul_[START])
        {
          p->start_req_l_ = p->req_l_drul_[START];
-         s = get_property ("start" + String (p->name_ ));
+         s = get_property (("start" + String (p->name_ )).ch_C());
        }
 
       if (gh_string_p (s))
        {
-         if (p->name_ == String ("Sustain"))
-           {
-             // fixme: Item should be sufficient.
-             p->item_p_ = new Text_item (get_property ("basicSustainPedalProperties"));
-           }
-         else
-           {
-             p->item_p_ = new Text_item (get_property ("basicPedalProperties"));
-           }
-             p->item_p_->set_elt_property ("text", s);
-             // guh
-
-         Side_position_interface si (p->item_p_);
-         si.set_axis (Y_AXIS);
-
-         // todo: init with basic props.
-         p->item_p_->add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
-         p->item_p_->add_offset_callback (Side_position_interface::centered_on_parent, X_AXIS);
-         announce_element (Score_element_info (p->item_p_,
-                                               p->req_l_drul_[START]
-                                               ? p->req_l_drul_[START]
-                                               : p->req_l_drul_[STOP]));
+         String propname = String (p->name_) + "Pedal";
+         p->item_p_ = new Item (get_property (propname.ch_C()));
+         p->item_p_->set_elt_property ("text", s);
+
+         announce_element (p->item_p_,
+                           p->req_l_drul_[START]
+                           ? p->req_l_drul_[START]
+                           : p->req_l_drul_[STOP]);
        }
     }
 }
@@ -223,7 +193,7 @@ Piano_pedal_engraver::do_pre_move_processing ()
     {
       if (p->item_p_)
        {
-         Side_position_interface (p->item_p_).add_staff_support ();
+         Side_position::add_staff_support (p->item_p_);
          /*
            Hmm.
          */
@@ -231,8 +201,7 @@ Piano_pedal_engraver::do_pre_move_processing ()
            {
              if (sustain)
                {
-                 Side_position_interface st (p->item_p_);
-                 st.add_support (sustain);
+                 Side_position::add_support (p->item_p_,sustain);
                }
            }
          typeset_element (p->item_p_);