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 766906c282e804c63052ed9a493222402c2ace8a..8024bb552ee63669fef34434cc8d70a20acec684 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -3,47 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef MY_LILY_PARSER_HH
 #define MY_LILY_PARSER_HH
 #include "lily-proto.hh"
-#include "duration.hh"
 #include "string.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "lily-proto.hh"
 #include "lily-proto.hh"
 #include "duration.hh"
 #include "string.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "input.hh"
 
 class My_lily_parser {
-  char const* here_ch_C()const;
+  char const* here_ch_C() const;
   Array<Input> define_spot_array_;
   String init_str_;
 
-  void add_requests (Chord*v);
-
-  Chord * get_note_element (Note_req * ,Duration *);
-  Chord* get_rest_element (String,Duration *);
-  Chord* get_word_element (Text_def*, Duration*);
+  void add_requests (Simultaneous_music*v);
 
+  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 *);
-  void set_default_duration (Duration const *);
-  void set_duration_mode (String s);
+  void set_abbrev_beam (int type_i);
   friend int yyparse (void*);
+
 public:
-  int default_octave_i_;
+  int abbrev_beam_type_i_;
+  int default_abbrev_i_;
   Duration default_duration_;
   Plet plet_;
-  Header *default_header_p_;
+  Scope *default_header_p_;
     
-  String textstyle_str_;
   bool first_b_;
-  bool last_duration_mode_b_ ;
+
   Array<Request*> pre_reqs, post_reqs;
   int fatal_error_i_;
   Sources * source_l_;
@@ -52,22 +52,20 @@ public:
   My_lily_lexer * lexer_p_;
  
   Moment plet_mom();
-  void add_notename (String, Melodic_req* req_p);
-  Input here_input()const;
+  void add_notename (String, Musical_pitch req_p);
+  Input here_input() const;
   void remember_spot();
   Input pop_spot();
     
-  Paper_def*default_paper();
-  Midi_def*default_midi();
+  Paper_def*default_paper_p();
+  Midi_def*default_midi_p();
   void do_yyparse();
   void parser_error (String);
-  void clear_notenames();
 
-  Request* get_parens_request (char c);
+  Array<Request*>* get_parens_request (int t);
     
   void set_debug();
   void set_yydebug (bool);
-  void print_declarations();
   bool ignore_version_b_;
 public:
   void do_init_file();