]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/dynamic-engraver.cc
release: 1.3.31
[lilypond.git] / lily / dynamic-engraver.cc
index d36eeb250a5e16e6520cc8fba33c92120bcd170e..254271080f1110fef47d0575d3b998ee95a35e26 100644 (file)
@@ -3,56 +3,78 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #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-sym.hh"
+#include "paper-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 "side-position-interface.hh"
 #include "engraver.hh"
 #include "stem.hh"
 #include "note-head.hh"
+#include "group-interface.hh"
+
+/*
+  TODO:
+    * why handle absolute and span requests in one cryptic engraver,
+    what about Span_dynamic_engraver?
+
+    * hairpin
+    * text:
+      - `cresc. --  --  --'
+      - `cresc. poco a poco -- -- --'
+ */
 
 /**
    print text & hairpin dynamics.
  */
 class Dynamic_engraver : public Engraver
 {
-  G_text_item * text_p_;
-  G_staff_side_item * staff_side_p_;
-  
+  Text_item * abs_text_p_;
+  Text_item * cr_text_p_;
   Crescendo * to_end_cresc_p_;
   Crescendo * cresc_p_;
-  Span_dynamic_req * cresc_req_l_;
-  Array<Dynamic_req*> dynamic_req_l_arr_;
+
+  Span_req * cresc_req_l_;
+  Array<Request*> dynamic_req_l_arr_;
   void  typeset_all ();
 public:
   VIRTUAL_COPY_CONS(Translator);
   Dynamic_engraver();
   
 protected:
+
+  void announce_element (Score_element_info);
+  
   virtual void do_removal_processing ();
   virtual void acknowledge_element (Score_element_info);
   virtual bool do_try_music (Music *req_l);
   virtual void do_process_requests();
   virtual void do_pre_move_processing();
   virtual void do_post_move_processing();
+  virtual void typeset_element (Score_element*);
 };
 
+void
+Dynamic_engraver::announce_element (Score_element_info i)
+{
+  group (i.elem_l_, "interfaces").add_thing (ly_symbol2scm ("dynamic"));
+  
+  Engraver::announce_element (i);
+}
 
 
 Dynamic_engraver::Dynamic_engraver()
 {
   do_post_move_processing();
-  text_p_ =0;
-  staff_side_p_ =0;
+  abs_text_p_ = 0;
+  cr_text_p_ = 0;
   to_end_cresc_p_ = cresc_p_ = 0;
   cresc_req_l_ = 0;
 }
@@ -64,84 +86,153 @@ Dynamic_engraver::do_post_move_processing()
 }
 
 bool
-Dynamic_engraver::do_try_music (Music * r)
+Dynamic_engraver::do_try_music (Music * m)
 {
-  if(Dynamic_req * d = dynamic_cast <Dynamic_req *> (r))
+  Request * r = dynamic_cast<Request*> (m);
+
+  if(Text_script_req * d = dynamic_cast <Text_script_req *> (r))
     {
-      for (int i=0; i < dynamic_req_l_arr_.size (); i++)
-       if (d->equal_b (dynamic_req_l_arr_[i]))
-         return true;
-      
-      dynamic_req_l_arr_.push (d);
-      return true;
+      if (d->style_str_ != "dynamic")
+       return false;
+    }
+  else if (Span_req * s =  dynamic_cast <Span_req*> (r))
+    {
+      if (s-> span_type_str_ != "crescendo"
+         && s->span_type_str_ != "decrescendo")
+       return false;
     }
-  return false;
+  else
+    return false;
+  
+  for (int i=0; i < dynamic_req_l_arr_.size (); i++)
+    if (r->equal_b (dynamic_req_l_arr_[i]))
+      return true;
+  
+  dynamic_req_l_arr_.push (r);
+  return true;
 }
