X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=3085f4f1553feebc4a3a2fa07d891b6fd1691783;hb=6a63817d16db193816646e9ec080f016876a6a62;hp=04f8bf4f8d334d741298474b14bae86da5665316;hpb=8032af1c6c8a170df3bbd9aaa418b3e7a652c3dd;p=lilypond.git

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 04f8bf4f8d..3085f4f155 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -1,180 +1,298 @@
 /*
-  script-engraver.cc -- implement Script_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "engraver.hh"
 
-#include "script.hh"
+#include "context.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "note-column.hh"
+#include "paper-column.hh"
+#include "rhythmic-head.hh"
+#include "script-interface.hh"
 #include "side-position-interface.hh"
-#include "musical-request.hh"
+#include "slur.hh"
+#include "staff-symbol-referencer.hh"
 #include "stem.hh"
-#include "staff-symbol.hh"
-#include "rhythmic-head.hh"
-#include "dimension-cache.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
-#include "engraver.hh"
+#include "translator.icc"
 
-class Script_engraver : public Engraver {
-  Link_array<Script> script_p_arr_;
-  Link_array<Articulation_req> script_req_l_arr_;
+struct Script_tuple
+{
+  Stream_event *event_;
+  Grob *script_;
+  Script_tuple ()
+  {
+    event_ = 0;
+    script_ = 0;
+  }
+};
+
+class Script_engraver : public Engraver
+{
+  vector<Script_tuple> scripts_;
 
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Script_engraver();
 protected:
-  virtual bool do_try_music (Music*);
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
-  virtual void acknowledge_element (Score_element_info);
+  void stop_translation_timestep ();
+  void process_music ();
+
+  DECLARE_TRANSLATOR_LISTENER (articulation);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (stem_tremolo);
+  DECLARE_ACKNOWLEDGER (tie);
+  DECLARE_END_ACKNOWLEDGER (tie);
+  DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_ACKNOWLEDGER (inline_accidental);
+
+public:
+  TRANSLATOR_DECLARATIONS (Script_engraver);
 };
 
+Script_engraver::Script_engraver ()
+{
+}
 
-Script_engraver::Script_engraver()
+IMPLEMENT_TRANSLATOR_LISTENER (Script_engraver, articulation);
+void
+Script_engraver::listen_articulation (Stream_event *ev)
 {
-  do_post_move_processing();
+  /* Discard double articulations for part-combining.  */
+  for (vsize i = 0; i < scripts_.size (); i++)
+    if (ly_is_equal (scripts_[i].event_
+                     ->get_property ("articulation-type"),
+                     ev->get_property ("articulation-type")))
+      return;
+
+  Script_tuple t;
+  t.event_ = ev;
+  scripts_.push_back (t);
 }
 
-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_property (sym) == SCM_EOL)
     {
-      for (int i=0; i < script_req_l_arr_.size(); i++) 
-	{
-	  if (script_req_l_arr_[i]->equal_b (mr))
-	    return true;
-	}
-      script_req_l_arr_.push (mr);
-      return true;
+      SCM entry = scm_assoc (sym, alist);
+      if (scm_is_pair (entry))
+        g->set_property (sym, scm_cdr (entry));
     }
-  return false;
 }
 
+/* Add the properties, one by one for each Script.  A little memory
+   could be saved by tacking the props onto the Script grob (i.e. make
+   ScriptStaccato , ScriptMarcato, etc. ).
+*/
 void
-Script_engraver::do_process_music()
+make_script_from_event (Grob *p, Context *tg,
+                        SCM art_type, int index)
 {
-  for (int i=0; i < script_req_l_arr_.size(); i++)
+  SCM alist = tg->get_property ("scriptDefinitions");
+  SCM art = scm_assoc (art_type, alist);
+
+  if (art == SCM_BOOL_F)
+    {
+      /* FIXME: */
+      warning (_ ("do not know how to interpret articulation:"));
+      warning (_ (" scheme encoding: "));
+      scm_write (art_type, scm_current_error_port ());
+      message ("");
+      return;
+    }
+
+  art = scm_cdr (art);
+
+  bool priority_found = false;
+
+  for (SCM s = art; scm_is_pair (s); s = scm_cdr (s))
+    {
+      SCM sym = scm_caar (s);
+      SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
+      if (!ly_is_procedure (type))
+        continue;
+
+      SCM val = scm_cdar (s);
+
+      if (sym == ly_symbol2scm ("script-priority"))
+        {
+          priority_found = true;
+          /* 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.  */
+          int prio = scm_to_int (val) + index;
+
+          val = scm_from_int (prio);
+        }
+
+      SCM preset = p->get_property_data (sym);
+      if (val == SCM_EOL
+          || scm_call_1 (type, preset) == SCM_BOOL_F)
+        p->set_property (sym, val);
+    }
+
+  if (!priority_found)
     {
-      Articulation_req* l=script_req_l_arr_[i];
-
-      SCM list = scm_assoc (ly_str02scm (l->articulation_str_.ch_C ()),
-			    scm_eval (ly_symbol2scm ("script-alist")));
-      
-      if (list == SCM_BOOL_F)
-	{
-	  l->warning (_f ("Don't know how to interpret articulation `%s'",
-			l->articulation_str_.ch_C ()));
-	  continue;
-	}
-      // todo -> use result of articulation-to-scriptdef directly as basic prop list.
-      Script *p =new Script (get_property ("basicScriptProperties"));
-      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);
-
-      
-      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);
-
-      if (!xaxis && follow_staff)
-	stafy.set_quantised (Y_AXIS);
-      
-      p->set_elt_property ("script-priority", priority);
-  
-      script_p_arr_.push (p);
-      
-      announce_element (Score_element_info (p, l));
+      p->set_property ("script-priority",
+                       scm_from_int (index));
     }
 }
 
 void
