''

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index ee563516c04297d85b507703815d58b4808034fc..05c5a04ba7b395d42b493034b1c77ba6267b300f 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "debug.hh"
 #include "dimensions.hh"
@@ -56,9 +56,7 @@ class Dynamic_engraver : public Engraver
   
   void typeset_all ();
 
-public:
-  VIRTUAL_COPY_CONS (Translator);
-  Dynamic_engraver ();
+TRANSLATOR_DECLARATIONS(Dynamic_engraver );
   
 protected:
   virtual void finalize ();
@@ -69,7 +67,7 @@ protected:
   virtual void start_translation_timestep ();
 };
 
-ADD_THIS_TRANSLATOR (Dynamic_engraver);
+
 
 
 Dynamic_engraver::Dynamic_engraver ()
@@ -141,13 +139,11 @@ Dynamic_engraver::process_music ()
          line_spanner_ = new Spanner (get_property ("DynamicLineSpanner"));
 
          Side_position_interface::set_axis (line_spanner_, Y_AXIS);
-         Axis_group_interface::set_interface (line_spanner_);
-         Axis_group_interface::set_axes (line_spanner_, Y_AXIS, Y_AXIS);
 
          Music * rq = accepted_spanreqs_drul_[START];
          if (script_req_l_)
            rq =  script_req_l_ ;
-         announce_grob (line_spanner_, rq);
+         announce_grob(line_spanner_, rq ? rq->self_scm(): SCM_EOL);
                         
 
        }
@@ -174,15 +170,12 @@ Dynamic_engraver::process_music ()
       script_p_->set_grob_property ("text",
                                   script_req_l_->get_mus_property ("text"));
       
-      Side_position_interface::set_direction (script_p_, LEFT);
-      Side_position_interface::set_axis (script_p_, X_AXIS);
-      
       if (Direction d = script_req_l_->get_direction ())
        Directional_element_interface::set (line_spanner_, d);
 
       Axis_group_interface::add_element (line_spanner_, script_p_);
 
-      announce_grob (script_p_, script_req_l_);
+      announce_grob(script_p_, script_req_l_->self_scm());
     }
 
   if (accepted_spanreqs_drul_[STOP])
@@ -222,6 +215,8 @@ Dynamic_engraver::process_music ()
  (current_cresc_req_->get_span_dir () == 1
             ? _ ("already have a crescendo")
             : _ ("already have a decrescendo"));
+
+         current_cresc_req_->origin ()->warning (_("Cresc started here"));
        }
       else
        {
@@ -253,11 +248,9 @@ Dynamic_engraver::process_music ()
          else
            {
              cresc_p_  = new Spanner (get_property ("TextSpanner"));
-             cresc_p_->set_interface (ly_symbol2scm ("dynamic-interface"));
              cresc_p_->set_grob_property ("type", s);
-             
-             daddy_trans_l_->set_property (start_type
-                                           + "Spanner", SCM_UNDEFINED);
+             daddy_trans_l_->set_property ((start_type
+                                           + "Spanner").ch_C(), SCM_UNDEFINED);
              s = get_property ((start_type + "Text").ch_C ());
              /*
                FIXME: use markup_p () to check type.
@@ -266,7 +259,7 @@ Dynamic_engraver::process_music ()
                {
                  cresc_p_->set_grob_property ("edge-text",
                                               gh_cons (s, ly_str02scm ("")));
-                 daddy_trans_l_->set_property (start_type + "Text",
+                 daddy_trans_l_->set_property ((start_type + "Text").ch_C(),
                                                SCM_UNDEFINED);
                }
            }
@@ -279,7 +272,7 @@ Dynamic_engraver::process_music ()
 
          add_bound_item (line_spanner_, cresc_p_->get_bound (LEFT));
          
-         announce_grob (cresc_p_, accepted_spanreqs_drul_[START]);
+         announce_grob(cresc_p_, accepted_spanreqs_drul_[START]->self_scm());
        }
     }
 }
@@ -374,10 +367,24 @@ Dynamic_engraver::typeset_all ()
 
       */
 
-      if (!finished_line_spanner_->get_bound (RIGHT)
-         && finished_line_spanner_->get_bound (LEFT))
-       finished_line_spanner_->set_bound (RIGHT, finished_line_spanner_->get_bound (LEFT));
-      
+      Grob * l = finished_line_spanner_->get_bound (LEFT );
+      Grob * r = finished_line_spanner_->get_bound (RIGHT);      
+      if (!r && l)
+       finished_line_spanner_->set_bound (RIGHT, l);
+      else if (!l && r)
+       finished_line_spanner_->set_bound (LEFT, r);
+      else if (!r && !l)
+       {
+         /*
+           This is a isolated dynamic apparently, and does not even have
+           any interesting support item.
+          */
+         Grob * cc = unsmob_grob (get_property ("currentMusicalColumn"));
+         Item * ci = dynamic_cast<Item*>(cc);
+         finished_line_spanner_->set_bound (RIGHT, ci);
+         finished_line_spanner_->set_bound (LEFT, ci);   
+       }
+       
       typeset_grob (finished_line_spanner_);
       finished_line_spanner_ = 0;
     }
@@ -386,14 +393,25 @@ Dynamic_engraver::typeset_all ()
 void
 Dynamic_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_column::has_interface (i.elem_l_))
+  if (Note_column::has_interface (i.grob_l_))
     {
       if (line_spanner_
          /* Don't refill killed spanner */
          && line_spanner_->immutable_property_alist_ != SCM_EOL)
        {
-         Side_position_interface::add_support (line_spanner_,i.elem_l_);
-         add_bound_item (line_spanner_,dynamic_cast<Item*> (i.elem_l_));
+         Side_position_interface::add_support (line_spanner_,i.grob_l_);
+         add_bound_item (line_spanner_,dynamic_cast<Item*> (i.grob_l_));
        }
     }
 }
+ENTER_DESCRIPTION(Dynamic_engraver,
+/* descr */       "
+This engraver creates hairpins, dynamic texts, and their vertical
+alignments.  The symbols are collected onto a DynamicLineSpanner grob
+which takes care of vertical positioning.  
+",
+                 
+/* creats*/       "DynamicLineSpanner DynamicText Hairpin TextSpanner",
+/* acks  */       "note-column-interface",
+/* reads */       "",
+/* write */       "");