+
+
 void
 Dynamic_engraver::do_process_requests()
 {
   Crescendo*  new_cresc_p=0;
+
   for (int i=0; i < dynamic_req_l_arr_.size(); i++)
     {
-      Dynamic_req *dreq_l = dynamic_req_l_arr_[i];
-      if (Absolute_dynamic_req *absd = dynamic_cast<Absolute_dynamic_req *> (dreq_l))
+      if (Text_script_req *absd =
+         dynamic_cast<Text_script_req *> ( dynamic_req_l_arr_[i]))
        {
-         if (text_p_)
+         if (abs_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->loudness_str ();
+         String loud = absd->text_str_;
 
-         text_p_ = new G_text_item;
-         text_p_->text_str_ =  "dyn" + loud; // ugh
-         Scalar prop = get_property ("dynamicStyle", 0);
-
-         text_p_->style_str_ = prop.length_i () ? prop :  "dynamic";
+         abs_text_p_ = new Text_item;
+         abs_text_p_->set_elt_property ("text",
+                                    ly_str02scm (loud.ch_C()));
+         abs_text_p_->set_elt_property ("style", gh_str02scm ("dynamic"));
+         abs_text_p_->set_elt_property ("script-priority",
+                                    gh_int2scm (100));
+         
+         Side_position_interface (abs_text_p_).set_axis (Y_AXIS);
 
-         staff_side_p_ = new G_staff_side_item;
-         staff_side_p_->set_victim (text_p_);
-         staff_side_p_->axis_ = Y_AXIS;
          
+         if (absd->get_direction ())
+           {
+             abs_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");
+         if (!isdir_b (prop))
            {
-             staff_side_p_->dir_ = (Direction) (int) prop;
+             prop = get_property ("verticalDirection");
            }
 
+         if (isdir_b (prop) && to_dir (prop))
+           abs_text_p_->set_elt_property ("direction", prop);
 
-         announce_element (Score_element_info (text_p_, dreq_l));
-         announce_element (Score_element_info (staff_side_p_, dreq_l));
+         prop = get_property ("dynamicPadding");
+         if (gh_number_p(prop))
+           {
+             abs_text_p_->set_elt_property ("padding", prop);
+           }
+         announce_element (Score_element_info (abs_text_p_, absd));
        }
-      else if (Span_dynamic_req *span_l = dynamic_cast <Span_dynamic_req *> (dreq_l))
+      else if (Span_req *span_l
+              = dynamic_cast <Span_req *> (dynamic_req_l_arr_[i]))
        {
-         if (span_l->spantype_ == STOP)
+         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_;
-                 cresc_p_ = 0;
-                 Scalar prop = get_property ("dynamicDir", 0);
-                 if (prop.isnum_b ())
-                   {
-                     to_end_cresc_p_->dir_ = (Direction) (int) prop;
-                   }
                  
+                 cresc_p_ = 0;
                }
            }
-         else if (span_l->spantype_ == START)
+         else if (span_l->span_dir_ == START)
            {
              cresc_req_l_ = span_l;
              assert (!new_cresc_p);
              new_cresc_p  = new Crescendo;
-             new_cresc_p->grow_dir_ = span_l->dynamic_dir_;
+             new_cresc_p->set_elt_property
+               ("grow-direction",
+                gh_int2scm ((span_l->span_type_str_ == "crescendo")
+                            ? BIGGER : SMALLER));
+             
+             SCM s = get_property (span_l->span_type_str_ + "Text");
+             if (gh_string_p (s))
+               {
+                 cr_text_p_ = new Text_item;
+                 cr_text_p_->set_elt_property ("text", s);
+                 // urg
+                 cr_text_p_->set_elt_property ("style", gh_str02scm ("italic"));
+                 // ?
+                 cr_text_p_->set_elt_property ("script-priority",
+                                               gh_int2scm (100));
+                 
+                 /*
+                   This doesn't work.
+                   I'd like to have support like this:
+                           |
+                          x|
+                         cresc. - - -
+
+                   or
+                           |
+                          x|
+                         ff cresc. - - -
+
+                  */
+                 if (0) //abs_text_p_)
+                   {
+                     Side_position_interface (cr_text_p_).set_axis (X_AXIS);
+                     Side_position_interface (cr_text_p_).add_support (abs_text_p_);
+                   }
+                 //Side_position_interface (cr_text_p_).set_axis (Y_AXIS);
+                 announce_element (Score_element_info (cr_text_p_, span_l));
+               }
+
+             s = get_property (span_l->span_type_str_ + "Spanner");
+             if (gh_string_p (s)) //&& ly_scm2string (s) != "hairpin")
+               {
+                 new_cresc_p->set_elt_property ("spanner", s);
+               }
+         
+             side_position (new_cresc_p).set_axis (Y_AXIS);
              announce_element (Score_element_info (new_cresc_p, span_l));
            }
        }
@@ -152,17 +243,23 @@ Dynamic_engraver::do_process_requests()
       if (cresc_p_)
        {
          ::warning (_ ("Too many crescendi here"));
+
          typeset_element (cresc_p_);
+
          cresc_p_ = 0;
        }
       
       cresc_p_ = new_cresc_p;
-      cresc_p_->set_bounds(LEFT,get_staff_info().musical_l ());
-      if (text_p_)
+      cresc_p_->set_bounds(LEFT,get_staff_info().musical_pcol_l ());
+
+      // arrragh, brr, urg: we know how wide text is, no?
+      if (abs_text_p_)
        {
-         cresc_p_->dyn_b_drul_[LEFT] = true;
+         index_set_cell (cresc_p_->get_elt_property ("dynamic-drul"),
+                         LEFT, SCM_BOOL_T);
          if (to_end_cresc_p_)
-           to_end_cresc_p_->dyn_b_drul_[RIGHT] = true;
+           index_set_cell (to_end_cresc_p_->get_elt_property ("dynamic-drul"),
+                           RIGHT, SCM_BOOL_T);
        }
     }
 }