-Script_engraver::acknowledge_element (Score_element_info inf)
+Script_engraver::process_music ()
 {
-  bool them_grace = to_boolean (inf.elem_l_->get_elt_property ("grace"));
-  bool us_grace = to_boolean (get_property ("weAreGraceContext"));
+  for (vsize i = 0; i < scripts_.size (); i++)
+    {
+      Stream_event *ev = scripts_[i].event_;
 
-  if (us_grace != them_grace)
-    return;
-  
-  if (Stem *s = dynamic_cast<Stem*>(inf.elem_l_))
+      Grob *p = make_item ("Script", ev->self_scm ());
+
+      make_script_from_event (p, context (),
+                              ev->get_property ("articulation-type"),
+                              i);
+
+      scripts_[i].script_ = p;
+
+      SCM force_dir = ev->get_property ("direction");
+      if (is_direction (force_dir) && to_dir (force_dir))
+        p->set_property ("direction", force_dir);
+    }
+}
+
+void
+Script_engraver::acknowledge_stem (Grob_info info)
+{
+  for (vsize i = 0; i < scripts_.size (); i++)
+    {
+      Grob *e = scripts_[i].script_;
+
+      if (to_dir (e->get_property ("side-relative-direction")))
+        e->set_object ("direction-source", info.grob ()->self_scm ());
+
+      Side_position_interface::add_support (e, info.grob ());
+    }
+}
+
+void
+Script_engraver::acknowledge_stem_tremolo (Grob_info info)
+{
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
-      for (int i=0; i < script_p_arr_.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_;
+      Side_position_interface::add_support (e, info.grob ());
     }
-  else if (Rhythmic_head * rh = dynamic_cast<Rhythmic_head*>(inf.elem_l_))
+}
+
+void
+Script_engraver::acknowledge_tie (Grob_info info)
+{
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
-      for (int i=0; i < script_p_arr_.size(); i++)
-	{
-	  Side_position_interface stafy(script_p_arr_[i]);
-	  
-	  if (!stafy.elt_l_->parent_l (X_AXIS))
-	    {
-	      stafy.elt_l_->set_parent (inf.elem_l_, X_AXIS);
-	    }
-	  if (stafy.get_axis () == X_AXIS
-	      && !stafy.elt_l_->parent_l (Y_AXIS))
-	    stafy.elt_l_->set_parent (rh, Y_AXIS);
-	  
-	  stafy.add_support (rh);
-	}
-    }  
+      Grob *e = scripts_[i].script_;
+      Side_position_interface::add_support (e, info.grob ());
+    }
 }
 
 void
-Script_engraver::do_pre_move_processing()
+Script_engraver::acknowledge_end_tie (Grob_info info)
 {
-  for (int i=0; i < script_p_arr_.size(); i++) 
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
-      Script * sc = script_p_arr_[i];
-      if (to_boolean (sc->remove_elt_property ("staff-support")))
-	{
-	  Side_position_interface (sc).add_staff_support ();
-	}
-      typeset_element (sc);
+      Grob *e = scripts_[i].script_;
+      Side_position_interface::add_support (e, info.grob ());
     }
-  script_p_arr_.clear();
 }
 
 void
-Script_engraver::do_post_move_processing()
+Script_engraver::acknowledge_inline_accidental (Grob_info info)
 {
-  script_req_l_arr_.clear();
+  for (vsize i = 0; i < scripts_.size (); i++)
+    {
+      Grob *e = scripts_[i].script_;
+      Side_position_interface::add_support (e, info.grob ());
+    }
 }
 
-ADD_THIS_TRANSLATOR(Script_engraver);
+void
+Script_engraver::acknowledge_rhythmic_head (Grob_info info)
+{
+  if (info.event_cause ())
+    {
+      for (vsize i = 0; i < scripts_.size (); i++)
+        {
+          Grob *e = scripts_[i].script_;
+
+          if (Side_position_interface::get_axis (e) == X_AXIS
+              && !e->get_parent (Y_AXIS))
+            {
+              e->set_parent (info.grob (), Y_AXIS);
+            }
+          Side_position_interface::add_support (e, info.grob ());
+        }
+    }
+}
+
+void
+Script_engraver::acknowledge_note_column (Grob_info info)
+{
+  /* Make note column the parent of the script.  That is not
+     correct, but due to seconds in a chord, noteheads may be
+     swapped around horizontally.
+
+     As the note head to put it on is not known now, postpone this
+     decision to Script_interface::calc_direction ().  */
+  for (vsize i = 0; i < scripts_.size (); i++)
+    {
+      Grob *e = scripts_[i].script_;
+
+      if (!e->get_parent (X_AXIS)
+          && Side_position_interface::get_axis (e) == Y_AXIS)
+        e->set_parent (info.grob (), X_AXIS);
+    }
+}
+
+void
+Script_engraver::stop_translation_timestep ()
+{
+  scripts_.clear ();
+}
+
+ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Script_engraver, stem);
+ADD_ACKNOWLEDGER (Script_engraver, tie);
+ADD_END_ACKNOWLEDGER (Script_engraver, tie);
+ADD_ACKNOWLEDGER (Script_engraver, note_column);
+ADD_ACKNOWLEDGER (Script_engraver, stem_tremolo);
+ADD_ACKNOWLEDGER (Script_engraver, inline_accidental);
+
+ADD_TRANSLATOR (Script_engraver,
+                /* doc */
+                "Handle note scripted articulations.",
+
+                /* create */
+                "Script ",
 
+                /* read */
+                "scriptDefinitions ",
 
+                /* write */
+                ""
+               );