* lily/include/engraver-group.hh: rename.

* lily/include/performer-group.hh: rename.

diff --git a/ChangeLog b/ChangeLog
index b41003fb8ac9c7be1a65944f197ebc0787396ea6..9a731beda70bdddf31dc743bd235810aba9af2c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/include/engraver-group.hh: rename.
+
+       * lily/include/performer-group.hh: rename.
+
 2005-08-18  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * input/test/script-abbreviations.ly: Removed some old LaTeX

diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 8e292eb1a29bc39f417901d955850f173839cce5..3f42004a51348a97cd3581ce7db04a1a2ad3b228 100644 (file)
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -14,7 +14,7 @@
 
 #include "staff-symbol-referencer.hh"
 #include "breathing-sign.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "item.hh"
 
 class Breathing_sign_engraver : public Engraver

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 9547d7abff2413924c1cc414472f05e9433690ae..2202efc6414b87a8b827663286a1555350316c56 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -10,7 +10,7 @@
 #include "repeated-music.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "warn.hh"
 #include "misc.hh"
 #include "spanner.hh"

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 738da30f81dbd9dad330dbe7e7e7da9e765d1c0c..8ae1f52b38fe8448747cea57d7d048e7fb678dd8 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -18,8 +18,8 @@
 #include "translator-group.hh"
 #include "warn.hh"
 
