release: 0.1.63

[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 7930c9c7a27a8a7d6ba9476ab24cf74f3ccc86ba..c68d4ea4c78065c122e4ca255135bb1a758ea948 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 
@@ -30,13 +30,21 @@ class My_lily_parser {
   Chord * get_note_element (Note_req * ,Duration *);
   Chord* get_rest_element (String,Duration *);
   Chord* get_word_element (Text_def*, Duration*);
+  Melodic_req* get_melodic_req (Melodic_req* melodic, int quotes);
+  void set_nearest (Melodic_req* melodic);
+  String notename_str (Melodic_req* melodic);
 
   void set_last_duration (Duration const *);
   void set_default_duration (Duration const *);
+  void set_abbrev_beam (int type_i);
   void set_duration_mode (String s);
+  void set_octave_mode (String s);
   friend int yyparse (void*);
+
 public:
+  int abbrev_beam_type_i_;
   int default_octave_i_;
+  Melodic_req* last_melodic_;
   Duration default_duration_;
   Plet plet_;
   Header *default_header_p_;
@@ -44,6 +52,7 @@ public:
   String textstyle_str_;
   bool first_b_;
   bool last_duration_mode_b_ ;
+  bool relative_octave_mode_b_;
   Array<Request*> pre_reqs, post_reqs;
   int fatal_error_i_;
   Sources * source_l_;
@@ -57,17 +66,16 @@ public:
   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();