@@ -170,15 +267,6 @@ Dynamic_engraver::do_process_requests()
 void
 Dynamic_engraver::do_pre_move_processing()
 {
-  Staff_symbol* s_l = get_staff_info().staff_sym_l_;
-  if (to_end_cresc_p_)
-    to_end_cresc_p_->add_support (s_l);
-  if (staff_side_p_)
-    {
-      staff_side_p_->add_support (s_l);
-      //      staff_side_p_->dim_cache_[Y_AXIS].parent_l_ =  &s_l->dim_cache_[Y_AXIS];
-    }
-
   typeset_all ();
 }
 
@@ -204,19 +292,32 @@ Dynamic_engraver::typeset_all ()
 {  
   if (to_end_cresc_p_)
     {
-      to_end_cresc_p_->set_bounds(RIGHT,get_staff_info().musical_l ());
+      to_end_cresc_p_->set_bounds(RIGHT,get_staff_info().musical_pcol_l ());
       typeset_element (to_end_cresc_p_);
+
       to_end_cresc_p_ =0;
+
+    }
+  
+  if (abs_text_p_)
+    {
+      typeset_element (abs_text_p_);
+      abs_text_p_ = 0;
     }
-  if (text_p_)
+
+  if (cr_text_p_)
     {
-      typeset_element (text_p_);
-      typeset_element (staff_side_p_);
-      text_p_ =0;
-      staff_side_p_ =0;
+      typeset_element (cr_text_p_);
+      cr_text_p_ = 0;
     }
 }
 
+void
+Dynamic_engraver::typeset_element (Score_element * e)
+{
+  side_position(e).add_staff_support ();
+  Engraver::typeset_element (e);
+}
 
 void
 Dynamic_engraver::acknowledge_element (Score_element_info i)
@@ -225,13 +326,20 @@ 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 (abs_text_p_)
+       Side_position_interface (abs_text_p_).add_support (i.elem_l_);
+
+      if (cr_text_p_)  ///&& !abs_text_p_)
+       {
+         Side_position_interface (cr_text_p_).set_axis (Y_AXIS);
+         Side_position_interface (cr_text_p_).add_support (i.elem_l_);
+       }
 
       if (to_end_cresc_p_)
-       to_end_cresc_p_->add_support (i.elem_l_);
+       Side_position_interface (to_end_cresc_p_).add_support (i.elem_l_);
 
       if (cresc_p_)
-       cresc_p_->add_support (i.elem_l_);
+       Side_position_interface(cresc_p_).add_support (i.elem_l_);
     }
 }
+