X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-lexer.cc;h=6db0e653e5480d224427df3488bd12ae5c1a3bb5;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=68b5578994b654e5bc12f95e505ae9af7ba142d0;hpb=fe4893be240c78a35deff5e86af3d7d1200a478b;p=lilypond.git diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index 68b5578994..6db0e653e5 100644 --- a/lily/lily-lexer.cc +++ b/lily/lily-lexer.cc @@ -57,6 +57,7 @@ static Keyword_ent the_key_tab[] {"description", DESCRIPTION}, {"drummode", DRUMMODE}, {"drums", DRUMS}, + {"etc", ETC}, {"figuremode", FIGUREMODE}, {"figures", FIGURES}, {"header", HEADER}, @@ -284,6 +285,8 @@ Lily_lexer::set_identifier (SCM path, SCM val) SCM prev = ly_module_lookup (mod, sym); if (scm_is_true (prev)) val = nested_property_alist (scm_variable_ref (prev), path, val); + else + val = nested_create_alist (path, val); } scm_module_define (mod, sym, val); } @@ -366,7 +369,7 @@ Lily_lexer::add_lexed_char (int count) } -const char Lily_lexer::type_p_name_[] = "ly:lily-lexer?"; +const char * const Lily_lexer::type_p_name_ = "ly:lily-lexer?"; SCM Lily_lexer::mark_smob () const