X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=ca8d85398b2149955a6808e1f4f98b73b21ed171;hb=62e36043035ba8e0a9c1137077ff45d794a7003e;hp=74d8b93f9f7be4f0e61bd6164484ad5d437904ff;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 74d8b93f9f..ca8d85398b 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -1,175 +1,241 @@
 /*
   script-engraver.cc -- implement Script_engraver
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "script.hh"
 #include "side-position-interface.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "stem.hh"
-#include "staff-symbol.hh"
 #include "rhythmic-head.hh"
-#include "dimension-cache.hh"
-
 #include "engraver.hh"
+#include "note-column.hh"
+#include "translator-group.hh"
+#include "warn.hh"
 
-class Script_engraver : public Engraver {
-  Link_array<Script> script_p_arr_;
-  Link_array<Articulation_req> script_req_l_arr_;
+struct Script_tuple
+{
+  Music *event_;
+  Grob * script_;
+  SCM description_;
+  Script_tuple ()
+  {
+    event_ = 0;
+    script_ = 0;
+    description_ = SCM_EOL;
+  }
+};
 
+class Script_engraver : public Engraver
+{
+  Array<Script_tuple> scripts_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Script_engraver();
+  TRANSLATOR_DECLARATIONS(Script_engraver);
 protected:
-  virtual bool do_try_music (Music*);
-  virtual void do_process_requests ();
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void acknowledge_element (Score_element_info);
+  virtual bool try_music (Music*);
+  virtual void stop_translation_timestep ();
+  virtual void process_music ();
+  virtual void acknowledge_grob (Grob_info);
 };
 
-
-Script_engraver::Script_engraver()
+bool
+Script_engraver::try_music (Music *r)
 {
-  do_post_move_processing();
+  if (r->is_mus_type ("articulation-event"))
+    {
+      /*
+	Discard double articulations.
+	This is necessary for part-combining.
+       */
+      for (int j = 0; j < scripts_.size (); j++)
+	if (gh_equal_p (scripts_[j]. event_->get_mus_property ("articulation-type"),
+			r->get_mus_property ("articulation-type")
+			))
+	  return true;
+	  
+      Script_tuple t;
+      t.event_ =r;
+      scripts_.push (t);
+      
+      return true;
+    }
+  return false;
 }
 
-bool
-Script_engraver::do_try_music (Music *r_l)
+void
+copy_property (Grob * g , SCM sym, SCM alist)
 {
-  if (Articulation_req *mr = dynamic_cast <Articulation_req *> (r_l))
+  if (g->internal_get_grob_property (sym) == SCM_EOL)
     {
-      for (int i=0; i < script_req_l_arr_.size(); i++) 
+      SCM entry = scm_assoc (sym,alist);
+      if (gh_pair_p (entry))
 	{
-	  if (script_req_l_arr_[i]->equal_b (mr))
-	    return true;
+	  g->internal_set_grob_property (sym, gh_cdr (entry));
 	}
-      script_req_l_arr_.push (mr);
-      return true;
     }
-  return false;
+}
+
+
+/*
+  We add the properties, one by one for each Script. We could save a
+  little space by tacking the props onto the Script grob (i.e. make
+  ScriptStaccato , ScriptMarcato, etc. )
+ */
+void make_script_from_event (Grob *p,
+			     SCM * descr, Translator_group*tg,
+			     SCM art_type, 
+			     int index)
+{
+  SCM alist = tg->get_property ("scriptDefinitions");
+  SCM art = scm_assoc (art_type, alist);
+
+  if (art == SCM_BOOL_F)
+    {
+      warning (_("Don't know how to interpret articulation:"));
+      warning (_("Scheme encoding: "));
+      scm_write (art_type, scm_current_error_port ());
+      return  ;
+    }
+
+  art = gh_cdr (art);
+  
+  *descr = art;  
+
+
+  copy_property (p, ly_symbol2scm ("script-molecule"), art);
+  copy_property (p, ly_symbol2scm ("direction"), art);
+  copy_property (p, ly_symbol2scm ("side-relative-direction"), art);
+
+  int prio =0;
+  SCM sprio = scm_assoc (ly_symbol2scm ("script-priority"), art);
+  if (gh_pair_p (sprio))
+    prio = gh_scm2int (gh_cdr (sprio));
+
+
+  /*
+    Make sure they're in order of user input by adding index i.
+    Don't use the direction in this priority. Smaller means closer
+    to the head.
+  */
+  prio += index;
+
+  Side_position_interface::set_axis (p, Y_AXIS);
+  p->set_grob_property ("script-priority", gh_int2scm (prio));
 }
 
 void
