/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
#include "book.hh"
#include "context-def.hh"
+#include "context-mod.hh"
#include "dimensions.hh"
#include "file-path.hh"
#include "input.hh"
%token MIDI "\\midi"
%token NAME "\\name"
%token NOTEMODE "\\notemode"
-%token OBJECTID "\\objectid"
%token OCTAVE "\\octave"
%token ONCE "\\once"
%token OVERRIDE "\\override"
/* Artificial tokens, for more generic function syntax */
%token <i> EXPECT_MARKUP;
%token <i> EXPECT_MUSIC;
+%token <i> EXPECT_PITCH;
+%token <i> EXPECT_DURATION;
%token <i> EXPECT_SCM;
+%token <i> EXPECT_MARKUP_LIST
/* After the last argument. */
%token <i> EXPECT_NO_MORE_ARGS;
%token <scm> CHORD_MODIFIER
%token <scm> CHORD_REPETITION
%token <scm> CONTEXT_DEF_IDENTIFIER
+%token <scm> CONTEXT_MOD_IDENTIFIER
%token <scm> DRUM_PITCH
%token <scm> DURATION_IDENTIFIER
%token <scm> EVENT_IDENTIFIER
%token <scm> FRACTION
%token <scm> LYRICS_STRING
%token <scm> LYRIC_MARKUP_IDENTIFIER
-%token <scm> MARKUP_HEAD_EMPTY
-%token <scm> MARKUP_HEAD_LIST0
-%token <scm> MARKUP_HEAD_MARKUP0
-%token <scm> MARKUP_HEAD_MARKUP0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0
-%token <scm> MARKUP_HEAD_SCM0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0_SCM1
-%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
-%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3
-%token <scm> MARKUP_HEAD_SCM0_MARKUP1_MARKUP2
-%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
-%token <scm> MARKUP_LIST_HEAD_EMPTY
-%token <scm> MARKUP_LIST_HEAD_LIST0
-%token <scm> MARKUP_LIST_HEAD_SCM0
-%token <scm> MARKUP_LIST_HEAD_SCM0_LIST1
-%token <scm> MARKUP_LIST_HEAD_SCM0_SCM1_LIST2
+%token <scm> MARKUP_FUNCTION
+%token <scm> MARKUP_LIST_FUNCTION
%token <scm> MARKUP_IDENTIFIER
+%token <scm> MARKUPLINES_IDENTIFIER
%token <scm> MUSIC_FUNCTION
%token <scm> MUSIC_IDENTIFIER
%token <scm> NOTENAME_PITCH
/* Music */
%type <scm> composite_music
%type <scm> grouped_music_list
+%type <scm> closed_music
+%type <scm> open_music
%type <scm> music
%type <scm> prefix_composite_music
%type <scm> repeated_music
%type <scm> chord_body_element
%type <scm> command_element
%type <scm> command_event
+%type <scm> context_modification
%type <scm> context_change
%type <scm> direction_less_event
%type <scm> direction_reqd_event
%type <scm> full_markup_list
%type <scm> function_scm_argument
%type <scm> function_arglist
-%type <scm> function_arglist_music_last
%type <scm> function_arglist_nonmusic_last
-%type <scm> function_arglist_nonmusic
+%type <scm> closed_function_arglist
+%type <scm> open_function_arglist
%type <scm> identifier_init
%type <scm> lilypond_header
%type <scm> lilypond_header_body
%type <scm> markup_braced_list_body
%type <scm> markup_composed_list
%type <scm> markup_command_list
+%type <scm> markup_command_list_arguments
+%type <scm> markup_command_basic_arguments
%type <scm> markup_head_1_item
%type <scm> markup_head_1_list
%type <scm> markup_list
%type <scm> mode_changing_head
%type <scm> mode_changing_head_with_context
%type <scm> multiplied_duration
-%type <scm> music_function_identifier_musicless_prefix
%type <scm> music_function_event
+%type <scm> music_function_event_arglist
%type <scm> music_function_chord_body
+%type <scm> music_function_chord_body_arglist
%type <scm> new_chord
%type <scm> new_lyrics
%type <scm> number_expression
%type <scm> number_factor
%type <scm> number_term
-%type <scm> object_id_setting
%type <scm> octave_check
%type <scm> optional_context_mod
%type <scm> optional_id
%type <scm> step_number
%type <scm> step_numbers
%type <scm> string
+%type <scm> tempo_range
%type <score> score_block
%type <score> score_body
;
-object_id_setting:
- OBJECTID STRING { $$ = $2; }
- ;
-
toplevel_expression:
lilypond_header {
PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
| full_markup {
$$ = $1;
}
+ | full_markup_list {
+ $$ = $1;
+ }
| DIGIT {
$$ = scm_from_int ($1);
}
+ | context_modification {
+ $$ = $1;
+ }
;
context_def_spec_block:
| context_def_spec_body context_mod {
unsmob_context_def ($$)->add_context_mod ($2);
}
+ | context_def_spec_body context_modification {
+ Context_def *td = unsmob_context_def ($$);
+ SCM new_mods = unsmob_context_mod ($2)->get_mods ();
+ for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) {
+ td->add_context_mod (scm_car (m));
+ }
+ }
;
$$->scores_ = SCM_EOL;
$$->bookparts_ = SCM_EOL;
}
- | book_body object_id_setting {
- $$->user_key_ = ly_scm2string ($2);
- }
;
bookpart_block:
$$->paper_ = 0;
$$->scores_ = SCM_EOL;
}
- | bookpart_body object_id_setting {
- $$->user_key_ = ly_scm2string ($2);
- }
;
score_block:
$$->protect ();
$$->origin ()->set_spot (@$);
}
- | score_body object_id_setting {
- $$->user_key_ = ly_scm2string ($2);
- }
| score_body lilypond_header {
$$->set_header ($2);
}
;
tempo_event:
- TEMPO steno_duration '=' bare_unsigned {
- $$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, scm_int2num ($4));
- }
- | TEMPO string steno_duration '=' bare_unsigned {
- $$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, scm_int2num ($5));
+ TEMPO steno_duration '=' tempo_range {
+ $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4);
}
- | TEMPO full_markup steno_duration '=' bare_unsigned {
- $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, scm_int2num ($5));
+ | TEMPO scalar steno_duration '=' tempo_range {
+ $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5);
}
- | TEMPO string {
- $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) );
- }
- | TEMPO full_markup {
- $$ = MAKE_SYNTAX ("tempoText", @$, $2 );
+ | TEMPO scalar {
+ $$ = MAKE_SYNTAX ("tempo", @$, $2);
}
;
/*
-The representation of a list is the
-
- (LIST . LAST-CONS)
-
- to have efficient append. */
+The representation of a list is reversed to have efficient append. */
music_list:
/* empty */ {
- $$ = scm_cons (SCM_EOL, SCM_EOL);
+ $$ = SCM_EOL;
}
| music_list music {
- SCM s = $$;
- SCM c = scm_cons ($2, SCM_EOL);
-
- if (scm_is_pair (scm_cdr (s)))
- scm_set_cdr_x (scm_cdr (s), c); /* append */
- else
- scm_set_car_x (s, c); /* set first cons */
- scm_set_cdr_x (s, c); /* remember last cell */
+ $$ = scm_cons ($2, $1);
}
| music_list embedded_scm {
Music *m = MY_MAKE_MUSIC("Music", @$);
// ugh. code dup
m->set_property ("error-found", SCM_BOOL_T);
- SCM s = $$;
- SCM c = scm_cons (m->self_scm (), SCM_EOL);
+ $$ = scm_cons (m->self_scm (), $1);
m->unprotect (); /* UGH */
-
- if (scm_is_pair (scm_cdr (s)))
- scm_set_cdr_x (scm_cdr (s), c); /* append */
- else
- scm_set_car_x (s, c); /* set first cons */
- scm_set_cdr_x (s, c); /* remember last cell */
}
;
music:
simple_music
| composite_music
+ | MUSIC_IDENTIFIER
;
alternative_music:
$$ = SCM_EOL;
}
| ALTERNATIVE '{' music_list '}' {
- $$ = scm_car ($3);
+ $$ = scm_reverse_x ($3, SCM_EOL);
}
;
sequential_music:
SEQUENTIAL '{' music_list '}' {
- $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3));
+ $$ = MAKE_SYNTAX ("sequential-music", @$, scm_reverse_x ($3, SCM_EOL));
}
| '{' music_list '}' {
- $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2));
+ $$ = MAKE_SYNTAX ("sequential-music", @$, scm_reverse_x ($2, SCM_EOL));
}
;
simultaneous_music:
SIMULTANEOUS '{' music_list '}'{
- $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3));
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($3, SCM_EOL));
}
| DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE {
- $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2));
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL));
}
;
simple_music:
event_chord
- | MUSIC_IDENTIFIER
| music_property_def
| context_change
;
+context_modification:
+ WITH { PARSER->lexer_->push_initial_state (); } '{' context_mod_list '}'
+ {
+ PARSER->lexer_->pop_state ();
+ $$ = $4;
+ }
+ | WITH CONTEXT_MOD_IDENTIFIER
+ {
+ $$ = $2;
+ }
+ | CONTEXT_MOD_IDENTIFIER
+ {
+ $$ = $1;
+ }
+ ;
+
optional_context_mod:
- /**/ { $$ = SCM_EOL; }
- | WITH { PARSER->lexer_->push_initial_state (); }
- '{' context_mod_list '}'
- {
- PARSER->lexer_->pop_state ();
- $$ = $4;
- }
- ;
+ /**/ {
+ $$ = SCM_EOL;
+ }
+ | context_modification
+ {
+ $$ = $1;
+ }
+ ;
context_mod_list:
- /* */ { $$ = SCM_EOL; }
- | context_mod_list context_mod {
- $$ = scm_cons ($2, $1);
- }
- ;
+ /**/ {
+ $$ = Context_mod ().smobbed_copy ();
+ }
+ | context_mod_list context_mod {
+ unsmob_context_mod ($1)->add_context_mod ($2);
+ }
+ | context_mod_list CONTEXT_MOD_IDENTIFIER {
+ Context_mod *md = unsmob_context_mod ($2);
+ if (md)
+ unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
+ }
+ ;
composite_music:
prefix_composite_music { $$ = $1; }
| grouped_music_list { $$ = $1; }
;
+/* Music that can't be followed by additional events or durations */
+closed_music:
+ MUSIC_IDENTIFIER
+ | grouped_music_list
+ ;
+
+/* Music that potentially accepts additional events or durations */
+open_music:
+ simple_music
+ | prefix_composite_music
+ ;
+
grouped_music_list:
simultaneous_music { $$ = $1; }
| sequential_music { $$ = $1; }
;
/* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence:
- MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM
+ MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS
and this rule returns the reversed list of arguments. */
-function_arglist_music_last:
- EXPECT_MUSIC function_arglist music {
- $$ = scm_cons ($3, $2);
- }
+
+function_arglist:
+ closed_function_arglist
+ | open_function_arglist
;
-function_arglist_nonmusic_last:
- EXPECT_MARKUP function_arglist full_markup {
- $$ = scm_cons ($3, $2);
- }
- | EXPECT_MARKUP function_arglist simple_string {
+open_function_arglist:
+ EXPECT_MUSIC function_arglist open_music {
$$ = scm_cons ($3, $2);
}
- | EXPECT_SCM function_arglist function_scm_argument {
+ ;
+
+/* a closed argument list is one that does not end in a music
+ expression that could still take a duration or event */
+
+closed_function_arglist:
+ function_arglist_nonmusic_last
+ | EXPECT_MUSIC function_arglist closed_music {
$$ = scm_cons ($3, $2);
- }
+ }
;
-function_arglist_nonmusic: EXPECT_NO_MORE_ARGS {
+function_arglist_nonmusic_last:
+ EXPECT_NO_MORE_ARGS {
+ /* This is for 0-ary functions, so they don't need to
+ read a lookahead token */
$$ = SCM_EOL;
}
- | EXPECT_MARKUP function_arglist_nonmusic full_markup {
+ | EXPECT_MARKUP function_arglist full_markup {
$$ = scm_cons ($3, $2);
}
- | EXPECT_MARKUP function_arglist_nonmusic simple_string {
+ | EXPECT_MARKUP function_arglist simple_string {
$$ = scm_cons ($3, $2);
}
- | EXPECT_SCM function_arglist_nonmusic function_scm_argument {
- $$ = scm_cons ($3, $2);
+ | EXPECT_PITCH function_arglist pitch {
+ $$ = scm_cons ($3, $2);
}
- ;
-
-function_arglist: EXPECT_NO_MORE_ARGS {
- /* This is for 0-ary functions, so they don't need to
- read a lookahead token */
- $$ = SCM_EOL;
+ | EXPECT_DURATION closed_function_arglist duration_length {
+ $$ = scm_cons ($3, $2);
+ }
+ | EXPECT_SCM function_arglist function_scm_argument {
+ $$ = scm_cons ($3, $2);
}
- | function_arglist_music_last
- | function_arglist_nonmusic_last
;
generic_prefix_music_scm:
MUSIC_FUNCTION function_arglist {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL)));
}
;
$$ = run_music_function (PARSER, $1);
}
| CONTEXT simple_string optional_id optional_context_mod music {
- $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F);
+ Context_mod *ctxmod = unsmob_context_mod ($4);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_F);
}
| NEWCONTEXT simple_string optional_id optional_context_mod music {
- $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T);
+ Context_mod *ctxmod = unsmob_context_mod ($4);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_T);
}
| TIMES fraction music {
PARSER->lexer_->pop_state ();
}
| mode_changing_head_with_context optional_context_mod grouped_music_list {
- $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T);
+ Context_mod *ctxmod = unsmob_context_mod ($2);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, mods, SCM_BOOL_T);
if ($1 == ly_symbol2scm ("ChordNames"))
{
$$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
new_lyrics:
ADDLYRICS { PARSER->lexer_->push_lyric_state (); }
/*cont */
- grouped_music_list {
+ closed_music {
/* Can also use music at the expensive of two S/Rs similar to
\repeat \alternative */
PARSER->lexer_->pop_state ();
}
| new_lyrics ADDLYRICS {
PARSER->lexer_->push_lyric_state ();
- } grouped_music_list {
+ } closed_music {
PARSER->lexer_->pop_state ();
$$ = scm_cons ($4, $1);
}
;
re_rhythmed_music:
- grouped_music_list new_lyrics {
+ closed_music new_lyrics {
$$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
}
| LYRICSTO simple_string {
scalar: string {
$$ = $1;
}
- | LYRICS_STRING {
+ | lyric_element {
$$ = $1;
}
| bare_number {
$$ = MAKE_SYNTAX ("repetition-chord", i,
PARSER->lexer_->chord_repetition_.last_chord_,
PARSER->lexer_->chord_repetition_.repetition_function_,
- $2, $3);
+ $2, scm_reverse_x ($3, SCM_EOL));
}
| MULTI_MEASURE_REST optional_notemode_duration post_events {
Input i;
i.set_location (@1, @3);
- $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3);
+ $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2,
+ scm_reverse_x ($3, SCM_EOL));
}
| command_element
/* note chord elements are memorized into
}
| DRUM_PITCH post_events {
Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
- n->set_property ("duration", $2);
n->set_property ("drum-type", $1);
if (scm_is_pair ($2)) {
}
;
-music_function_identifier_musicless_prefix: MUSIC_FUNCTION {
- SCM sig = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature"));
- if (scm_is_pair (sig) && to_boolean (scm_memq (ly_music_p_proc, scm_cdr (scm_reverse (sig)))))
- {
- PARSER->parser_error (@$, "Music function applied to event may not have a Music argument, except as the last argument.");
- }
+/* We can't accept a music argument, not even a closed one,
+ * immediately before chord_body_elements, otherwise a function \fun
+ * with a signature of two music arguments can't be sorted out
+ * properly in a construct like
+ * <\fun { c } \fun { c } c>
+ * The second call could be interpreted either as a chord constituent
+ * or a music expression.
+ */
+
+music_function_chord_body_arglist:
+ function_arglist_nonmusic_last
+ | EXPECT_MUSIC music_function_chord_body_arglist chord_body_element {
+ $$ = scm_cons ($3, $2);
}
;
music_function_chord_body:
- /* We could allow chord functions to have multiple music arguments,
- but it's more consistent with music_function_event if we
- prohibit it here too */
- music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4)));
+ MUSIC_FUNCTION music_function_chord_body_arglist {
+ $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL)));
}
- | music_function_identifier_musicless_prefix function_arglist_nonmusic {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ ;
+
+/* We could accept a closed music argument before the post events
+ * indicated by a trailing argument list. For symmetry with chord
+ * bodies and in order to avoid too tricky and complex behavior, we
+ * refrain from doing so.
+ */
+music_function_event_arglist:
+ function_arglist_nonmusic_last
+ | EXPECT_MUSIC music_function_event_arglist post_event {
+ $$ = scm_cons ($3, $2);
}
;
music_function_event:
- /* Post-events can only have the last argument as music, without this
- restriction we get a shift/reduce conflict from e.g.
- c8-\partcombine c8 -. */
- music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic post_event {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4)));
- }
- | music_function_identifier_musicless_prefix function_arglist_nonmusic {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ MUSIC_FUNCTION music_function_event_arglist {
+ $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL)));
}
;
}
| PARTIAL duration_length {
- Moment m = - unsmob_duration ($2)->get_length ();
- $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ());
- $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Score"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F);
+ $$ = MAKE_SYNTAX ("partial", @$, $2);
}
| TIME_T fraction {
$$ = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
}
| MARK scalar {
- SCM proc = ly_lily_module_constant ("make-mark-set");
-
- $$ = scm_call_1 (proc, $2);
+ $$ = MAKE_SYNTAX ("make-mark-set", @$, $2);
}
;
direction_less_event {
$$ = $1;
}
- | '-' music_function_event {
+ | script_dir music_function_event {
$$ = run_music_function (PARSER, $2);
+ if ($1)
+ {
+ unsmob_music ($$)->set_property ("direction", scm_from_int ($1));
+ }
}
| HYPHEN {
if (!PARSER->lexer_->is_lyric_state ())
| DURATION_IDENTIFIER dots {
Duration *d = unsmob_duration ($1);
Duration k (d->duration_log (), d->dot_count () + $2);
+ k = k.compressed (d->factor ());
*d = k;
$$ = $1;
}
}
;
+tempo_range:
+ bare_unsigned {
+ $$ = scm_from_int ($1);
+ }
+ | bare_unsigned '~' bare_unsigned {
+ $$ = scm_cons (scm_from_int ($1), scm_from_int ($3));
+ }
+ ;
+
/*
UTILITIES
}
;
-
exclamations:
{ $$ = 0; }
| exclamations '!' { $$ ++; }
;
full_markup_list:
- MARKUPLINES
+ MARKUPLINES_IDENTIFIER {
+ $$ = $1;
+ }
+ | MARKUPLINES
{ PARSER->lexer_->push_markup_state (); }
markup_list {
$$ = $3;
;
markup_list:
- markup_composed_list {
+ MARKUPLINES_IDENTIFIER {
+ $$ = $1;
+ }
+ | markup_composed_list {
$$ = $1;
}
| markup_braced_list {
$$ = scm_cons ($2, $1);
}
| markup_braced_list_body markup_list {
- $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1));
+ $$ = scm_reverse_x ($2, $1);
}
;
markup_command_list:
- MARKUP_LIST_HEAD_EMPTY {
- $$ = scm_list_1 ($1);
+ MARKUP_LIST_FUNCTION markup_command_list_arguments {
+ $$ = scm_cons ($1, scm_reverse_x($2, SCM_EOL));
}
- | MARKUP_LIST_HEAD_LIST0 markup_list {
- $$ = scm_list_2 ($1, $2);
+ ;
+
+markup_command_basic_arguments:
+ EXPECT_MARKUP_LIST markup_command_list_arguments markup_list {
+ $$ = scm_cons ($3, $2);
}
- | MARKUP_LIST_HEAD_SCM0 embedded_scm {
- $$ = scm_list_2 ($1, $2);
+ | EXPECT_SCM markup_command_list_arguments embedded_scm {
+ $$ = scm_cons ($3, $2);
}
- | MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list {
- $$ = scm_list_3 ($1, $2, $3);
+ | EXPECT_NO_MORE_ARGS {
+ $$ = SCM_EOL;
}
- | MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list {
- $$ = scm_list_4 ($1, $2, $3, $4);
+ ;
+
+markup_command_list_arguments:
+ markup_command_basic_arguments { $$ = $1; }
+ | EXPECT_MARKUP markup_command_list_arguments markup {
+ $$ = scm_cons ($3, $2);
}
;
markup_head_1_item:
- MARKUP_HEAD_MARKUP0 {
- $$ = scm_list_1 ($1);
- }
- | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm {
- $$ = scm_list_2 ($1, $2);
- }
- | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm {
- $$ = scm_list_3 ($1, $2, $3);
+ MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments {
+ $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL));
}
;
sc->unprotect ();
PARSER->lexer_->pop_state ();
}
- | MARKUP_HEAD_SCM0 embedded_scm {
- $$ = scm_list_2 ($1, $2);
- }
- | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm {
- $$ = scm_list_4 ($1, $2, $3, $4);
- }
- | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
- $$ = scm_list_3 ($1, $2, $3);
- }
- | MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup {
- $$ = scm_list_4 ($1, $2, $3, $4);
- }
- | MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 embedded_scm embedded_scm markup markup {
- $$ = scm_list_5 ($1, $2, $3, $4, $5);
- }
- | MARKUP_HEAD_EMPTY {
- $$ = scm_list_1 ($1);
- }
- | MARKUP_HEAD_LIST0 markup_list {
- $$ = scm_list_2 ($1,$2);
- }
- | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
- $$ = scm_list_3 ($1, $2, $3);
+ | MARKUP_FUNCTION markup_command_basic_arguments {
+ $$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
}
;
} else if (scm_is_number (sid)) {
*destination = sid;
return NUMBER_IDENTIFIER;
- } else if (unsmob_context_def (sid)) {
- Context_def *def= unsmob_context_def (sid)->clone ();
+ } else if (unsmob_context_def (sid)) {
+ Context_def *def= unsmob_context_def (sid)->clone ();
+
+ *destination = def->self_scm ();
+ def->unprotect ();
- *destination = def->self_scm ();
- def->unprotect ();
+ return CONTEXT_DEF_IDENTIFIER;
+ } else if (unsmob_context_mod (sid)) {
+ *destination = unsmob_context_mod (sid)->smobbed_copy ();
- return CONTEXT_DEF_IDENTIFIER;
+ return CONTEXT_MOD_IDENTIFIER;
} else if (unsmob_score (sid)) {
Score *score = new Score (*unsmob_score (sid));
*destination = score->self_scm ();
if (is_lyric_state ())
return LYRIC_MARKUP_IDENTIFIER;
return MARKUP_IDENTIFIER;
+ } else if (Text_interface::is_markup_list (sid)) {
+ *destination = sid;
+ return MARKUPLINES_IDENTIFIER;
}
return -1;
projects / lilypond.git / blobdiff