* stepmake/stepmake/install-targets.make (local-uninstall): idem.

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

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index e818c9d48280d1af427768e19dd142e6a0435ee8..65de9a73dcff7460b0048ae72b713a03b9edacd5 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
@@ -23,10 +23,8 @@ struct Script_tuple
 {
   Music *event_;
   Grob *script_;
-  bool follow_into_staff_;
   Script_tuple ()
   {
-    follow_into_staff_ = false;
     event_ = 0;
     script_ = 0;
   }
@@ -39,13 +37,14 @@ class Script_engraver : public Engraver
 
 protected:
   virtual bool try_music (Music *);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
 
-  DECLARE_ACKNOWLEDGER( slur);
-  DECLARE_ACKNOWLEDGER( rhythmic_head);
-  DECLARE_ACKNOWLEDGER( stem);
-  DECLARE_ACKNOWLEDGER( note_column);
+  DECLARE_ACKNOWLEDGER (slur);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (stem_tremolo);
+  DECLARE_ACKNOWLEDGER (note_column);
 
 public:
   TRANSLATOR_DECLARATIONS (Script_engraver);
@@ -92,7 +91,7 @@ copy_property (Grob *g, SCM sym, SCM alist)
    could be saved by tacking the props onto the Script grob (i.e. make
    ScriptStaccato , ScriptMarcato, etc. ).
 */
-void make_script_from_event (Grob *p, bool *follow, Context *tg,
+void make_script_from_event (Grob *p,  Context *tg,
                             SCM art_type, int index)
 {
   SCM alist = tg->get_property ("scriptDefinitions");
@@ -110,10 +109,6 @@ void make_script_from_event (Grob *p, bool *follow, Context *tg,
 
   art = scm_cdr (art);
 
-  SCM follow_scm = scm_assoc (ly_symbol2scm ("follow-into-staff"),
-                             art);
-
-  *follow = scm_is_pair (follow_scm) && to_boolean (scm_cdr (follow_scm));
   bool priority_found = false;
 
   for (SCM s = art; scm_is_pair (s); s = scm_cdr (s))
@@ -133,16 +128,19 @@ void make_script_from_event (Grob *p, bool *follow, Context *tg,
             to the head.  */
          int prio = scm_to_int (val) + index;
 
-         val = scm_int2num (prio);
+         val = scm_from_int (prio);
        }
-      if (p->internal_get_property (sym) == SCM_EOL)
+
+      SCM preset = p->get_property_data (sym);
+      if (val == SCM_EOL
+         || scm_call_1 (type, preset) == SCM_BOOL_F)
        p->internal_set_property (sym, val);
     }
 
   if (!priority_found)
     {
       p->set_property ("script-priority",
-                      scm_int2num (index));
+                      scm_from_int (index));
     }
 
   Side_position_interface::set_axis (p, Y_AXIS);
@@ -151,25 +149,24 @@ void make_script_from_event (Grob *p, bool *follow, Context *tg,
 void
 Script_engraver::process_music ()
 {
-  for (int i = 0; i < scripts_.size(); i++)
-     {
-      Music *m = scripts_[i].event_;
+  for (int i = 0; i < scripts_.size (); i++)
+    {
+      Music *music = scripts_[i].event_;
 
-      Grob *p = make_item ("Script", m->self_scm ());
+      Grob *p = make_item ("Script", music->self_scm ());
 
-      make_script_from_event (p, &scripts_[i].follow_into_staff_, context (),
-                             m->get_property ("articulation-type"),
+      make_script_from_event (p, context (),
+                             music->get_property ("articulation-type"),
                              i);
 
       scripts_[i].script_ = p;
 
-      SCM force_dir = m->get_property ("direction");
+      SCM force_dir = music->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)
 {
@@ -181,18 +178,28 @@ Script_engraver::acknowledge_stem (Grob_info info)
       if (to_dir (e->get_property ("side-relative-direction")))
        e->set_object ("direction-source", info.grob ()->self_scm ());
 
-      /* FIXME: add dependency */
-      e->add_dependency (info.grob ());
       Side_position_interface::add_support (e, info.grob ());
     }
 }
 
+void
+Script_engraver::acknowledge_stem_tremolo (Grob_info info)
+{
+  int script_count = scripts_.size ();
+  for (int i = 0; i < script_count; i++)
+    {
+      Grob *e = scripts_[i].script_;
+      Side_position_interface::add_support (e, info.grob ());
+    }
+}
+
+
 void
 Script_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if(info.music_cause ())
+  if (info.music_cause ())
     {
-     for (int i = 0; i < scripts_.size(); i++)
+      for (int i = 0; i < scripts_.size (); i++)
        {
          Grob *e = scripts_[i].script_;
 
@@ -200,7 +207,6 @@ Script_engraver::acknowledge_rhythmic_head (Grob_info info)
              && !e->get_parent (Y_AXIS))
            {
              e->set_parent (info.grob (), Y_AXIS);
-             e->add_dependency (info.grob ());
            }
          Side_position_interface::add_support (e, info.grob ());
        }
@@ -215,9 +221,8 @@ Script_engraver::acknowledge_note_column (Grob_info info)
      swapped around horizontally.
 
      As the note head to put it on is not known now, postpone this
-     decision to Script_interface::before_line_breaking ().  */
-  
-  for (int i = 0; i < scripts_.size(); i++)
+     decision to Script_interface::calc_direction ().  */
+  for (int i = 0; i < scripts_.size (); i++)
     {
       Grob *e = scripts_[i].script_;
 
@@ -226,7 +231,7 @@ Script_engraver::acknowledge_note_column (Grob_info info)
        e->set_parent (info.grob (), X_AXIS);
     }
 }
- 
+
 void
 Script_engraver::acknowledge_slur (Grob_info info)
 {
@@ -236,29 +241,20 @@ Script_engraver::acknowledge_slur (Grob_info info)
 void
 Script_engraver::stop_translation_timestep ()
 {
-  int script_count = scripts_.size ();
-  for (int i = 0; i < script_count; i++)
-    if (scripts_[i].follow_into_staff_)
-      {
-       Grob *sc = scripts_[i].script_;
-       sc->add_offset_callback (Side_position_interface
-                                ::quantised_position_proc, Y_AXIS);
-       sc->set_property ("staff-padding", SCM_EOL);
-      }
-
   scripts_.clear ();
 }
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Script_engraver, slur);
-ADD_ACKNOWLEDGER(Script_engraver, rhythmic_head);
-ADD_ACKNOWLEDGER(Script_engraver, stem);
-ADD_ACKNOWLEDGER(Script_engraver, note_column);
+ADD_ACKNOWLEDGER (Script_engraver, slur);
+ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Script_engraver, stem);
+ADD_ACKNOWLEDGER (Script_engraver, note_column);
+ADD_ACKNOWLEDGER (Script_engraver, stem_tremolo);
 
 ADD_TRANSLATOR (Script_engraver,
-               /* descr */ "Handles note scripted articulations.",
-               /* creats*/ "Script",
-               /* accepts */ "script-event articulation-event",
-               /* reads */ "scriptDefinitions",
+               /* doc */ "Handles note scripted articulations.",
+               /* create */ "Script",
+               /* accept */ "script-event articulation-event",
+               /* read */ "scriptDefinitions",
                /* write */ "");