lilypond-0.0.74pre

diff --git a/init/engraver.ini b/init/engraver.ini
index d0a6f457bc0639efd2b88f651f4c5697d91533ca..fac0e15c060cdb717c2ed758f2c3b4b81a0e18c9 100644 (file)
--- a/init/engraver.ini
+++ b/init/engraver.ini
@@ -2,19 +2,21 @@
 % setup for Request->Element conversion. Guru-only
 %
 
-\requestengraver {
-       "Score_engraver"
+\requesttranslator {
+       Engraver Score_engraver
        \alias "Score";
+
        \consists "Bar_align_engraver";
        \consists "Clef_align_engraver";
        \consists "Key_align_engraver";
        \consists "Meter_align_engraver";
        \consists "Score_horizontal_align_engraver";
+
        \consists "Vertical_align_engraver";
        \consists "Span_bar_engraver";
 
-       \contains\requestengraver {
-               "Staff_engravers"
+       \contains\requesttranslator {
+               Engraver "Staff_engravers"
                \alias "Staff";         
                \consists "Bar_engraver";
                \consists "Clef_engraver";
@@ -24,16 +26,16 @@
                \consists "Staff_sym_engraver";
                \consists "Collision_engraver";
                \consists "Rest_collision_engraver";
-               \contains \requestengraver {
-                        "Voice_group_engravers"
+               \contains \requesttranslator {
+                       Engraver  "Voice_group_engravers"
                        \alias "Voice_group";
                        \consists "Dynamic_engraver";
                        \consists "Stem_beam_engraver";
                        \consists "Script_engraver";
                        \consists "Note_column_engraver";
                        \consists "Slur_engraver";
-                       \contains \requestengraver {
-                               "Engraver_group_engraver"
+                       \contains \requesttranslator {
+                               Engraver "Engraver_group_engraver"
                                \alias "Voice";
                                \consists "Note_head_engraver" ;
                                \consists "Tie_engraver";
@@ -41,14 +43,14 @@
                }
        }
 
-       \contains\requestengraver {
-               "Staff_engravers"
+       \contains\requesttranslator {
+               Engraver "Staff_engravers"
                \alias "Lyric";
-               \contains\requestengraver{
-                       "Voice_group_engravers"
+               \contains\requesttranslator{
+                       Engraver "Voice_group_engravers"
                        \alias "Voice_group";
-                       \contains\requestengraver{
-                               "Engraver_group_engraver"
+                       \contains\requesttranslator{
+                               Engraver "Engraver_group_engraver"
                                \consists "Lyric_engraver";
                                \consists "Swallow_engraver";
                        }

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 9752fd75fc0568327228d8c22caf76644fb5f401..5047877145c457c238f3317375bd431e3b3aa064 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -147,13 +147,13 @@ struct c ## init {                                        \
        return new c;                                   \
     }                                                  \
     c ## init () {                                     \
-       add_Engraver(c::static_name(), globalctor);     \
+       add_engraver(c::static_name(), globalctor);     \
                                                        \
     }                                                  \
 } _ ## c ## init;
 
 typedef Engraver*(*Grav_ctor)(void);
-void add_Engraver(String s, Grav_ctor f);
+void add_engraver(String s, Grav_ctor f);
 
 #endif // ENGRAVER_HH
 

diff --git a/lily/include/todo-performer.hh b/lily/include/todo-performer.hh
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c0a0edb89ea1de7f2f773da199c91227622db99d..9792102b5a3a7c96c9975f983b22a8bd180debb4 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -38,7 +38,7 @@ static Keyword_ent the_key_tab[]={
     {"id", ID},
     {"in", IN_T},
     {"init_end", INIT_END},
-    {"requestengraver", REQUESTENGRAVER},
+    {"requesttranslator", REQUESTENGRAVER},
     {"lyric", LYRIC},
     {"key", KEY},
     {"melodic" , MELODIC},