From 25287381f9e559292e4b3596214ae4ab1cfaf959 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 18 Aug 2005 15:34:32 +0000
Subject: [PATCH] * lily/include/engraver-group.hh: rename.

* lily/include/performer-group.hh: rename.
---
 ChangeLog                                                   | 6 ++++++
 lily/breathing-sign-engraver.cc                             | 2 +-
 lily/chord-tremolo-engraver.cc                              | 2 +-
 lily/context-def.cc                                         | 4 ++--
 lily/engraver-group.cc                                      | 4 ++--
 .../{engraver-group-engraver.hh => engraver-group.hh}       | 6 +++---
 .../{performer-group-performer.hh => performer-group.hh}    | 0
 lily/include/recording-group-engraver.hh                    | 2 +-
 lily/include/score-engraver.hh                              | 2 +-
 lily/mark-engraver.cc                                       | 2 +-
 lily/multi-measure-rest-engraver.cc                         | 2 +-
 lily/performer.cc                                           | 2 +-
 lily/staff-performer.cc                                     | 2 +-
 lily/time-signature-engraver.cc                             | 2 +-
 lily/translator-group-ctors.cc                              | 4 ++--
 15 files changed, 24 insertions(+), 18 deletions(-)
 rename lily/include/{engraver-group-engraver.hh => engraver-group.hh} (87%)
 rename lily/include/{performer-group-performer.hh => performer-group.hh} (100%)

diff --git a/ChangeLog b/ChangeLog
index b41003fb8a..9a731beda7 100644
--- 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 8e292eb1a2..3f42004a51 100644
--- 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 9547d7abff..2202efc641 100644
--- 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 738da30f81..8ae1f52b38 100644
--- 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 a3a5f99ec8..6c2c4685fb 100644
--- 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.hh
similarity index 87%
rename from lily/include/engraver-group-engraver.hh
rename to lily/include/engraver-group.hh
index 0462922a24..3e61dad3cd 100644
--- a/lily/include/engraver-group-engraver.hh
+++ b/lily/include/engraver-group.hh
@@ -1,13 +1,13 @@
 /*
-  engraver-group-engraver.hh -- declare Engraver_group
+  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 ENGRAVERGROUP_HH
-#define ENGRAVERGROUP_HH
+#ifndef ENGRAVER_GROUP_HH
+#define ENGRAVER_GROUP_HH
 
 #include "engraver.hh"
 #include "translator-group.hh"
diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group.hh
similarity index 100%
rename from lily/include/performer-group-performer.hh
rename to lily/include/performer-group.hh
diff --git a/lily/include/recording-group-engraver.hh b/lily/include/recording-group-engraver.hh
index e582b5eeb1..4faa02b643 100644
--- 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 56976d7dd5..fdd89da74f 100644
--- 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 209b597bfe..2e4bae6f27 100644
--- 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 f5b782d0ad..004b8f7622 100644
--- 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 45ade53504..9cb80f34f5 100644
--- 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 a7e51ea629..21af00155a 100644
--- 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 99881bf6d1..52cf5e73fb 100644
--- 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 0f9656d8cd..0d5488cf77 100644
--- 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"
 
-- 
2.39.5