-#include "engraver-group-engraver.hh"
-#include "performer-group-performer.hh"
+#include "engraver-group.hh"
+#include "performer-group.hh"
 
 Context_def::Context_def ()
 {

diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index a3a5f99ec8335ea5e8c53476fc3d7ee9147ba588..6c2c4685fb5b6fb172d60a5533c867b842798700 100644 (file)
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -1,12 +1,12 @@
 /*
-  engraver-group-engraver.cc -- implement Engraver_group
+  engraver-group.cc -- implement Engraver_group
 
   source file of the GNU LilyPond music typesetter
 
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 
 #include "warn.hh"
 #include "paper-score.hh"

diff --git a/lily/include/engraver-group-engraver.hh b/lily/include/engraver-group-engraver.hh
deleted file mode 100644 (file)
index 0462922..0000000
--- a/lily/include/engraver-group-engraver.hh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  engraver-group-engraver.hh -- declare Engraver_group
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#ifndef ENGRAVERGROUP_HH
-#define ENGRAVERGROUP_HH
-
-#include "engraver.hh"
-#include "translator-group.hh"
-
-class Engraver_group : public virtual Translator_group
-{
-protected:
-  Array<Grob_info> announce_infos_;
-  SCM acknowledge_hash_table_;
-public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group);
-  Engraver_group ();
-  virtual void derived_mark () const;
-  void do_announces ();
-  virtual void announce_grob (Grob_info);
-  int pending_grob_count () const;
-private:
-  virtual void acknowledge_grobs ();
-};
-
-typedef void (Engraver:: *Engraver_method) (void);
-
-void engraver_each (SCM list, Engraver_method method);
-
-#endif // ENGRAVERGROUP_HH
-
-

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
new file mode 100644 (file)
index 0000000..3e61dad
--- /dev/null
+++ b/lily/include/engraver-group.hh
@@ -0,0 +1,37 @@
+/*
+  engraver-group.hh -- declare Engraver_group
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#ifndef ENGRAVER_GROUP_HH
+#define ENGRAVER_GROUP_HH
+
+#include "engraver.hh"
+#include "translator-group.hh"
+
+class Engraver_group : public virtual Translator_group
+{
+protected:
+  Array<Grob_info> announce_infos_;
+  SCM acknowledge_hash_table_;
+public:
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group);
+  Engraver_group ();
+  virtual void derived_mark () const;
+  void do_announces ();
+  virtual void announce_grob (Grob_info);
+  int pending_grob_count () const;
+private:
+  virtual void acknowledge_grobs ();
+};
+
+typedef void (Engraver:: *Engraver_method) (void);
+
+void engraver_each (SCM list, Engraver_method method);
+
+#endif // ENGRAVERGROUP_HH
+
+

diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh
deleted file mode 100644 (file)
index 07baa64..0000000
--- a/lily/include/performer-group-performer.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  performer-group-performer.hh -- declare Performer_group
-
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-
-#ifndef PERFORMER_GROUP_PERFORMER_HH
-#define PERFORMER_GROUP_PERFORMER_HH
-
-#include "performer.hh"
-#include "translator-group.hh"
-
-typedef void (Performer:: *Performer_method) (void);
-
-class Performer_group : public virtual Translator_group
-{
-public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Performer_group);
-
-  void do_announces ();
-  virtual void announce_element (Audio_element_info);
-  virtual void play_element (Audio_element *p);
-  virtual int get_tempo () const;
-
-protected:
-  Array<Audio_element_info> announce_infos_;
-
-private:
-  void acknowledge_audio_elements ();
-};
-
-void performer_each (SCM list, Performer_method method);
-
-#endif // PERFORMER_GROUP_PERFORMER_HH
-

diff --git a/lily/include/performer-group.hh b/lily/include/performer-group.hh
new file mode 100644 (file)
index 0000000..07baa64
--- /dev/null
+++ b/lily/include/performer-group.hh
@@ -0,0 +1,36 @@
+/*
+  performer-group-performer.hh -- declare Performer_group
+
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#ifndef PERFORMER_GROUP_PERFORMER_HH
+#define PERFORMER_GROUP_PERFORMER_HH
+
+#include "performer.hh"
+#include "translator-group.hh"
+
+typedef void (Performer:: *Performer_method) (void);
+
+class Performer_group : public virtual Translator_group
+{
+public:
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Performer_group);
+
+  void do_announces ();
+  virtual void announce_element (Audio_element_info);
+  virtual void play_element (Audio_element *p);
+  virtual int get_tempo () const;
+
+protected:
+  Array<Audio_element_info> announce_infos_;
+
+private:
+  void acknowledge_audio_elements ();
+};
+
+void performer_each (SCM list, Performer_method method);
+
+#endif // PERFORMER_GROUP_PERFORMER_HH
+

diff --git a/lily/include/recording-group-engraver.hh b/lily/include/recording-group-engraver.hh
index e582b5eeb1daaab2abb34db97a09cbd376e8e8f3..4faa02b6431e5b5ae195fd567a97db89a3031a45 100644 (file)
--- a/lily/include/recording-group-engraver.hh
+++ b/lily/include/recording-group-engraver.hh
@@ -9,7 +9,7 @@
 #ifndef RECORDING_GROUP_ENGRAVER_HH
 #define RECORDING_GROUP_ENGRAVER_HH
 
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 
 class Recording_group_engraver : public Engraver_group
 {

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 56976d7dd5d6386a40f4f066f3f34a5e7ba95415..fdd89da74fd459d2311ff16e7bb9303ef128f491 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -9,7 +9,7 @@
 #ifndef SCORE_ENGRAVER_HH
 #define SCORE_ENGRAVER_HH
 
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "score-translator.hh"
 
 class Score_engraver : public virtual Score_translator,

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 209b597bfef69eef1b64fd5a72a066ca36b9becd..2e4bae6f27e9395bddc6ee78434735bb44daefd0 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -10,7 +10,7 @@
 
 #include "bar-line.hh"
 #include "context.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "item.hh"
 #include "warn.hh"
 #include "text-interface.hh"

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index f5b782d0ad9cd67e6efc5ba2c25516817d6181d4..004b8f762226661b28d1ac14b24f1831014d38a0 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -7,7 +7,7 @@
 
 #include "multi-measure-rest.hh"
 #include "paper-column.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "moment.hh"

diff --git a/lily/performer.cc b/lily/performer.cc
index 45ade53504fe920a79020787ae95b76905bce01d..9cb80f34f512a2feec73a4462ad0404a07c4b89d 100644 (file)
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -8,7 +8,7 @@
 */
 
 #include "context.hh"
-#include "performer-group-performer.hh"
+#include "performer-group.hh"
 #include "warn.hh"
 
 void

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index a7e51ea6293146cb65999bd10b24854f5d69149c..21af00155aeed55017f82bf9353f0f649369465c 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -10,7 +10,7 @@
 #include "audio-column.hh"
 #include "audio-item.hh"
 #include "audio-staff.hh"
-#include "performer-group-performer.hh"
+#include "performer-group.hh"
 #include "context.hh"
 
 /** Perform a staff. Individual notes should have their instrument

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 99881bf6d14565d8e1fd6aa69bfb5b12ec921cbb..52cf5e73fbda8ff5bf66463053f35a981154f023 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -8,7 +8,7 @@
 
 #include "time-signature.hh"
 #include "warn.hh"
-#include "engraver-group-engraver.hh"
+#include "engraver-group.hh"
 #include "misc.hh"
 
 /**

diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc
index 0f9656d8cd9c242c9b7eb078b9e716c53bade54c..0d5488cf77e3f200594b5f6bfc934aa4e4e228e6 100644 (file)
--- a/lily/translator-group-ctors.cc
+++ b/lily/translator-group-ctors.cc
@@ -8,8 +8,8 @@
 
 #include "score-engraver.hh"
 #include "score-performer.hh"
-#include "engraver-group-engraver.hh"
-#include "performer-group-performer.hh"
+#include "engraver-group.hh"
+#include "performer-group.hh"
 #include "recording-group-engraver.hh"
 #include "warn.hh"