release: 1.5.29

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

diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc
index b6958618bc6d4cb8dd7e617389904f5956139dc2..a08d9e0765428b4dcff58ae69caf2589ec466b4a 100644 (file)
--- a/lily/a2-engraver.cc
+++ b/lily/a2-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -14,13 +14,12 @@
 #include "translator-group.hh"
 #include "side-position-interface.hh"
 #include "directional-element-interface.hh"
-
+#include "multi-measure-rest.hh"
 
 class A2_engraver : public Engraver
 {
-public:
-  A2_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
+  TRANSLATOR_DECLARATIONS(A2_engraver);
+
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void create_grobs ();
@@ -30,7 +29,7 @@ private:
   enum State { SOLO, SPLIT_INTERVAL, UNIRHYTHM, UNISILENCE, UNISON } state_;
 };
 
-ADD_THIS_TRANSLATOR (A2_engraver);
+
 
 A2_engraver::A2_engraver ()
 {
@@ -59,7 +58,7 @@ A2_engraver::create_grobs ()
          announce_grob (text_p_, 0);
       
          Direction dir = UP;
-         SCM text;
+         SCM text = SCM_EOL;
          if (solo == SCM_BOOL_T)
            {
              state_ = SOLO;
@@ -94,17 +93,17 @@ A2_engraver::acknowledge_grob (Grob_info i)
   
   if (text_p_)
     {
-      if (Note_head::has_interface (i.elem_l_))
+      if (Note_head::has_interface (i.grob_l_))
        {
          Grob*t = text_p_;
-         Side_position_interface::add_support (t, i.elem_l_);
+         Side_position_interface::add_support (t, i.grob_l_);
          if (Side_position_interface::get_axis (t) == X_AXIS
-             && !t->parent_l (Y_AXIS))
-           t->set_parent (i.elem_l_, Y_AXIS);
+             && !t->get_parent (Y_AXIS))
+           t->set_parent (i.grob_l_, Y_AXIS);
        }
-      if (Stem::has_interface (i.elem_l_))
+      if (Stem::has_interface (i.grob_l_))
        {
-         Side_position_interface::add_support (text_p_, i.elem_l_);
+         Side_position_interface::add_support (text_p_, i.grob_l_);
        }
     }
          
@@ -130,22 +129,31 @@ A2_engraver::acknowledge_grob (Grob_info i)
   else if (unirhythm)
     state_ = UNIRHYTHM;
 
+  Direction d = CENTER;
+  if (daddy_trans_l_->id_str_.left_str (3) == "one")
+    d =  UP;
+  else if (daddy_trans_l_->id_str_.left_str (3) == "two")
+    d = DOWN;
+
   /* Must only set direction for VoiceCombines, not for StaffCombines:
      we can't detect that here, so, ugh, yet another property */
   if (!to_boolean (get_property ("noDirection"))
-      && (Stem::has_interface (i.elem_l_)
-         || Slur::has_interface (i.elem_l_)
-         // || Tie::has_interface (i.elem_l_)
-         || i.elem_l_->has_interface (ly_symbol2scm ("tie-interface"))
+      && (Stem::has_interface (i.grob_l_)
+         || Slur::has_interface (i.grob_l_)
+         // || Tie::has_interface (i.grob_l_)
+         || i.grob_l_->has_interface (ly_symbol2scm ("tie-interface"))
+         
          /*
            Usually, dynamics are removed by *_devnull_engravers for the
            second voice.  On the one hand, we don't want all dynamics for
            the first voice to be placed above the staff.  On the other
-           hand, colliding of scripts may be worse */
-#if 0
-         || i.elem_l_->has_interface (ly_symbol2scm ("dynamic-interface"))
-         || i.elem_l_->has_interface (ly_symbol2scm ("text-interface"))
-#endif
+           hand, colliding of scripts may be worse.
+           So, we don't set directions for these when we're playing solo.
+         */
+         || (i.grob_l_->has_interface (ly_symbol2scm ("dynamic-interface"))
+             && state_ != SOLO)
+         || (i.grob_l_->has_interface (ly_symbol2scm ("text-interface"))
+             && state_ != SOLO)
          ))
     {
       /*
@@ -157,16 +165,23 @@ A2_engraver::acknowledge_grob (Grob_info i)
          || (unirhythm == SCM_BOOL_T && split_interval == SCM_BOOL_T
              && (unison != SCM_BOOL_T || solo_adue != SCM_BOOL_T)))
        {
-         if (daddy_trans_l_->id_str_.left_str (3) == "one")
-           {
-             i.elem_l_->set_grob_property ("direction", gh_int2scm (1));
-           }
-         else if (daddy_trans_l_->id_str_.left_str (3) == "two")
-           {
-             i.elem_l_->set_grob_property ("direction", gh_int2scm (-1));
-           }
+       
+         /*
+           Blunt axe method: every grob gets a propertysetting.
+          */
+         i.grob_l_->set_grob_property ("direction", gh_int2scm (d));
        }
     }
+
+  /*
+    todo: should we have separate state variable for being "rest while
+    other has solo?"  */
+  if ( Multi_measure_rest::has_interface (i.grob_l_) && d )
+    if (state_ == UNIRHYTHM
+       && unisilence != SCM_BOOL_T)
+    {
+      i.grob_l_->set_grob_property ("staff-position", gh_int2scm (d * 6));
+    }
 }
 
 void 
@@ -180,3 +195,18 @@ A2_engraver::stop_translation_timestep ()
     }
 }
 
+ENTER_DESCRIPTION(A2_engraver,
+/* descr */       "Part combine engraver for orchestral scores.
+
+The markings @emph{a2}, @emph{Solo} and @emph{Solo II}, are
+created by this engraver.  It also acts upon instructions of the part
+combiner.  Another thing that the this engraver, is forcing of stem,
+slur and tie directions, always when both threads are not identical;
+up for the musicexpr called @code{one}, down for the musicexpr called
+@code{two}.
+
+",
+/* creats*/       "TextScript",
+/* acks  */       "grob-interface tie-interface note-head-interface ",
+/* reads */       "combineParts noDirection soloADue soloText soloIIText aDueText split-interval unison solo unisilence unirhythm",
+/* write */       "");