* input/regression/chord-scripts.ly (texidoc): new file

* lily/new-fingering-engraver.cc (acknowledge_grob):  also handle
script-events.

* scm/script.scm (default-script-alist): cleanup.

* lily/script-engraver.cc (make_script_from_event): cleanup.

diff --git a/ChangeLog b/ChangeLog
index 258069066a6755a4836bc134e8e47db52f0e3648..b5d102354bc36eb4ec809e58220de2c11213a6b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/regression/chord-scripts.ly (texidoc): new file
+
+       * lily/new-fingering-engraver.cc (acknowledge_grob):  also handle
+       script-events.
+
        * scm/script.scm (default-script-alist): cleanup.
 
        * lily/script-engraver.cc (make_script_from_event): cleanup.

diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly
new file mode 100644 (file)
index 0000000..8e7e803
--- /dev/null
+++ b/input/regression/chord-scripts.ly
@@ -0,0 +1,20 @@
+\header {
+
+texidoc = "Scripts can also be attached to chord elements."
+
+}
+
+\score {
+    \notes \relative c''{
+       << c-.  >> 4
+       << c->  >> 4
+       << c-. e-. g-. b-. >>  
+       << c^^  >> 4
+       << c_^  >> 4
+       << c_^ e^^ >> 4
+       << c_^ e^^ >> 4
+
+
+    }
+
+}

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 15d3aa97f40f471ff5f4624276e0191bafb29168..5e98d24cc821bae12baa93b95f5050689697053f 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -16,16 +16,24 @@
 #include "rhythmic-head.hh"
 #include "self-alignment-interface.hh"
 #include "script.hh"
+#include "stem.hh"
 
 struct Finger_tuple
 {
   Grob *head_;
-  Grob *fingering_;
+  Grob *script_;
   Music *note_event_;
   Music *finger_event_;
-
+  SCM description_;
   int position_;
-  
+
+  Finger_tuple ()
+  {
+    position_ = 0;
+    head_ = script_ = 0;
+    note_event_ = finger_event_ = 0;
+    description_ = SCM_EOL;
+  }
   static int compare (Finger_tuple const & c1, Finger_tuple const & c2)
   {
     return c1.position_-  c2.position_;
@@ -36,12 +44,17 @@ struct Finger_tuple
 class New_fingering_engraver : public Engraver
 {
   Array<Finger_tuple> fingerings_;
+  Array<Finger_tuple> articulations_;
+  Link_array<Grob> heads_;
+  Grob *stem_;
+  
 public:
   TRANSLATOR_DECLARATIONS(New_fingering_engraver);
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
   void add_fingering (Grob*, Music*,Music*);
+  void add_script  (Grob*, Music*,Music*);
   void position_scripts();
 };
 
@@ -68,12 +81,38 @@ New_fingering_engraver::acknowledge_grob (Grob_info inf)
            }
          else if (m->is_mus_type ("script-event"))
            {
-
+             add_script (inf.grob_, m, note_ev);
            }
        }
+
+      heads_.push (inf.grob_);
+    }
+  else if (Stem::has_interface (inf.grob_))
+    {
+      stem_ = inf.grob_;
     }
 }
 
