X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-parser.hh;h=305d439ee2a0e68ae399c5db5658d3c91c6a673c;hb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;hp=bb4899edb3596b5acebceff8ec4f985ce0ec48f8;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh index bb4899edb3..305d439ee2 100644 --- a/lily/include/lily-parser.hh +++ b/lily/include/lily-parser.hh @@ -25,8 +25,7 @@ #include "pitch.hh" /** - State for the parser. Do not ever add any variables to parse - musical content here. We still have to remove default_duration_. + State for the parser. TODO: interface is too complicated */ @@ -34,18 +33,11 @@ class Lily_parser { DECLARE_SMOBS (Lily_parser); - char const *here_str0 () const; - Simultaneous_music *get_chord (Pitch tonic, - vector *adds, vector *subs, - Pitch *inversion, Pitch *bass, Duration d); - void set_chord_tremolo (int type); - void set_last_duration (Duration const *); - void set_last_pitch (Pitch const *); - public: Lily_lexer *lexer_; Sources *sources_; Duration default_duration_; + int default_tremolo_type_; string output_basename_; SCM closures_; @@ -75,7 +67,6 @@ public: SCM make_scope () const; }; -DECLARE_UNSMOB (Lily_parser, lily_parser); Output_def *get_layout (Lily_parser *parser); Output_def *get_midi (Lily_parser *parser);