X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fa2-engraver.cc;h=4c84ff402e725862c440290a29b5581f2adc00b0;hb=e2263620675cc1467e01a6ec67f55ffdb56361e4;hp=65a239e03029c3b08cbb42ccd76e0c225e500a86;hpb=a89412a560827a2f6b78a16301a21100e57ee378;p=lilypond.git

diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc
index 65a239e030..4c84ff402e 100644
--- a/lily/a2-engraver.cc
+++ b/lily/a2-engraver.cc
@@ -10,6 +10,7 @@
 #include "item.hh"
 #include "note-head.hh"
 #include "stem.hh"
+#include "slur.hh"
 #include "translator-group.hh"
 #include "side-position-interface.hh"
 #include "directional-element-interface.hh"
@@ -23,12 +24,12 @@ public:
 protected:
   virtual void do_process_music ();
   virtual void acknowledge_element (Score_element_info);
-  //virtual void process_acknowledged ();
 
   virtual void do_pre_move_processing ();
 
 private:
   Item* text_p_;
+  enum State { SOLO, SPLIT_INTERVAL, UNIRHYTHM, UNISILENCE, UNISON } state_;
 };
 
 ADD_THIS_TRANSLATOR (A2_engraver);
@@ -36,45 +37,53 @@ ADD_THIS_TRANSLATOR (A2_engraver);
 A2_engraver::A2_engraver ()
 {
   text_p_ = 0;
+  state_ = UNISILENCE;
 }
 
 void
 A2_engraver::do_process_music ()
 {
+  if (!to_boolean (get_property ("combineParts")))
+    return ;
   if (!text_p_)
     {
-      SCM a2 = get_property ("a2");
+      SCM unison = get_property ("unison");
       SCM solo = get_property ("solo");
-      SCM solo2 = get_property ("solo2");
+      SCM solo_adue = get_property ("soloADue");
 
-      if (solo == SCM_BOOL_T || a2 == SCM_BOOL_T || solo2 == SCM_BOOL_T)
+      if (solo_adue == SCM_BOOL_T
+	  && ((solo == SCM_BOOL_T && state_ != SOLO)
+	      || (unison == SCM_BOOL_T && state_ != UNISON
+		  && daddy_trans_l_->id_str_ == "one")))
 	{
-	  text_p_ = new Item (get_property ("basicTextScriptProperties"));
+	  text_p_ = new Item (get_property ("TextScript"));
 	  Side_position::set_axis (text_p_, Y_AXIS);
 	  announce_element (text_p_, 0);
       
-	  /*
-	    Urg, read prop
-	  */
-	  SCM text;
 	  Direction dir = UP;
+	  SCM text;
 	  if (solo == SCM_BOOL_T)
 	    {
-	      text = ly_str02scm ("Solo");
-	    }
-	  else if (solo2 == SCM_BOOL_T)
-	    {
-	      text = ly_str02scm ("Solo II");
-	      dir = DOWN;
+	      state_ = SOLO;
+	      if (daddy_trans_l_->id_str_ == "one")
+		{
+		  text = get_property ("soloText");
+		}
+	      else
+		{
+		  text = get_property ("soloIIText");
+		  dir = DOWN;
+		}
 	    }
-	  else if (a2 == SCM_BOOL_T)
+	  else if (unison == SCM_BOOL_T)
 	    {
-	      text = ly_str02scm ("\\`a 2");
+	      state_ = UNISON;
+	      if (daddy_trans_l_->id_str_ == "one")
+		text = get_property ("aDueText");
 	    }
-
+	  
 	  Side_position::set_direction (text_p_, dir);
 	  text_p_->set_elt_property ("text", text);
-
 	}
     }
 }
@@ -82,6 +91,9 @@ A2_engraver::do_process_music ()
 void
 A2_engraver::acknowledge_element (Score_element_info i)
 {
+  if (!to_boolean (get_property ("combineParts")))
+    return ;
+  
   if (text_p_)
     {
       if (Note_head::has_interface (i.elem_l_))
@@ -95,26 +107,53 @@ A2_engraver::acknowledge_element (Score_element_info i)
       if (Stem::has_interface (i.elem_l_))
 	{
 	  Side_position::add_support (text_p_, i.elem_l_);
+	}
+    }
 	  
-	  SCM a2 = get_property ("a2");
-	  SCM solo = get_property ("solo");
-	  SCM solo2 = get_property ("solo2");
-
-	  SCM first = get_property ("first");
-	  SCM second = get_property ("second");
-
-	  if (solo != SCM_BOOL_T
-	      && solo2 != SCM_BOOL_T
-	      && a2 != SCM_BOOL_T)
+  SCM unisilence = get_property ("unisilence");
+  SCM unison = get_property ("unison");
+  SCM unirhythm = get_property ("unirhythm");
+  SCM solo = get_property ("solo");
+  SCM split_interval = get_property ("split-interval");
+  SCM solo_adue = get_property ("soloADue");
+  
+  State previous_state = state_;
+  if (unisilence == SCM_BOOL_T)
+    /*
+      state_ = UNISILENCE;
+    */
+    ;
+  else if (solo == SCM_BOOL_T)
+    state_ = SOLO;
+  else if (unison == SCM_BOOL_T)
+    state_ = UNISON;
+  else if (unirhythm == SCM_BOOL_T && split_interval == SCM_BOOL_T)
+    state_ = SPLIT_INTERVAL;
+  else if (unirhythm)
+    state_ = UNIRHYTHM;
+	  
+  if (Stem::has_interface (i.elem_l_)
+      || Slur::has_interface (i.elem_l_)
+      // || Text_item::has_interface (i.elem_l_)
+      //|| Crescendo::has_interface (i.elem_l_)
+      )
+    {
+      /*
+	Hmm.  We must set dir when solo, in order to get
+	the rests collided to the right position
+      */
+      if ((unirhythm != SCM_BOOL_T) || (solo == SCM_BOOL_T)
+	  || ((unisilence == SCM_BOOL_T && previous_state != UNISON))
+	  || (unirhythm == SCM_BOOL_T && split_interval == SCM_BOOL_T
+	      && (unison != SCM_BOOL_T || solo_adue != SCM_BOOL_T)))
+	{
+	  if (daddy_trans_l_->id_str_ == "one")
 	    {
-	      if (first == SCM_BOOL_T)
-		{
-		  Directional_element_interface (i.elem_l_).set (UP);
-		}
-	      else if (second == SCM_BOOL_T)
-		{
-		  Directional_element_interface (i.elem_l_).set (DOWN);
-		}
+	      i.elem_l_->set_elt_property ("direction", gh_int2scm (1));
+	    }
+	  else if (daddy_trans_l_->id_str_ == "two")
+	    {
+	      i.elem_l_->set_elt_property ("direction", gh_int2scm (-1));
 	    }
 	}
     }
@@ -129,9 +168,5 @@ A2_engraver::do_pre_move_processing ()
       typeset_element (text_p_);
       text_p_ = 0;
     }
-  // burp: reset properties
-  daddy_trans_l_->set_property ("a2", SCM_BOOL_F);
-  daddy_trans_l_->set_property ("solo", SCM_BOOL_F);
-  daddy_trans_l_->set_property ("solo2", SCM_BOOL_F);
 }