Run `make grand-replace'.

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

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 7c05131a85f2164381d2c317cdeaa85ac91875c5..f460892c138124322ee6b6d3ea817b711a50caa7 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
@@ -38,14 +38,12 @@ struct Script_tuple
 class Script_engraver : public Engraver
 {
   vector<Script_tuple> scripts_;
-  Spanner *slur_;
 
 protected:
   void stop_translation_timestep ();
   void process_music ();
 
   DECLARE_TRANSLATOR_LISTENER (articulation);
-  DECLARE_ACKNOWLEDGER (slur);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   DECLARE_ACKNOWLEDGER (stem);
   DECLARE_ACKNOWLEDGER (stem_tremolo);
@@ -57,7 +55,6 @@ public:
 
 Script_engraver::Script_engraver ()
 {
-  slur_ = 0;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Script_engraver, articulation);
@@ -84,7 +81,7 @@ copy_property (Grob *g, SCM sym, SCM alist)
     {
       SCM entry = scm_assoc (sym, alist);
       if (scm_is_pair (entry))
-       g->internal_set_property (sym, scm_cdr (entry));
+       g->set_property (sym, scm_cdr (entry));
     }
 }
 
@@ -92,8 +89,9 @@ 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,  Context *tg,
-                            SCM art_type, int index)
+void
+make_script_from_event (Grob *p,  Context *tg,
+                       SCM art_type, int index)
 {
   SCM alist = tg->get_property ("scriptDefinitions");
   SCM art = scm_assoc (art_type, alist);
@@ -101,7 +99,7 @@ void make_script_from_event (Grob *p,  Context *tg,
   if (art == SCM_BOOL_F)
     {
       /* FIXME: */
-      warning (_ ("don't know how to interpret articulation: "));
+      warning (_ ("do not know how to interpret articulation: "));
       warning (_ ("scheme encoding: "));
       scm_write (art_type, scm_current_error_port ());
       message ("");
@@ -135,7 +133,7 @@ void make_script_from_event (Grob *p,  Context *tg,
       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);
+       p->set_property (sym, val);
     }
 
   if (!priority_found)
@@ -143,8 +141,6 @@ void make_script_from_event (Grob *p,  Context *tg,
       p->set_property ("script-priority",
                       scm_from_int (index));
     }
-
-  Side_position_interface::set_axis (p, Y_AXIS);
 }
 
 void
@@ -233,27 +229,27 @@ Script_engraver::acknowledge_note_column (Grob_info info)
     }
 }
 
-void
-Script_engraver::acknowledge_slur (Grob_info info)
-{
-  slur_ = info.spanner ();
-}
-
 void
 Script_engraver::stop_translation_timestep ()
 {
   scripts_.clear ();
 }
 
-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,
-               /* doc */ "Handles note scripted articulations.",
-               /* create */ "Script",
-               /* accept */ "script-event articulation-event",
-               /* read */ "scriptDefinitions",
-               /* write */ "");
+               /* doc */
+               "Handle note scripted articulations.",
+
+               /* create */
+               "Script ",
+
+               /* read */
+               "scriptDefinitions ",
+
+               /* write */
+               ""
+               );