source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <ctype.h>
{"autochange", AUTOCHANGE},
{"bar", BAR},
{"breathe", BREATHE},
- {"chordmodifiers", CHORDMODIFIERS},
+ {"change", CHANGE},
{"chords", CHORDS},
{"clef", CLEF},
{"consists", CONSISTS},
{"context", CONTEXT},
{"default", DEFAULT},
{"denies", DENIES},
+ {"drums", DRUMS},
{"description", DESCRIPTION},
- {"duration", DURATION},
{"figures",FIGURES},
{"grace", GRACE},
{"grobdescriptions", GROBDESCRIPTIONS},
{"header", HEADER},
{"key", KEY},
{"lyrics", LYRICS},
+ {"lyricsto", NEWADDLYRICS},
{"mark", MARK},
{"markup", MARKUP},
{"midi", MIDI},
{"notes", NOTES},
{"octave", OCTAVE},
{"once", ONCE},
- {"outputproperty", OUTPUTPROPERTY},
{"override", OVERRIDE},
{"paper", PAPER},
{"partcombine", PARTCOMBINE},
{"partial", PARTIAL},
- {"pitch", PITCH},
- {"pitchnames", PITCHNAMES},
- {"property", PROPERTY},
{"relative", RELATIVE},
{"remove", REMOVE},
{"repeat", REPEAT},
{"transpose", TRANSPOSE},
{"type", TYPE},
{"unset", UNSET},
+ {"with", WITH},
{0,0}
};
keytable_ = new Keyword_table (the_key_tab);
chordmodifier_tab_ = scm_make_vector (gh_int2scm (1), SCM_EOL);
- pitchname_tab_ = scm_make_vector (gh_int2scm (1), SCM_EOL);
+ pitchname_tab_stack_ = SCM_EOL;
scopes_ = SCM_EOL;
void
My_lily_lexer::add_scope (SCM module)
{
- ly_reexport_module (scm_current_module());
+ ly_reexport_module (scm_current_module ());
scm_set_current_module (module);
for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
{
void
My_lily_lexer::start_main_input ()
{
- new_input (main_input_string_, &global_input_file->sources_);
- allow_includes_b_ = allow_includes_b_ && ! (safe_global_b);
+ new_input (main_input_name_, &global_input_file->sources_);
+ allow_includes_b_ = allow_includes_b_ && ! safe_global_b;
scm_module_define (gh_car (scopes_),
ly_symbol2scm ("input-file-name"),
- scm_makfrom0str (main_input_string_.to_str0()));
+ scm_makfrom0str (main_input_name_.to_str0 ()));
}
void
void
My_lily_lexer::LexerError (char const *s)
{
- if (include_stack_.empty ())
+ if (include_stack_.is_empty ())
{
progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
}