release: 0.1.32

[lilypond.git] / lily / score-align-gravs.cc

diff --git a/lily/score-align-gravs.cc b/lily/score-align-gravs.cc
index 236ca211ef9b22f99bb4bac563fa81eb11cf793b..28bb70bcc81473a935fe7a76464fc0f6e6c2c673 100644 (file)
--- a/lily/score-align-gravs.cc
+++ b/lily/score-align-gravs.cc
@@ -11,23 +11,25 @@
 #include "meter.hh"
 #include "bar.hh"
 #include "score-align-grav.hh"
+#include "score-bar.hh"
+#include "normal-bar.hh"
 
-#define IMPLEMENT_ALIGN_REG(C,T,p)\
-class C ## _align_engraver : public Score_align_engraver               \
+#define IMPLEMENT_ALIGN_GRAV(C,T,p)\
+class C ## _align_engraver : public Type_align_engraver                \
 {                                                                      \
 public:                                                                        \
-    NAME_MEMBERS();                                                    \
-    C ## _align_engraver() : Score_align_engraver() \
-    { type_ch_C_ = T::static_name();\
-    priority_i_ = p;}  \
+  DECLARE_MY_RUNTIME_TYPEINFO;                                 \
+  TRANSLATOR_CLONE(C ## _align_engraver);\
+  C ## _align_engraver() : Type_align_engraver () \
+  { type_ch_C_ = T::static_name();\
+  priority_i_ = p;}    \
 };                                                                     \
-IMPLEMENT_STATIC_NAME(C ## _align_engraver)    ;                       \
-ADD_THIS_ENGRAVER(C ## _align_engraver);                               \
-IMPLEMENT_IS_TYPE_B1(C ## _align_engraver, Score_align_engraver)       ;
+ADD_THIS_TRANSLATOR(C ## _align_engraver);                             \
+IMPLEMENT_IS_TYPE_B1(C ## _align_engraver, Type_align_engraver)        ;
 
 
-IMPLEMENT_ALIGN_REG(Key,Key_item,3);
-IMPLEMENT_ALIGN_REG(Clef,Clef_item,2);
-IMPLEMENT_ALIGN_REG(Meter,Meter,4);
-IMPLEMENT_ALIGN_REG(Bar, Bar,0);
-
+IMPLEMENT_ALIGN_GRAV(Key,Key_item,3);
+IMPLEMENT_ALIGN_GRAV(Clef,Clef_item,2);
+IMPLEMENT_ALIGN_GRAV(Normal_bar, Normal_bar,4);
+IMPLEMENT_ALIGN_GRAV(Meter,Meter,5);
+IMPLEMENT_ALIGN_GRAV(Score_bar, Score_bar,0);