X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-parser.hh;h=9f20f8dadc7739cc356665ee61e6cd0801237ce6;hb=8eef80ceb2f84478fee909225e14f59a33031dd9;hp=2ebfb7f41723783b98d20b964c62164e4c20091d;hpb=c0d583928efa0d970e829d400e6732b7b21551f6;p=lilypond.git

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index 2ebfb7f417..9f20f8dadc 100644
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -3,19 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#ifndef MY_LILY_PARSER_HH
-#define MY_LILY_PARSER_HH
+#ifndef LILY_PARSER_HH
+#define LILY_PARSER_HH
 
-#include "array.hh"
 #include "duration.hh"
 #include "input.hh"
 #include "parray.hh"
 #include "pitch.hh"
-#include "smobs.hh"
-#include "string.hh"
 
 /**
    State for the parser.  Do not ever add any variables to parse
@@ -23,17 +20,17 @@
 
    TODO: interface is too complicated
 */
-class Lily_parser 
+class Lily_parser
 {
-  DECLARE_SMOBS (Lily_parser, );
-  friend int yyparse (void*);
+  DECLARE_SMOBS (Lily_parser,);
+  friend int yyparse (void *);
 
   Array<Input> define_spots_;
 
-  char const* here_str0 () const;
+  char const *here_str0 () const;
   Simultaneous_music *get_chord (Pitch tonic,
 				 Array<Pitch> *adds, Array<Pitch> *subs,
-				 Pitch *inversion, Pitch* bass, Duration d);
+				 Pitch *inversion, Pitch *bass, Duration d);
   void set_chord_tremolo (int type_i);
   void set_last_duration (Duration const *);
   void set_last_pitch (Pitch const *);
@@ -44,32 +41,25 @@ public:
   Duration default_duration_;
   String output_basename_;
 
-  int score_count_;
-  int book_count_;
-
   int fatal_error_;
   int error_level_;
   bool ignore_version_b_;
-  SCM last_beam_start_;
 
   Lily_parser (Sources *sources);
-  Lily_parser (Lily_parser const&);
+  Lily_parser (Lily_parser const &);
 
-  DECLARE_SCHEME_CALLBACK (paper_description, ());
+  DECLARE_SCHEME_CALLBACK (layout_description, ());
 
-  Input here_input () const;
-  Input pop_spot ();
-  void beam_check (SCM); 
   void do_init_file ();
   void do_yyparse ();
   void parse_file (String init, String name, String out_name);
   void parse_string (String ly_code);
   void parser_error (String);
-  void push_spot ();
+  void parser_error (Input const &, String);
   void set_yydebug (bool);
 };
 
-DECLARE_UNSMOB (Lily_parser, my_lily_parser);
+DECLARE_UNSMOB (Lily_parser, lily_parser);
 
 SCM ly_parse_file (SCM);
 SCM ly_parse_string (SCM);
@@ -79,8 +69,9 @@ SCM ly_parser_print_score (SCM, SCM);
 SCM ly_parser_bookify (SCM, SCM);
 SCM ly_parser_scorify (SCM, SCM);
 
-Output_def *get_paper (Lily_parser *parser);
+Output_def *get_layout (Lily_parser *parser);
 Output_def *get_midi (Lily_parser *parser);
-Output_def *get_bookpaper (Lily_parser *parser);
+Output_def *get_paper (Lily_parser *parser);
+SCM get_header (Lily_parser *parser);
 
-#endif /* MY_LILY_PARSER_HH */
+#endif /* LILY_PARSER_HH */