patch::: 1.3.109.jcn1

1.3.109.jcn1
============

* Collapsed all ``void Foo::create_grobs () { deprecated_process_music
(); }'' occurences, and reactivated some disabled code (note-name,
chord-name, custos, lyrics).  Reactivated Timing_translator using
process_music ().

diff --git a/CHANGES b/CHANGES
index 07c400599bd868f7c6416e8c771d1b418be4f1d5..5f9ffa734c469f56888e620eb06b61324a6f0a1a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+1.3.109.jcn1
+============
+
+* Collapsed all ``void Foo::create_grobs () { deprecated_process_music
+(); }'' occurences, and reactivated some disabled code (note-name,
+chord-name, custos, lyrics).  Reactivated Timing_translator using
+process_music ().
+
 1.3.108.uu1
 ===========
 

diff --git a/VERSION b/VERSION
index b235fa36fab8f5b712b09e9e0d5ee972d580898c..cbd80a2211d18494f6ae3d50d6cd9dfe62d334e9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=109
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/grace.ly b/input/test/grace.ly
index a4c033c0ffdae12823829c00ad181ad803923971..ee5fe5da8e0adc76b00e0ef8b93455b84f4ab8ba 100644 (file)
--- a/input/test/grace.ly
+++ b/input/test/grace.ly
@@ -10,5 +10,5 @@
        \grace  { \property Grace.graceAlignPosition = \right c16} c4
 }
 \paper {linewidth = -1.;}
-%%\midi{ }
+\midi{ }
 }

diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc
index b59595a5aadcc331e8d7494629821f9bd7e31004..d2f56c2ef34128a3b42f05ee590faa65927a16af 100644 (file)
--- a/lily/a2-engraver.cc
+++ b/lily/a2-engraver.cc
@@ -22,7 +22,6 @@ public:
   VIRTUAL_COPY_CONS (Translator);
   
 protected:
-  void deprecated_process_music ();
   virtual void acknowledge_grob (Grob_info);
 
   virtual void create_grobs ();
@@ -43,7 +42,7 @@ A2_engraver::A2_engraver ()
 
 
 void
-A2_engraver::deprecated_process_music ()
+A2_engraver::create_grobs ()
 {
   if (!to_boolean (get_property ("combineParts")))
     return ;
@@ -161,12 +160,6 @@ A2_engraver::acknowledge_grob (Grob_info i)
     }
 }
 
-void
-A2_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
 void 
 A2_engraver::stop_translation_timestep ()
 {

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 4fad1f37c55542258f6147f20b7d9a291c35b723..d81996fd61634d87132ea2ab063e8478364073c8 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -28,7 +28,6 @@ public:
     
 protected:
   virtual void do_removal_processing ();
-  void deprecated_process_music();
   virtual void stop_translation_timestep();
   virtual void create_grobs ();
 
@@ -70,7 +69,7 @@ Bar_engraver::do_removal_processing ()
   modify whichBar in  deprecated_process_music () be typeset
 */
 void
-Bar_engraver::deprecated_process_music()
+Bar_engraver::create_grobs ()
 {
   if (!bar_p_ && gh_string_p (get_property ("whichBar")))
     {
@@ -78,12 +77,6 @@ Bar_engraver::deprecated_process_music()
     }
 }
 
-void
-Bar_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
 void
 Bar_engraver::typeset_bar ()
 {

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 5a32db34813848a62fb92c47c1900d3c32e59e02..1b4646f14ca6f2fd39eee5b937cb8758c1fdeaf2 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -29,14 +29,14 @@ protected:
   virtual void do_creation_processing ();
   virtual void create_grobs ();
   void create_items();
-  void  deprecated_process_music ();
+
 public:
   VIRTUAL_COPY_CONS(Translator);
   Bar_number_engraver();
 };
 
 void
-Bar_number_engraver::deprecated_process_music ()
+Bar_number_engraver::create_grobs ()
 {
   // todo include (&&!time->cadenza_b_ )
   SCM bn = get_property("currentBarNumber");
@@ -54,13 +54,6 @@ Bar_number_engraver::deprecated_process_music ()
     }
 }
 
