patch::: 1.3.136.jcn2

[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 7c93a9a15b2dab43ce7cf33c2451a87455bea486..83463056cfa56483f4dbfbc350f51f21bbca3809 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -3,19 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef MY_LILY_PARSER_HH
 #define MY_LILY_PARSER_HH
+
 #include "lily-proto.hh"
 #include "string.hh"
 #include "parray.hh"
 #include "lily-proto.hh"
 #include "lily-proto.hh"
 #include "duration.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
 #include "string.hh"
 #include "array.hh"
 #include "input.hh"
@@ -25,7 +26,6 @@
    musical content here.  We still have to remove default_duration_.
 
    TODO: interface is too complicated
-
 */
 class My_lily_parser 
 {
@@ -42,18 +42,12 @@ public:
 
   Scope *default_header_p_;
 
-
-  // JUNKME
-  int chord_tremolo_type_i_;
-
   int fatal_error_i_;
   Sources * source_l_;
   int error_level_i_;
 
   My_lily_lexer * lexer_p_;
   bool ignore_version_b_;
-
-
   
   Input here_input() const;
   void remember_spot();
@@ -63,17 +57,22 @@ public:
   void parser_error (String);
 
   void set_yydebug (bool);
+
+
+  DECLARE_SCHEME_CALLBACK(paper_description, ());
 private:
-  
+
   Array<Input> define_spot_array_;
 
   char const* here_ch_C() const;
 
-  Simultaneous_music * get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p, Musical_pitch* bass_p, Duration d);
-
+  Simultaneous_music * get_chord (Pitch tonic, Array<Pitch>* add_arr_p,
+                                 Array<Pitch>* sub_arr_p, Pitch* inversion_p,
+                                 Pitch* bass_p, Duration d);
+  
   void set_chord_tremolo (int type_i);
   void set_last_duration (Duration const *);
-  void set_last_pitch (Musical_pitch const *);
+  void set_last_pitch (Pitch const *);
   friend int yyparse (void*);
 };