/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
scm_apply_0 (proc, args)
/* Syntactic Sugar. */
#define MAKE_SYNTAX(name, location, ...) \
- LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (parser->lexer_->override_input (location)), ##__VA_ARGS__, SCM_UNDEFINED))
+ LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), parser->lexer_->override_input (location).smobbed_copy (), ##__VA_ARGS__, SCM_UNDEFINED))
#define START_MAKE_SYNTAX(name, ...) \
scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED)
#define FINISH_MAKE_SYNTAX(start, location, ...) \
- LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (parser->self_scm (), make_input (parser->lexer_->override_input (location)), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED)))))
+ LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (parser->self_scm (), parser->lexer_->override_input (location).smobbed_copy (), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED)))))
SCM get_next_unique_context_id ();
SCM get_next_unique_lyrics_context_id ();
{
SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler");
scm_call_2 (proc, parser->self_scm (), out);
- } else if (Score::unsmob ($1))
+ } else if (Score::is_smob ($1))
{
SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler");
scm_call_2 (proc, parser->self_scm (), $1);
| multiplied_duration
| music_embedded music_embedded music_list {
$3 = scm_reverse_x ($3, SCM_EOL);
- if (Music::unsmob ($2))
+ if (Music::is_smob ($2))
$3 = scm_cons ($2, $3);
- if (Music::unsmob ($1))
+ if (Music::is_smob ($1))
$3 = scm_cons ($1, $3);
$$ = MAKE_SYNTAX ("sequential-music", @$, $3);
}
$$ = Context_def::make_scm ();
td = Context_def::unsmob ($$);
}
- if (Music::unsmob ($2)) {
+ if (Music::is_smob ($2)) {
SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
$2 = scm_call_2 (proc, parser->self_scm (), $2);
}
{
SCM proc = parser->lexer_->lookup_identifier ("book-text-handler");
scm_call_2 (proc, $1, out);
- } else if (Score::unsmob ($2))
+ } else if (Score::is_smob ($2))
{
SCM proc = parser->lexer_->lookup_identifier ("book-score-handler");
scm_call_2 (proc, $1, $2);
{
SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
scm_call_2 (proc, $1, out);
- } else if (Score::unsmob ($2))
+ } else if (Score::is_smob ($2))
{
SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler");
scm_call_2 (proc, $1, $2);
score_body:
score_items {
- if (!Score::unsmob ($1)) {
+ if (!Score::is_smob ($1)) {
parser->parser_error (@1, _("Missing music in \\score"));
$$ = (new Score)->unprotect ();
if (scm_is_pair ($1) && ly_is_module (scm_car ($1)))
od = 0;
$2 = SCM_UNSPECIFIED;
}
- } else if (!Score::unsmob ($$)) {
- if (Music::unsmob ($2)) {
+ } else if (!Score::is_smob ($$)) {
+ if (Music::is_smob ($2)) {
SCM scorify = ly_lily_module_constant ("scorify-music");
$2 = scm_call_2 (scorify, $2, parser->self_scm ());
}
- if (Score::unsmob ($2))
+ if (Score::is_smob ($2))
{
$$ = $2;
$2 = SCM_UNSPECIFIED;
} else
$1 = scm_car ($1);
}
- if (Context_def::unsmob ($2))
+ if (Context_def::is_smob ($2))
assign_context_def (Output_def::unsmob ($1), $2);
// Seems unlikely, but let's be complete:
- else if (Music::unsmob ($2))
+ else if (Music::is_smob ($2))
{
SCM proc = parser->lexer_->lookup_identifier
("output-def-music-handler");
} music_or_context_def
{
parser->lexer_->pop_state ();
- if (Context_def::unsmob ($3))
+ if (Context_def::is_smob ($3))
assign_context_def (Output_def::unsmob ($1), $3);
else {
$$ = SCM_EOL;
}
| music_list music_embedded {
- if (Music::unsmob ($2))
+ if (Music::is_smob ($2))
$$ = scm_cons ($2, $1);
}
| music_list error {
music: music_assign
| lyric_element_music
- | pitch_or_music
+ | pitch_as_music
+ ;
+
+pitch_as_music:
+ pitch_or_music
{
$$ = make_music_from_simple (parser, @1, $1);
- if (!Music::unsmob ($$))
+ if (!Music::is_smob ($$))
{
parser->parser_error (@1, _ ("music expected"));
$$ = MAKE_SYNTAX ("void-music", @$);
}
| WITH context_modification_arg
{
- if (Music::unsmob ($2)) {
+ if (Music::is_smob ($2)) {
SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
$2 = scm_call_2 (proc, parser->self_scm (), $2);
}
- if (Context_mod::unsmob ($2))
+ if (Context_mod::is_smob ($2))
$$ = $2;
else {
parser->parser_error (@2, _ ("not a context mod"));
| context_mod_list context_mod_arg {
if (scm_is_eq ($2, SCM_UNSPECIFIED))
;
- else if (Music::unsmob ($2)) {
+ else if (Music::is_smob ($2)) {
SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler");
$2 = scm_call_2 (proc, parser->self_scm (), $2);
}
- if (Context_mod::unsmob ($2))
+ if (Context_mod::is_smob ($2))
Context_mod::unsmob ($$)->add_context_mods
(Context_mod::unsmob ($2)->get_mods ());
else {
}
;
-composite_music:
- complex_music
+context_prefix:
+ CONTEXT symbol optional_id optional_context_mod {
+ Context_mod *ctxmod = Context_mod::unsmob ($4);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F);
+ }
+ | NEWCONTEXT symbol optional_id optional_context_mod {
+ Context_mod *ctxmod = Context_mod::unsmob ($4);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T);
+ }
+ ;
+
+new_lyrics:
+ ADDLYRICS lyric_mode_music {
+ $$ = scm_list_1 ($2);
+ }
+ | new_lyrics ADDLYRICS lyric_mode_music {
+ $$ = scm_cons ($3, $1);
+ }
+ ;
+
+/* basic_music is basically the same as composite_music but with
+ * context-prefixed music and lyricized music explicitly removed. The
+ * reason is that in a sequence
+ *
+ * \new Staff \new Voice { ... } \addlyrics { ... } \addlyrics { ... }
+ *
+ * we need to group both \addlyrics together (as they go with the same
+ * voice) but then combine them with \new Voice { ... }, meaning that
+ * combining \new Voice { ... } needs higher priority than
+ * { ... } \addlyrics, and *not* have \new Staff \new Voice { ... }
+ * combine before combining \new Voice { ... } \addlyrics: only one
+ * layer of context-prefixed music should assemble before \addlyrics
+ * is integrated. Total mess, and we sort this mess out with explicit
+ * rules preferring a single context-prefix.
+ */
+
+basic_music:
+ music_function_call
+ | repeated_music
| music_bare
+ | LYRICSTO simple_string lyric_mode_music {
+ $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, SCM_EOL, $3);
+ }
+ | LYRICSTO symbol '=' simple_string lyric_mode_music
+ {
+ $$ = MAKE_SYNTAX ("lyric_combine", @$, $3, $2, $4);
+ }
+ ;
+
+contextable_music:
+ basic_music
+ | pitch_as_music
+ | event_chord
+ ;
+
+contexted_basic_music:
+ context_prefix contextable_music new_lyrics
+ {
+ Input i;
+ i.set_location (@1, @2);
+ $$ = FINISH_MAKE_SYNTAX ($1, i, $2);
+ $$ = MAKE_SYNTAX ("add-lyrics", @$, $$, scm_reverse_x ($3, SCM_EOL));
+ } %prec COMPOSITE
+ | context_prefix contextable_music
+ {
+ $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
+ } %prec COMPOSITE
+ | context_prefix contexted_basic_music
+ {
+ $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
+ }
+ ;
+
+composite_music:
+ basic_music %prec COMPOSITE
+ | contexted_basic_music
+ | basic_music new_lyrics
+ {
+ $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
+ } %prec COMPOSITE
;
music_bare:
| MUSIC_IDENTIFIER
;
-complex_music:
- music_function_call
- | repeated_music { $$ = $1; }
- | re_rhythmed_music { $$ = $1; }
- | complex_music_prefix music
- {
- $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
- }
- ;
-
-complex_music_prefix:
- CONTEXT symbol optional_id optional_context_mod {
- Context_mod *ctxmod = Context_mod::unsmob ($4);
- SCM mods = SCM_EOL;
- if (ctxmod)
- mods = ctxmod->get_mods ();
- $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F);
- }
- | NEWCONTEXT symbol optional_id optional_context_mod {
- Context_mod *ctxmod = Context_mod::unsmob ($4);
- SCM mods = SCM_EOL;
- if (ctxmod)
- mods = ctxmod->get_mods ();
- $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T);
- }
- ;
-
mode_changed_music:
mode_changing_head grouped_music_list {
if ($1 == ly_symbol2scm ("chords"))
}
;
-new_lyrics:
- ADDLYRICS lyric_mode_music {
- $$ = scm_list_1 ($2);
- }
- | new_lyrics ADDLYRICS lyric_mode_music {
- $$ = scm_cons ($3, $1);
- }
- ;
-
-re_rhythmed_music:
- composite_music new_lyrics {
- $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
- } %prec COMPOSITE
- | LYRICSTO simple_string lyric_mode_music {
- $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $3);
- }
- ;
-
context_change:
CHANGE symbol '=' simple_string {
$$ = MAKE_SYNTAX ("context-change", @$, $2, $4);
if (SCM_UNBNDP ($1))
$$ = MAKE_SYNTAX ("void-music", @1);
else
- $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (parser->self_scm (), make_input (@$), $1));
+ $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (parser->self_scm (), @$.smobbed_copy (), $1));
}
;
if (!parser->lexer_->is_chord_state ())
parser->parser_error (@1, _ ("have to be in Chord mode for chords"));
if (scm_is_pair ($2)) {
- if (Pitch::unsmob ($1))
+ if (Pitch::is_smob ($1))
$1 = make_chord_elements (@1,
$1,
parser->default_duration_.smobbed_copy (),
SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
$$ = MAKE_SYNTAX ("event-chord", @1, elts);
- } else if (!Pitch::unsmob ($1))
+ } else if (!Pitch::is_smob ($1))
$$ = MAKE_SYNTAX ("event-chord", @1, $1);
// A mere pitch drops through.
} %prec ':'
int
Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
{
- if (Book::unsmob (sid)) {
+ if (Book::is_smob (sid)) {
Book *book = Book::unsmob (sid)->clone ();
*destination = book->self_scm ();
book->unprotect ();
} else if (scm_is_number (sid)) {
*destination = sid;
return NUMBER_IDENTIFIER;
- } else if (Context_def::unsmob (sid))
+ } else if (Context_def::is_smob (sid))
{
*destination = Context_def::unsmob (sid)->clone ()->unprotect ();
return SCM_IDENTIFIER;
- } else if (Context_mod::unsmob (sid)) {
+ } else if (Context_mod::is_smob (sid)) {
*destination = Context_mod::unsmob (sid)->smobbed_copy ();
return CONTEXT_MOD_IDENTIFIER;
} else if (Music *mus = Music::unsmob (sid)) {
bool is_event = mus->is_mus_type ("post-event");
mus->unprotect ();
return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
- } else if (Pitch::unsmob (sid)) {
+ } else if (Pitch::is_smob (sid)) {
*destination = Pitch::unsmob (sid)->smobbed_copy ();
return PITCH_IDENTIFIER;
- } else if (Duration::unsmob (sid)) {
+ } else if (Duration::is_smob (sid)) {
*destination = Duration::unsmob (sid)->smobbed_copy ();
return DURATION_IDENTIFIER;
- } else if (Output_def::unsmob (sid)) {
+ } else if (Output_def::is_smob (sid)) {
*destination = Output_def::unsmob (sid)->clone ()->unprotect ();
return SCM_IDENTIFIER;
- } else if (Score::unsmob (sid)) {
+ } else if (Score::is_smob (sid)) {
*destination = Score::unsmob (sid)->clone ()->unprotect ();
return SCM_IDENTIFIER;
}
SCM
make_music_from_simple (Lily_parser *parser, Input loc, SCM simple)
{
- if (Music::unsmob (simple))
+ if (Music::is_smob (simple))
return simple;
if (parser->lexer_->is_note_state ()) {
if (scm_is_symbol (simple)) {
n->set_property ("drum-type", simple);
return n->unprotect ();
}
- if (Pitch::unsmob (simple)) {
+ if (Pitch::is_smob (simple)) {
Music *n = MY_MAKE_MUSIC ("NoteEvent", loc);
n->set_property ("duration", parser->default_duration_.smobbed_copy ());
n->set_property ("pitch", simple);
return MAKE_SYNTAX ("lyric-event", loc, simple,
parser->default_duration_.smobbed_copy ());
} else if (parser->lexer_->is_chord_state ()) {
- if (Pitch::unsmob (simple))
+ if (Pitch::is_smob (simple))
return MAKE_SYNTAX
("event-chord",
loc,