-Script_engraver::do_process_requests()
+Script_engraver::process_music ()
 {
-  for (int i=0; i < script_req_l_arr_.size(); i++)
+  for (int i=0; i < scripts_.size (); i++)
     {
-      Articulation_req* l=script_req_l_arr_[i];
+      Music* l=scripts_[i].event_;
 
-      SCM list = ly_eval_str (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C());
-      
-      if (list == SCM_BOOL_F)
-	{
-	  l->warning (_f ("Don't know how to interpret articulation `%s'",
-			l->articulation_str_.ch_C ()));
-	  continue;
-	}
-      Script *p =new Script;
-      Side_position_interface stafy (p);
-      
-      
-      list = gh_cdr (list);
-      p->set_elt_property ("molecule",
-			   gh_car (list));
-
-      list = gh_cdr(list);
-      bool follow_staff = gh_scm2bool (gh_car (list));
-      list = gh_cdr(list);
-      int relative_stem_dir = gh_scm2int (gh_car (list));
-      list = gh_cdr(list);
-      int force_dir =gh_scm2int (gh_car (list));
-      list = gh_cdr(list);
-      SCM priority = gh_car (list);
+      Grob * p = make_item ("Script");
 
-      
-      if (relative_stem_dir)
-	  p->set_elt_property ("side-relative-direction", gh_int2scm (relative_stem_dir));
-      else
-	  stafy.set_direction ((Direction)force_dir);
-
-      if (l->get_direction ())
-	stafy.set_direction (l->get_direction ());
-
-      SCM axisprop = get_property ("scriptHorizontal");
-      bool xaxis = to_boolean (axisprop);
-      if (xaxis)
-	stafy.set_axis (X_AXIS);
-      else
-	stafy.set_axis (Y_AXIS);
-      
-      if (!follow_staff && ! xaxis)
-	p->set_elt_property ("staff-support", SCM_BOOL_T);
+      make_script_from_event (p, &scripts_[i].description_, daddy_trans_,
+			      l->get_mus_property ("articulation-type"),
+			      i);
+
+      scripts_[i].script_ = p;
 
-      if (!xaxis && follow_staff)
-	stafy.set_quantised (Y_AXIS);
       
-      p->set_elt_property ("script-priority", priority);
-  
-      script_p_arr_.push (p);
+      SCM force_dir = l->get_mus_property ("direction");
+      if (is_direction (force_dir) && to_dir (force_dir))
+	p->set_grob_property ("direction", force_dir);
       
-      announce_element (Score_element_info (p, l));
+      if (p)
+	announce_grob (p, l->self_scm());
     }
 }
 
 void
