release: 1.5.29

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

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index ae16fb9aaf0ce848f861ad68238df9efd8b6db26..a021d21fdfb36324b1295ddb34272cd040be9d16 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 ()
@@ -115,7 +113,7 @@ Dynamic_engraver::try_music (Music * m)
            earlier, not-to-be-terminated stuff.
 
            It will disappear by itself when stop_translation_timestep
-           () finds that there is nothing to support anymore.  */
+ () finds that there is nothing to support anymore.  */
          
          if (cresc_p_)
            cresc_p_->suicide ();
@@ -124,7 +122,7 @@ Dynamic_engraver::try_music (Music * m)
       else if (t == "crescendo"
           || t == "decrescendo")
        {
-         accepted_spanreqs_drul_[s->get_span_dir()] = s;
+         accepted_spanreqs_drul_[s->get_span_dir ()] = s;
          return true;
        }
     }
@@ -174,9 +172,8 @@ 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);
-      
+      Side_position_interface::set_direction (script_p_, DOWN);
+
       if (Direction d = script_req_l_->get_direction ())
        Directional_element_interface::set (line_spanner_, d);
 
@@ -192,10 +189,10 @@ Dynamic_engraver::process_music ()
        there are no new dynamics.
        */
  
-      if ( !cresc_p_)
+      if (!cresc_p_)
        {
          accepted_spanreqs_drul_[STOP]->origin ()->warning
-           (_ ("can't find start of (de)crescendo"));
+ (_ ("can't find start of (de)crescendo"));
          accepted_spanreqs_drul_[STOP] = 0;
        }
       else
@@ -219,7 +216,7 @@ Dynamic_engraver::process_music ()
       if (current_cresc_req_)
        {
          accepted_spanreqs_drul_[START]->origin ()->warning
-           (current_cresc_req_->get_span_dir() == 1
+ (current_cresc_req_->get_span_dir () == 1
             ? _ ("already have a crescendo")
             : _ ("already have a decrescendo"));
        }
@@ -236,7 +233,7 @@ Dynamic_engraver::process_music ()
          /*
            ugh. Use push/pop?
          */
-         SCM s = get_property ((start_type + "Spanner").ch_C());
+         SCM s = get_property ((start_type + "Spanner").ch_C ());
          if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
            {
              cresc_p_  = new Spanner (get_property ("Hairpin"));
@@ -253,16 +250,20 @@ 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);
-             s = get_property ((start_type + "Text").ch_C());
-             if (gh_string_p (s))
+             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.
+             */
+             if (gh_string_p (s) || gh_pair_p (s))
                {
                  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);
                }
            }
@@ -296,12 +297,19 @@ void
 Dynamic_engraver::finalize ()
 {
   typeset_all ();
+  
+  if (line_spanner_
+      && line_spanner_->immutable_property_alist_ == SCM_EOL)
+    line_spanner_ = 0;
   if (line_spanner_)
     {
       finished_line_spanner_ = line_spanner_;
       typeset_all ();
     }
 
+  if (cresc_p_
+      && cresc_p_->immutable_property_alist_ == SCM_EOL)
+    cresc_p_ = 0;
   if (cresc_p_)
     {
       current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo"));
@@ -313,6 +321,19 @@ Dynamic_engraver::finalize ()
 void
 Dynamic_engraver::typeset_all ()
 {  
+  /*
+    remove suicided spanners,
+    ugh: we'll need this for every spanner, beam, slur
+    Hmm, how to do this, cleanly?
+    Maybe just check at typeset_grob ()?
+  */
+  if (finished_cresc_p_
+      && finished_cresc_p_->immutable_property_alist_ == SCM_EOL)
+    finished_cresc_p_ = 0;
+  if (finished_line_spanner_
+      && finished_line_spanner_->immutable_property_alist_ == SCM_EOL)
+    finished_line_spanner_ = 0;
+
   if (finished_cresc_p_)
     {
       if (!finished_cresc_p_->get_bound (RIGHT))
@@ -336,10 +357,9 @@ Dynamic_engraver::typeset_all ()
     }
   if (finished_line_spanner_)
     {
-      /*
-       To make sure that this works
-      */
+      /* To make sure that this works */
       Side_position_interface::add_staff_support (finished_line_spanner_);
+      
       /*
        We used to have
        
@@ -351,9 +371,24 @@ Dynamic_engraver::typeset_all ()
 
       */
 
-      if (!finished_line_spanner_->get_bound (RIGHT))
-       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;
     }
@@ -362,12 +397,20 @@ 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_)
+      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 */       "",
+/* creats*/       "DynamicLineSpanner DynamicText Hairpin TextSpanner",
+/* acks  */       "note-column-interface",
+/* reads */       "",
+/* write */       "");