+extern Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event,
+                             int index);
+void
+New_fingering_engraver::add_script (Grob * head,
+                                   Music * event,
+                                   Music * head_event)
+{
+  Finger_tuple ft ;
+
+  ft.script_ =make_script_from_event (&ft.description_, daddy_trans_, event, 0);
+
+  articulations_.push (ft);
+  announce_grob (ft.script_, event->self_scm ());
+  
+ 
+  ft.script_->set_parent (head, X_AXIS);
+}
+                                   
+                                   
+
 void
 New_fingering_engraver::add_fingering (Grob * head,
                                       Music * event,
@@ -81,10 +120,10 @@ New_fingering_engraver::add_fingering (Grob * head,
 {
   Finger_tuple ft;
 
-  ft.fingering_ = new Item (get_property ("Fingering"));
-  announce_grob (ft.fingering_, event->self_scm());
-
-   Side_position_interface::add_support (ft.fingering_, head);
+  ft.script_ = new Item (get_property ("Fingering"));
+  announce_grob (ft.script_, event->self_scm());
+  
+  Side_position_interface::add_support (ft.script_, head);
 
   int d = gh_scm2int ( event->get_mus_property ("digit"));
   
@@ -104,7 +143,7 @@ New_fingering_engraver::add_fingering (Grob * head,
       event->origin()->warning (_("music for the martians."));
     }
   SCM sstr = scm_number_to_string (gh_int2scm (d), gh_int2scm (10)) ;
-  ft.fingering_->set_grob_property ("text", sstr);
+  ft.script_->set_grob_property ("text", sstr);
        
   ft.finger_event_ = event;
   ft.note_event_ = hevent;
@@ -126,8 +165,6 @@ New_fingering_engraver::position_scripts ()
     to the note head, and write a more flexible function for
     positioning the fingerings, setting both X and Y coordinates.
   */
-
-  
   for (int i = 0; i < fingerings_.size(); i++)
     {      
       fingerings_[i].position_ = gh_scm2int (fingerings_[i].head_ -> get_grob_property( "staff-position"));
@@ -168,7 +205,7 @@ New_fingering_engraver::position_scripts ()
   for (int i = 0; i < horiz.size(); i++)
     {
       Finger_tuple ft = horiz[i];
-      Grob* f = ft.fingering_;
+      Grob* f = ft.script_;
       f->set_parent (ft.head_, X_AXIS);
       f->set_parent (ft.head_, Y_AXIS);
       f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, Y_AXIS);
@@ -182,7 +219,7 @@ New_fingering_engraver::position_scripts ()
   for (int i = 0; i < up.size(); i++)
     {
       Finger_tuple ft = up[i];
-      Grob* f = ft.fingering_;
+      Grob* f = ft.script_;
       f->set_parent (ft.head_, X_AXIS);
       f->set_grob_property ("script-priority",
                            gh_int2scm (finger_prio + i));
@@ -199,7 +236,7 @@ New_fingering_engraver::position_scripts ()
   for (int i = 0; i < down.size(); i++)
     {
       Finger_tuple ft = down[i];
-      Grob* f =       ft.fingering_;
+      Grob* f = ft.script_;
       f->set_parent (ft.head_, X_AXIS);
       f->set_grob_property ("script-priority",
                            gh_int2scm (finger_prio + down.size() - i));
@@ -216,23 +253,45 @@ New_fingering_engraver::position_scripts ()
 void
 New_fingering_engraver::stop_translation_timestep ()
 {
-  if (!fingerings_.size ())
-    return;
+  if (fingerings_.size ())
+    {
+      position_scripts();
+        fingerings_.clear ();
+    }
+  
+  for (int i =  articulations_.size(); i--;)
+    {
+      Grob *sc = articulations_[i].script_;
+   
+      for (int j = heads_.size() ; j--;)
+       Side_position_interface::add_support (sc, heads_[j]);
 
-  position_scripts();
-  fingerings_.clear ();
+      if (stem_ && to_dir (sc->get_grob_property ("side-relative-direction")))
+       sc->set_grob_property ("direction-source", stem_->self_scm ());
+      
+      SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), articulations_[i].description_);
+      if (gh_pair_p (follow) && to_boolean (gh_cdr (follow)))
+       sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
+      else
+       Side_position_interface::add_staff_support (sc);
+      typeset_grob (sc);
+    }
+
+  stem_ = 0;
+  heads_.clear ();
+  articulations_.clear();
 }
 
 
 New_fingering_engraver::New_fingering_engraver()
 {
-  
+  stem_ = 0;  
 }
 
 ENTER_DESCRIPTION(New_fingering_engraver,
 /* descr */       "Create fingering-scripts for notes in a New Chord.",
 /* creats*/       "Fingering",
 /* accepts */     "text-script-event",
-/* acks  */      "rhythmic-head-interface stem-interface",
+/* acks  */       "rhythmic-head-interface stem-interface",
 /* reads */       "fingersHorizontal",
 /* write */       "");

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index eabe2f86bdd6bf31275f59af4eb607cc1e59079c..a8e21b965373d0d629c666d4aafed00758cd50b6 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -207,7 +207,7 @@ Script_engraver::stop_translation_timestep ()
 
       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::quntised_position_proc, Y_AXIS);
+       sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
       else
        Side_position_interface::add_staff_support (sc);
       typeset_grob (sc);

diff --git a/scm/script.scm b/scm/script.scm
index 1f58ab119c01a00893cc3bb08c51a89a9336c4f3..da60857e283906b1a1dd516d7df4c3ae4d1fa9d2 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -51,6 +51,7 @@
         ("lheel" .
          ((script-molecule . (feta . ("upedalheel" . "upedalheel")))
           (direction .  -1))
+         )
         ("rheel" .
          ((script-molecule . (feta . ("dpedalheel" . "dpedalheel")))
           (direction  . 1) ))