release: 1.0.15

[lilypond.git] / lily / include / my-lily-parser.hh

diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh
index 04e187130503187385a04f6b63e876ef997da694..8024bb552ee63669fef34434cc8d70a20acec684 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -24,11 +24,11 @@ class My_lily_parser {
   Array<Input> define_spot_array_;
   String init_str_;
 
-  void add_requests (Chord*v);
+  void add_requests (Simultaneous_music*v);
 
-  Chord * get_note_element (Note_req * ,Duration *);
-  Chord* get_rest_element (String, Duration *);
-  Chord* get_word_element (String, Duration*);
+  Simultaneous_music * get_note_element (Note_req * ,Duration *);
+  Simultaneous_music* get_rest_element (String, Duration *);
+  Simultaneous_music* get_word_element (String, Duration*);
   Melodic_req* get_melodic_req (Melodic_req* melodic, int quotes);
   String notename_str (Melodic_req* melodic);
   void set_last_duration (Duration const *);
@@ -40,7 +40,7 @@ public:
   int default_abbrev_i_;
   Duration default_duration_;
   Plet plet_;
-  Header *default_header_p_;
+  Scope *default_header_p_;
     
   bool first_b_;
 
@@ -61,7 +61,6 @@ public:
   Midi_def*default_midi_p();
   void do_yyparse();
   void parser_error (String);
-  void clear_notenames();
 
   Array<Request*>* get_parens_request (int t);