-Script_engraver::acknowledge_element (Score_element_info inf)
+Script_engraver::acknowledge_grob (Grob_info inf)
 {
-  bool them_grace = to_boolean (inf.elem_l_->get_elt_property ("grace"));
-  bool us_grace = to_boolean (get_property ("weAreGraceContext"));
-
-  if (us_grace != them_grace)
-    return;
-  
-  if (Stem *s = dynamic_cast<Stem*>(inf.elem_l_))
+  if (Stem::has_interface (inf.grob_))
     {
-      for (int i=0; i < script_p_arr_.size(); i++)
+      for (int i=0; i < scripts_.size (); i++)
 	{
-	  Side_position_interface stafy (script_p_arr_[i]);
-	  stafy.elt_l_->set_elt_property ("direction-source", s->self_scm_);
-	  stafy.add_support (s);
+	  Grob*e = scripts_[i].script_;
+
+	  if (to_dir (e->get_grob_property ("side-relative-direction")))
+	    e->set_grob_property ("direction-source", inf.grob_->self_scm ());
+
+	  /*
+	    add dep ? 
+	   */
+	  e->add_dependency (inf.grob_);
+	  Side_position_interface::add_support (e, inf.grob_);
 	}
     }
-  else if (Rhythmic_head * rh = dynamic_cast<Rhythmic_head*>(inf.elem_l_))
+  else if (Rhythmic_head::has_interface (inf.grob_))
     {
-      for (int i=0; i < script_p_arr_.size(); i++)
+      for (int i=0; i < scripts_.size (); i++)
 	{
-	  Side_position_interface stafy(script_p_arr_[i]);
+	  Grob *e = scripts_[i].script_;
 	  
-	  if (!stafy.elt_l_->parent_l (X_AXIS))
+	  if (Side_position_interface::get_axis (e) == X_AXIS
+	      && !e->get_parent (Y_AXIS))
 	    {
-	      stafy.elt_l_->set_parent (inf.elem_l_, X_AXIS);
+	      e->set_parent (inf.grob_, Y_AXIS);
+	      e->add_dependency (inf.grob_); // ??
 	    }
-	  if (stafy.get_axis () == X_AXIS
-	      && !stafy.elt_l_->parent_l (Y_AXIS))
-	    stafy.elt_l_->set_parent (rh, Y_AXIS);
+	  Side_position_interface::add_support (e,inf.grob_);
+	}
+    }
+  else if (Note_column::has_interface (inf.grob_))
+    {
+
+      /*
+	We make note column the parent of the script. That's not
+	correct, but due to seconds in a chord, noteheads may be
+	swapped around horizontally. We don't know which note head to
+	put it on, so we postpone this decision to
+	Script_interface::before_line_breaking ().
+ 
+       */
+      for (int i=0; i < scripts_.size (); i++)
+	{
+	  Grob *e = scripts_[i].script_;
 	  
-	  stafy.add_support (rh);
+	  if (!e->get_parent (X_AXIS) &&
+	      Side_position_interface::get_axis (e) == Y_AXIS)
+	    {
+	      e->set_parent (inf.grob_, X_AXIS);
+	    }
 	}
-    }  
+    }
 }
 
 void
-Script_engraver::do_pre_move_processing()
+Script_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < script_p_arr_.size(); i++) 
+  for (int i=0; i < scripts_.size (); i++) 
     {
-      if (to_boolean (script_p_arr_[i]->remove_elt_property ("staff-support")))
-	side_position (script_p_arr_[i]).add_staff_support ();
-      typeset_element (script_p_arr_[i]);
+      if (!scripts_[i].script_)
+	continue;
+      
+      Grob * sc = scripts_[i].script_;
+
+      SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), scripts_[i].description_);
+      if (gh_pair_p (follow) && to_boolean (gh_cdr (follow)))
+	{
+	  sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
+	  sc->set_grob_property ("staff-padding", SCM_EOL);
+	}
+      typeset_grob (sc);
     }
-  script_p_arr_.clear();
+  scripts_.clear ();
 }
 
-void
-Script_engraver::do_post_move_processing()
-{
-  script_req_l_arr_.clear();
-}
 
-ADD_THIS_TRANSLATOR(Script_engraver);
 
+Script_engraver::Script_engraver(){}
 
+ENTER_DESCRIPTION(Script_engraver,
+/* descr */       "Handles note scripted articulations.",
+/* creats*/       "Script",
+/* accepts */     "script-event articulation-event",
+/* acks  */      "stem-interface rhythmic-head-interface note-column-interface",
+/* reads */       "scriptDefinitions",
+/* write */       "");