-void
-Bar_number_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-
 ADD_THIS_TRANSLATOR(Bar_number_engraver);
 
 Bar_number_engraver::Bar_number_engraver ()

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index a49a2bb1f4737360e2dad20ba14dd04342fa4b2f..6724ac8b4b29af33a307b121d7b67584f92085bc 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -48,7 +48,7 @@ protected:
   virtual void create_grobs ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*);
-  void deprecated_process_music ();
+
 public:
   Beam_engraver ();
   VIRTUAL_COPY_CONS (Translator);
@@ -116,7 +116,7 @@ Beam_engraver::set_melisma (bool m)
 
 
 void
-Beam_engraver::deprecated_process_music ()
+Beam_engraver::create_grobs ()
 {
   if (reqs_drul_[STOP])
     {
@@ -228,13 +228,6 @@ Beam_engraver::do_removal_processing ()
     }
 }
 
-void
-Beam_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-
 void
 Beam_engraver::acknowledge_grob (Grob_info info)
 {

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 5a24b9c6c9f3513c321205e1f79843c09e64a39d..5e1c08fa2f6b29dac566f005b5e309dd309c2825 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -29,8 +29,7 @@ public:
   
 protected:
   virtual bool try_music (Music *req_l);
-  void deprecated_process_music();
-
+  virtual void create_grobs ();
   virtual void stop_translation_timestep();
   virtual void start_translation_timestep();
 
@@ -58,7 +57,7 @@ Breathing_sign_engraver::try_music (Music*r_l)
 }
 
 void
-Breathing_sign_engraver::deprecated_process_music()
+Breathing_sign_engraver::create_grobs ()
 {
   if(breathing_sign_req_l_ && ! breathing_sign_p_)
     {
@@ -68,6 +67,7 @@ Breathing_sign_engraver::deprecated_process_music()
       Breathing_sign::set_interface (breathing_sign_p_);
 
       announce_grob (breathing_sign_p_, breathing_sign_req_l_);
+      breathing_sign_req_l_ = 0;
     }
 }
 

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 7b72e3bc26464a322cf0840730681711492b3ddc..a8143f1845fd267b6d04a2411a05bbcf7179db7a 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -28,7 +28,7 @@ public:
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info i);
-  void deprecated_process_music ();
+  virtual void create_grobs ();
   virtual bool try_music (Music *);
 
 private:
@@ -77,24 +77,6 @@ Chord_name_engraver::try_music (Music* m)
   return false;
 }
 
-/* Uh, if we do acknowledge_grob, shouldn't we postpone
-  deprecated_process_music until do_process_acknowlegded?
-
-   Sigh, I can *never* remember how this works, can't we
-   possibly-please just number these functions:
-
-     do_creation0
-     
-     post_move1
-     try_music2
-  deprecated_process_music3 (or is it acknowledge_grob3 ?)
-     acknowledge_grob4
-  
-     do_pre_move9
-     
-     do_removal99
-
-  and what was the deal with this ``do'' prefix again? */
 void
 Chord_name_engraver::acknowledge_grob (Grob_info i)
 {
@@ -103,23 +85,10 @@ Chord_name_engraver::acknowledge_grob (Grob_info i)
 }
 
 void
-Chord_name_engraver::deprecated_process_music ()
+Chord_name_engraver::create_grobs ()
 {
   if (!chord_name_p_ && gh_car (chord_) != SCM_EOL)
     {
-#if 0
-      bool find_inversion_b = false;
-      SCM chord_inversion = get_property ("chordInversion");
-      if (gh_boolean_p (chord_inversion))
-       find_inversion_b = gh_scm2bool (chord_inversion);
-
-      chord_ = Chord::pitches_and_requests_to_chord (pitches_,
-                                                    inversion_,
-                                                    bass_,
-                                                    find_inversion_b);
-
-#endif
-      
       chord_name_p_ = new Item (get_property ("ChordName"));
       chord_name_p_->set_grob_property ("chord", chord_);
       announce_grob (chord_name_p_, 0);

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index a71c7f104156b153d4edfc850c2b52cdf4f6caab..6296b225fc95fe98bcefd3ce295a510ed8655937 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -58,7 +58,6 @@ protected:
   
 protected:
   virtual void do_removal_processing();
-  void deprecated_process_music();
   virtual bool try_music (Music*);
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep();
@@ -95,12 +94,6 @@ Chord_tremolo_engraver::try_music (Music * m)
 
 void
 Chord_tremolo_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Chord_tremolo_engraver::deprecated_process_music ()
 {
   if (repeat_ && !beam_p_)
     {

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index b0e1408229b634bb5dd6d774691049160f32bd8d..06758d262902a0758f9e731f92f5f53be35b1669 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -33,9 +33,7 @@ public:
   Direction octave_dir_;
 
 protected:
-  void deprecated_process_music ();
   virtual void stop_translation_timestep ();
-  virtual void do_creation_processing ();
   virtual void start_translation_timestep ();
   virtual void create_grobs ();
   virtual void acknowledge_grob (Grob_info);
@@ -114,7 +112,7 @@ Clef_engraver::set_glyph ()
 void
 Clef_engraver::acknowledge_grob (Grob_info info)
 {
-  deprecated_process_music ();
+  create_grobs ();
   Item * item =dynamic_cast <Item *> (info.elem_l_);
   if (item)
     {
@@ -145,13 +143,6 @@ Clef_engraver::acknowledge_grob (Grob_info info)
     } 
 }
 
-void
-Clef_engraver::do_creation_processing ()
-{
-}
-
-
-
 void
 Clef_engraver::create_clef ()
 {
@@ -185,12 +176,6 @@ Clef_engraver::create_clef ()
 
 void
 Clef_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Clef_engraver::deprecated_process_music ()
 {
   SCM glyph = get_property ("clefGlyph");
   SCM clefpos = get_property ("clefPosition");

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 63ae946016b860d42fdbb708b95a4c472d61ca15..4f8cbcf5e32177ab908a2e6e72d41bb91c4f23fb 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -26,7 +26,6 @@ public:
   Custos_engraver();
   virtual void start_translation_timestep();
   virtual void acknowledge_grob(Grob_info);
-  void deprecated_process_music ();
   virtual void create_grobs ();
   virtual void stop_translation_timestep ();
   virtual void do_removal_processing ();
@@ -67,16 +66,6 @@ Custos_engraver::start_translation_timestep ()
 }
 
 
-/*
-  TODO check if this works with forced bar lines?
- */
-void
-Custos_engraver::deprecated_process_music ()
-{
-  if (gh_string_p (get_property( "whichBar")))
-    custos_permitted = true;
-}
-
 void
 Custos_engraver::acknowledge_grob (Grob_info info)
 {
@@ -106,8 +95,9 @@ Custos_engraver::acknowledge_grob (Grob_info info)
 void
 Custos_engraver::create_grobs ()
 {
-  deprecated_process_music ();
-
+  if (gh_string_p (get_property( "whichBar")))
+    custos_permitted = true;
+  
   if (custos_permitted)
     {
       for (int i = pitches_.size (); i--;)

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 881eb90e572ea40fb803d7e9d0ab09b86af67381..278662636b3fe889ee930737c0248a47a4a42084 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -57,7 +57,6 @@ protected:
   virtual void do_removal_processing ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music *req_l);
-  void deprecated_process_music ();
   virtual void stop_translation_timestep ();
   virtual void create_grobs ();
   virtual void start_translation_timestep ();
@@ -122,7 +121,7 @@ Dynamic_engraver::try_music (Music * m)
 }
 
 void
-Dynamic_engraver::deprecated_process_music ()
+Dynamic_engraver::create_grobs ()
 {
   if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_)
     
@@ -286,12 +285,6 @@ Dynamic_engraver::stop_translation_timestep ()
   typeset_all ();
 }
 
-void
-Dynamic_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
 void
 Dynamic_engraver::do_removal_processing ()
 {

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 552a76982645fd1a89a3086e02da4496cec131a1..d69c38f0f5a77c24f1476c026f449bb01b645436 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -25,11 +25,9 @@ public:
   VIRTUAL_COPY_CONS (Translator);
   
   Dynamic_performer ();
-  ~Dynamic_performer ();
 
 protected:
   virtual bool try_music (Music* req_l);
-  void deprecated_process_music ();
   virtual void stop_translation_timestep ();
   virtual void create_grobs ();
 
@@ -46,13 +44,8 @@ Dynamic_performer::Dynamic_performer ()
   audio_p_ = 0;
 }
 
-Dynamic_performer::~Dynamic_performer ()
-{
-}
-
-
 void
-Dynamic_performer::deprecated_process_music ()
+Dynamic_performer::create_grobs ()
 {
   if (script_req_l_)
     {
@@ -119,12 +112,6 @@ Dynamic_performer::deprecated_process_music ()
     }
 }
 
-void
-Dynamic_performer::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
 void
 Dynamic_performer::stop_translation_timestep ()
 {

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 8128598f6bf5783d16b717b4ae240840f6666710..c82648d9f21d66826ec7ab139da14b4d0b4d2d11 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -39,7 +39,6 @@ public:
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void do_removal_processing();
-  void deprecated_process_music();
   virtual bool try_music (Music*);
   virtual void stop_translation_timestep();
   virtual void start_translation_timestep ();
@@ -103,12 +102,6 @@ Extender_engraver::do_removal_processing ()
 
 void
 Extender_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Extender_engraver::deprecated_process_music ()
 {
   if (req_l_ && ! extender_p_)
     {

diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index ebb56587badf27a00b5806e5a647c808f32677e0..224a517b6ee31dca46ee8190b18839f2d85659b8 100644 (file)
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -33,7 +33,6 @@ public:
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void do_removal_processing();
-  void deprecated_process_music();
   virtual bool try_music (Music*);
   virtual void stop_translation_timestep();
   virtual void start_translation_timestep ();
@@ -95,12 +94,6 @@ Hyphen_engraver::do_removal_processing ()
 
 void
 Hyphen_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Hyphen_engraver::deprecated_process_music ()
 {
   if (req_l_ &&! hyphen_p_)
     {

diff --git a/lily/include/lyric-engraver.hh b/lily/include/lyric-engraver.hh
index 455ed51d794329280e0d7c002a73dfccb8a17c11..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/lily/include/lyric-engraver.hh
+++ b/lily/include/lyric-engraver.hh
@@ -1,38 +0,0 @@
-/*
-  lyric-engraver.hh -- declare Lyric_engraver
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef LYRIC_ENGRAVER_HH
-#define LYRIC_ENGRAVER_HH
-
-#include "lily-proto.hh"
-#include "engraver.hh"
-#include "array.hh"
-
-/**
-   Generate texts for lyric syllables.  We only do one lyric at a time.  
-   Multiple copies of this engraver should be used to do multiple voices.
- */
-class Lyric_engraver : public Engraver 
-{
-protected:
-  virtual void stop_translation_timestep();
-  virtual bool try_music (Music*);
-  void deprecated_process_music();
-  virtual void start_translation_timestep ();
-public:
-  Lyric_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
-
-private:
-  Lyric_req * req_l_;
-  Item* text_p_;
-};
-
-
-#endif // LYRIC_ENGRAVER_HH

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index d78dce109f10bb5ed8504c151ec97070ea34c4aa..d55de124be91d0d8e53582a3ee76b5a6f0b8e9ce 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -27,9 +27,9 @@ public:
 protected: 
   virtual void do_creation_processing ();
   virtual bool try_music (Music *req_l);
-  void deprecated_process_music();
-  virtual void stop_translation_timestep();
-  virtual void start_translation_timestep();
+  virtual void process_music ();
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
 
 public:
   Moment measure_position () const;

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index ebe26164e4c0375ae82315b7c59e460a6ccaee4e..f37ef88881ad6e3cad64ddd62a2c3cfccefe80e5 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -40,7 +40,6 @@ protected:
   virtual void do_creation_processing();
   virtual void do_removal_processing ();
   virtual bool try_music (Music *req_l);
-  void deprecated_process_music();
   virtual void stop_translation_timestep();
   virtual void start_translation_timestep();
   virtual void create_grobs ();
@@ -130,12 +129,6 @@ Key_engraver::acknowledge_grob (Grob_info info)
 
 void
 Key_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Key_engraver::deprecated_process_music ()
 {
   if (keyreq_l_ || old_accs_ != get_property ("keySignature"))
     {

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 5c1117637ccff19369c6279a3ba2d63aa532a98d..9fff756edeb8fe086a349e49ab41d00422545f2c 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -7,13 +7,34 @@
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
+#include "engraver.hh"
 #include "musical-request.hh"
 #include "item.hh"
 #include "paper-def.hh"
 #include "font-metric.hh"
 #include "side-position-interface.hh"
 
+/**
+   Generate texts for lyric syllables.  We only do one lyric at a time.  
+   Multiple copies of this engraver should be used to do multiple voices.
+ */
+class Lyric_engraver : public Engraver 
+{
+protected:
+  virtual void stop_translation_timestep();
+  virtual bool try_music (Music *);
+  virtual void create_grobs ();
+  virtual void start_translation_timestep ();
+  
+public:
+  Lyric_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
+
+private:
+  Lyric_req * req_l_;
+  Item* text_p_;
+};
+
 ADD_THIS_TRANSLATOR (Lyric_engraver);
 
 
@@ -37,7 +58,7 @@ Lyric_engraver::try_music (Music*r)
 }
 
 void
-Lyric_engraver::deprecated_process_music()
+Lyric_engraver::create_grobs ()
 {
   if (req_l_)
     {

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index d872f5cc53c05d47456e4e9447c5933f52a657d8..d70766eb9ce6260cf550d3870ebc3cea722b2d8c 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -38,7 +38,6 @@ protected:
   virtual void acknowledge_grob (Grob_info);
   void create_items(Request*);
   virtual bool try_music (Music *req_l);
-  void deprecated_process_music ();
   virtual void start_translation_timestep ();
   virtual void do_creation_processing ();
   virtual void create_grobs ();
@@ -138,12 +137,6 @@ Mark_engraver::try_music (Music* r_l)
 
 void
 Mark_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Mark_engraver::deprecated_process_music ()
 {
   if (mark_req_l_)
     {

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 581b4453e84b15498ad504cfc4e8bc53d0c9a97a..f31b58d34f5c063a0c75e217222a78f664948a87 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -30,7 +30,6 @@ public:
 
 protected:
   virtual void acknowledge_grob (Grob_info i);
-  void deprecated_process_music ();
   virtual bool try_music (Music*);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
@@ -95,13 +94,6 @@ Multi_measure_rest_engraver::try_music (Music* req_l)
 
 void
 Multi_measure_rest_engraver::create_grobs ()
-{  
-  deprecated_process_music ();
-}
-
-
-void
-Multi_measure_rest_engraver::deprecated_process_music ()
 {
   if (new_req_l_ && stop_req_l_)
     stop_req_l_ = 0;

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 4b009d608135e91e2acce23c4813766cc01b4d9e..b791c222ff2e269052ced29881b32c4dbf06e9a9 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -25,25 +25,16 @@ class Note_heads_engraver : public Engraver
   Moment note_end_mom_;
 public:
   VIRTUAL_COPY_CONS(Translator);
-  Note_heads_engraver();
   
 protected:
   virtual void start_translation_timestep ();
   virtual bool try_music (Music *req_l) ;
   virtual void create_grobs ();
   virtual void acknowledge_grob (Grob_info) ;
-  void deprecated_process_music();
   virtual void stop_translation_timestep();
 };
 
 
-
-
-
-Note_heads_engraver::Note_heads_engraver()
-{
-}
-
 bool
 Note_heads_engraver::try_music (Music *m) 
 {
@@ -62,20 +53,14 @@ Note_heads_engraver::try_music (Music *m)
   
 }
 
-void
-Note_heads_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
 void
 Note_heads_engraver::acknowledge_grob (Grob_info)
 {
-  //deprecated_process_music ();
+  //create_grobs ();
 }
 
 void
-Note_heads_engraver::deprecated_process_music()
+Note_heads_engraver::create_grobs ()
 {
   if (note_p_arr_.size ())
     return ;

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 3a76ba6ae065efa21b9a3401eecb7036f3964f25..ed76699feb36fd0f87c57abeef760ba97e02a6cb 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -18,7 +18,7 @@ public:
   Link_array<Note_req> req_l_arr_;
   Link_array<Item> texts_;
   virtual bool  try_music (Music*m);
-  void deprecated_process_music ();
+  virtual void create_grobs ();
   virtual void stop_translation_timestep ();
 };
 
@@ -33,9 +33,8 @@ Note_name_engraver::try_music (Music *m)
   return false;
 }
 
-
 void
-Note_name_engraver::deprecated_process_music ()
+Note_name_engraver::create_grobs ()
 {
   if (texts_.size ())
     return;

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 9487b56ee5879b7b5c8d692fd0e28472a51df74a..599df04acefb2c974af77b3e96d402fbded6fb98 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -22,7 +22,8 @@ protected:
   virtual bool try_music (Music *);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  void deprecated_process_music ();
+  virtual void create_grobs ();
+
 public:
   
   VIRTUAL_COPY_CONS(Translator);
@@ -62,7 +63,7 @@ Rest_engraver::stop_translation_timestep ()
 }
 
 void
-Rest_engraver::deprecated_process_music ()
+Rest_engraver::create_grobs ()
 {
   if (rest_req_l_ && !rest_p_) 
     {

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 1eaea34a15c67158a7dda6264d264b5955eeaa36..93e25140b8797d27fefcf8606594cd2ce4fcf3d0 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -26,8 +26,8 @@ public:
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void create_grobs ();
-  virtual void  stop_translation_timestep ();
-  virtual void  start_translation_timestep ();
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
 };
 
 

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 20329c302f4eaa5a9d656b991b7c8be53590911f..6a1b4ad75e226d992226ce2b294e77b210c0b6a7 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -17,12 +17,11 @@ class Script_engraver : public Engraver {
   Link_array<Articulation_req> script_req_l_arr_;
 
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Script_engraver();
+  VIRTUAL_COPY_CONS (Translator);
+
 protected:
   virtual bool try_music (Music*);
-  void deprecated_process_music ();
+  virtual void do_creation_processing ();
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void create_grobs ();
@@ -30,9 +29,10 @@ protected:
 };
 
 
-Script_engraver::Script_engraver()
+void
+Script_engraver::do_creation_processing ()
 {
-  start_translation_timestep();
+  script_req_l_arr_.clear();
 }
 
 bool
@@ -53,12 +53,6 @@ Script_engraver::try_music (Music *r_l)
 
 void
 Script_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Script_engraver::deprecated_process_music()
 {
   for (int i=0; i < script_req_l_arr_.size(); i++)
     {
@@ -181,6 +175,6 @@ Script_engraver::start_translation_timestep()
   script_req_l_arr_.clear();
 }
 
-ADD_THIS_TRANSLATOR(Script_engraver);
+ADD_THIS_TRANSLATOR (Script_engraver);
 
 

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 09cecda14e2344c07364a1c2b874010e9cd6452b..61f2e3e4b5f1d322df126d0a9642e7007bcfe5a7 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -25,7 +25,6 @@ class Slur_engraver : public Engraver
 
 protected:
   virtual bool try_music (Music*);
-  void deprecated_process_music ();
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
@@ -87,12 +86,6 @@ Slur_engraver::try_music (Music *req_l)
   return false;
 }
 
-void
-Slur_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
 void
 Slur_engraver::set_melisma (bool m)
 {
@@ -137,7 +130,7 @@ Slur_engraver::do_removal_processing ()
 }
 
 void
-Slur_engraver::deprecated_process_music ()
+Slur_engraver::create_grobs ()
 {
   Link_array<Grob> start_slur_l_arr;
   for (int i=0; i< new_slur_req_l_arr_.size (); i++)

diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index 9f6d490feeab5dc5370fbccc65931c81aaaa7970..ff0ea71474c8a1803d79d387bec727db97076f8a 100644 (file)
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -31,7 +31,6 @@ protected:
   virtual bool try_music (Music*);
   virtual void acknowledge_grob (Audio_element_info);
   virtual void create_grobs ();
-  void deprecated_process_music ();
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
 
@@ -67,7 +66,7 @@ Span_dynamic_performer::acknowledge_grob (Audio_element_info i)
 }
 
 void
-Span_dynamic_performer::deprecated_process_music ()
+Span_dynamic_performer::create_grobs ()
 {
   if (span_start_req_l_ || span_req_l_drul_[START])
     {
@@ -106,26 +105,22 @@ Span_dynamic_performer::deprecated_process_music ()
       Audio_dynamic_tuple a = { audio_p_, now_mom () };
       dynamic_tuple_arr_.push (a);
     }
-}
 
-void
-Span_dynamic_performer::create_grobs ()
-{
-  deprecated_process_music ();
-  if (span_req_l_drul_[STOP])
-   { 
-     finished_dynamic_tuple_arr_.top ().audio_l_->volume_ = last_volume_;
-   }
 
+  if (span_req_l_drul_[STOP])
+    { 
+      finished_dynamic_tuple_arr_.top ().audio_l_->volume_ = last_volume_;
+    }
+  
   if (span_req_l_drul_[START])
     {
-     dynamic_tuple_arr_[0].audio_l_->volume_ = last_volume_;
+      dynamic_tuple_arr_[0].audio_l_->volume_ = last_volume_;
     }
   span_start_req_l_ = 0;
   span_req_l_drul_[START] = 0;
   span_req_l_drul_[STOP] = 0;
 }
-  
+
 void
 Span_dynamic_performer::stop_translation_timestep ()
 {

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index e4381f941c59d5682d13cbe7e6744834e479dd90..72c922af9c5734862390b231dfe05963e4cda4cb 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -85,7 +85,6 @@ Staff_performer::create_grobs ()
       instrument_p_ = new Audio_instrument (str);
       announce_element (Audio_element_info (instrument_p_, 0));
     }
-  //Performer_group_performer::deprecated_process_music ();
 }
 
 void

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 05b078285da0f39c4b7e5b6218008cce0506f91a..b58467b0160608d58dc1de4871fd4029dbdabd32 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -30,7 +30,6 @@ protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void create_grobs ();
-  void deprecated_process_music ();
   virtual void acknowledge_grob (Grob_info);
 };
 
@@ -79,12 +78,6 @@ Text_engraver::acknowledge_grob (Grob_info inf)
 
 void
 Text_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Text_engraver::deprecated_process_music ()
 {
   if (texts_.size ())
     return;

diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index 1a8280ab813a5ee61e417ca6d56cb357045d4ec5..4d9f20d2b2d531585d9a5131a5c1380b55b7e2fb 100644 (file)
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -29,7 +29,6 @@ protected:
   virtual void do_removal_processing ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music *);
-  void deprecated_process_music ();
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void create_grobs ();
@@ -86,12 +85,6 @@ Text_spanner_engraver::try_music (Music *m)
 
 void
 Text_spanner_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Text_spanner_engraver::deprecated_process_music ()
 {
   /////
   if (req_drul_[STOP])

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 6edbf83333dbd9bc4d3f10e89de9080c0db23889..685806ff95db53709fc5c423015b002b5a24e5d6 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -39,8 +39,10 @@ inline int compare (CNote_melodic_tuple const &a, CNote_melodic_tuple const &b)
 class Tie_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONS (Translator);
 
+  Tie_performer ();
+  
 private:
   bool done_;
   PQueue<CNote_melodic_tuple> past_notes_pq_;
@@ -50,6 +52,7 @@ private:
   Link_array<Audio_tie> tie_p_arr_;
   
 protected:
+  virtual void do_creation_processing ();
   virtual void start_translation_timestep ();
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Audio_element_info);
@@ -59,6 +62,24 @@ protected:
 
 ADD_THIS_TRANSLATOR (Tie_performer);
 
+
+Tie_performer::Tie_performer ()
+{
+  // URG
+  // if we don't do this, lily dumps core
+  // which means that ``do_creation_processing'' and
+  // ``start_translation_timestep'' did not happen?!
+  do_creation_processing ();
+}
+
+void
+Tie_performer::do_creation_processing ()
+{
+  req_l_ = 0;
+  done_ = false;
+}
+
+
 bool
 Tie_performer::try_music (Music *m)
 {

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 9efa2fd4b55f6ac35ce64e1546b4ec425fc42724..b66c23ac3f99042080861a4c0658531c35c13c5d 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -31,7 +31,7 @@ Timing_translator::try_music (Music*r)
 }
 
 void
-Timing_translator::deprecated_process_music()
+Timing_translator::process_music()
 {
   if (check_ && measure_position ())
     {

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 042541746e261c960b2c7348ac9ada0ae16af369..542b0f7ae4e410ce2ddf3f952e0233e40569adfb 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -35,7 +35,6 @@ protected:
   virtual void do_removal_processing ();
   virtual void acknowledge_grob (Grob_info);
   virtual bool try_music (Music*r);
-  void deprecated_process_music ();
   virtual void start_translation_timestep ();
   virtual void create_grobs ();
 };
@@ -65,12 +64,6 @@ Tuplet_engraver::try_music (Music *r)
 
 void
 Tuplet_engraver::create_grobs ()
-{
-  deprecated_process_music ();
-}
-
-void
-Tuplet_engraver::deprecated_process_music ()
 {
   SCM v = get_property ("tupletInvisible");
   if (to_boolean (v))