%{
+#define YYDEBUG 1
#define YYERROR_VERBOSE 1
#define YYPARSE_PARAM my_lily_parser
#define YYLEX_PARAM my_lily_parser
#include "context-def.hh"
#include "dimensions.hh"
#include "file-path.hh"
-#include "input-smob.hh"
#include "input.hh"
#include "international.hh"
#include "lily-guile.hh"
#include "lily-lexer.hh"
#include "lily-parser.hh"
-#include "lilypond-input-version.hh"
#include "main.hh"
#include "misc.hh"
#include "music.hh"
%{
-#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
+#define MY_MAKE_MUSIC(x, spot) make_music_with_input (ly_symbol2scm (x), spot)
/* ES TODO:
- Don't use lily module, create a new module instead.
#endif
-
-SCM make_music_relative (Pitch start, SCM music);
+static Music *make_music_with_input (SCM name, Input where);
+SCM make_music_relative (Pitch start, SCM music, Input loc);
SCM run_music_function (Lily_parser *, SCM expr);
SCM get_first_context_id (SCM type, Music *m);
SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list);
-SCM make_chord_step (int step, int alter);
+SCM make_chord_step (int step, Rational alter);
SCM make_simple_markup (SCM a);
bool is_duration (int t);
bool is_regular_identifier (SCM id);
/* Keyword tokens with plain escaped name. */
%token ACCEPTS "\\accepts"
%token ADDLYRICS "\\addlyrics"
-%token ADDQUOTE "\\addquote"
%token ALIAS "\\alias"
%token ALTERNATIVE "\\alternative"
-%token BOOK "\book"
+%token BOOK "\\book"
%token CHANGE "\\change"
%token CHORDMODE "\\chordmode"
%token CHORDS "\\chords"
%token TEMPO "\\tempo"
%token TIMES "\\times"
%token TRANSPOSE "\\transpose"
-%token TRANSPOSITION "\\transposition"
%token TYPE "\\type"
%token UNSET "\\unset"
%token WITH "\\with"
%token CHORD_COLON ":"
%token CHORD_MINUS "-"
%token CHORD_SLASH "/"
-%token DOUBLE_ANGLE_CLOSE ">>"
+%token ANGLE_OPEN "<"
+%token ANGLE_CLOSE ">"
%token DOUBLE_ANGLE_OPEN "<<"
+%token DOUBLE_ANGLE_CLOSE ">>"
%token E_BACKSLASH "\\"
%token E_ANGLE_CLOSE "\\>"
%token E_CHAR "\\C[haracter]"
%token CHORDMODIFIERS
%token LYRIC_MARKUP
%token MULTI_MEASURE_REST
-%token SCM_T
%token <i> DIGIT
%token <i> E_UNSIGNED
%token <i> UNSIGNED
+/* Artificial tokens, for more generic function syntax */
+%token <i> EXPECT_MARKUP;
+%token <i> EXPECT_MUSIC;
+%token <i> EXPECT_SCM;
+/* After the last argument. */
+%token <i> EXPECT_NO_MORE_ARGS;
+
%token <scm> BOOK_IDENTIFIER
%token <scm> CHORDMODIFIER_PITCH
%token <scm> CHORD_MODIFIER
%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
%token <scm> MARKUP_IDENTIFIER
%token <scm> MUSIC_FUNCTION
-%token <scm> MUSIC_FUNCTION_MARKUP
-%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP
-%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC
-%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC
-%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC
-%token <scm> MUSIC_FUNCTION_MUSIC
-%token <scm> MUSIC_FUNCTION_MUSIC_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM
-%token <scm> MUSIC_FUNCTION_SCM_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM_SCM
-%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM
-%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC
-%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC
%token <scm> MUSIC_IDENTIFIER
%token <scm> NOTENAME_PITCH
%token <scm> NUMBER_IDENTIFIER
%token <scm> REAL
%token <scm> RESTNAME
%token <scm> SCM_IDENTIFIER
-%token <scm> SCM_T
+%token <scm> SCM_TOKEN
%token <scm> SCORE_IDENTIFIER
%token <scm> STRING
%token <scm> STRING_IDENTIFIER
%type <scm> simple_music_property_def
%type <scm> string_number_event
%type <scm> tempo_event
-%type <scm> toplevel_music
%type <outputdef> output_def_body
%type <outputdef> output_def_head
%type <scm> absolute_pitch
%type <scm> assignment_id
%type <scm> bare_number
-%type <scm> music_function_event
-%type <scm> music_function_chord_body
-%type <scm> music_function_musicless_prefix
%type <scm> bass_figure
%type <scm> figured_bass_modification
%type <scm> br_bass_figure
%type <scm> figure_spec
%type <scm> fraction
%type <scm> full_markup
+%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> identifier_init
%type <scm> lilypond_header
%type <scm> lilypond_header_body
%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_chord_body
%type <scm> new_chord
%type <scm> new_lyrics
%type <scm> number_expression
%type <scm> step_number
%type <scm> step_numbers
%type <scm> string
-%type <scm> function_scm_argument
%type <score> score_block
%type <score> score_body
scm_call_2 (proc, PARSER->self_scm (), score->self_scm ());
score->unprotect ();
}
- | toplevel_music {
+ | composite_music {
Music *music = unsmob_music ($1);
SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-music-handler");
scm_call_2 (proc, PARSER->self_scm (), music->self_scm ());
}
;
-toplevel_music:
- composite_music {
- }
- ;
-
embedded_scm:
- SCM_T
+ SCM_TOKEN
| SCM_IDENTIFIER
;
assignment:
assignment_id '=' identifier_init {
- if (! is_regular_identifier ($1))
- {
-#if 0
- /* no longer valid with dashes in \paper{} block. */
- @1.warning (_ ("identifier should have alphabetic characters only"));
-#endif
- }
-
-
PARSER->lexer_->set_identifier ($1, $3);
/*
context_def_spec_body:
/**/ {
$$ = Context_def::make_scm ();
- unsmob_context_def ($$)->set_spot (@$);
+ unsmob_context_def ($$)->origin ()->set_spot (@$);
}
| CONTEXT_DEF_IDENTIFIER {
$$ = $1;
- unsmob_context_def ($$)->set_spot (@$);
+ unsmob_context_def ($$)->origin ()->set_spot (@$);
}
| context_def_spec_body GROBDESCRIPTIONS embedded_scm {
Context_def*td = unsmob_context_def ($$);
book_body:
{
$$ = new Book;
- $$->set_spot (@$);
+ $$->origin ()->set_spot (@$);
$$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
$$->paper_->unprotect ();
$$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader");
}
| BOOK_IDENTIFIER {
$$ = unsmob_book ($1);
- $$->set_spot (@$);
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
}
| book_body paper_block {
$$->paper_ = $2;
// pass ownernship to C++ again.
$$ = unsmob_score (score);
$$->protect ();
- $$->set_spot (@$);
+ $$->origin ()->set_spot (@$);
}
| SCORE_IDENTIFIER {
$$ = unsmob_score ($1);
- $$->set_spot (@$);
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
}
| score_body object_id_setting {
$$->user_key_ = ly_scm2string ($2);
if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
{
PARSER->parser_error (@1, _ ("need \\paper for paper block"));
+ $1->unprotect ();
$$ = get_paper (PARSER);
}
}
}
| output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER {
$1->unprotect ();
+
Output_def *o = unsmob_output_def ($3);
o->input_origin_.set_spot (@$);
$$ = o;
+ $$->protect ();
PARSER->lexer_->remove_scope ();
PARSER->lexer_->add_scope (o->scope_);
}
| output_def_body context_def_spec_block {
assign_context_def ($$, $2);
}
- | output_def_body tempo_event {
- /*
- junk this ? there already is tempo stuff in
- music.
- */
- int m = scm_to_int (unsmob_music($2)->get_property ("metronome-count"));
- Duration *d = unsmob_duration (unsmob_music($2)->get_property ("tempo-unit"));
- set_tempo ($$, d->get_length (), m);
- }
| output_def_body error {
}
tempo_event:
TEMPO steno_duration '=' bare_unsigned {
- Music *m = MY_MAKE_MUSIC ("MetronomeChangeEvent");
- m->set_property ("tempo-unit", $2);
- m->set_property ("metronome-count", scm_from_int ( $4));
- $$ = m->unprotect ();
- }
+ $$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4));
+ }
;
/*
}
| music_list error {
- Music *m = MY_MAKE_MUSIC("Music");
+ Music *m = MY_MAKE_MUSIC("Music", @$);
// ugh. code dup
m->set_property ("error-found", SCM_BOOL_T);
SCM s = $$;
SIMULTANEOUS '{' music_list '}'{
$$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3));
}
- | simul_open music_list simul_close {
+ | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE {
$$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2));
}
;
| simple_string
;
-/*
-TODO: use code generation for this
-*/
-generic_prefix_music_scm:
- MUSIC_FUNCTION {
- $$ = scm_list_2 ($1, make_input (@$));
- }
- | MUSIC_FUNCTION_SCM function_scm_argument {
- $$ = scm_list_3 ($1, make_input (@$), $2);
- }
- | MUSIC_FUNCTION_MARKUP full_markup {
- $$ = scm_list_3 ($1, make_input (@$), $2);
- }
- | music_function_musicless_prefix music {
- $$ = ly_append2 ($1, scm_list_1 ($2));
- }
- | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+/* 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
+and this rule returns the reversed list of arguments. */
+
+function_arglist_music_last:
+ EXPECT_MUSIC function_arglist music {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+ ;
+
+function_arglist_nonmusic_last:
+ EXPECT_MARKUP function_arglist full_markup {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_MARKUP_MUSIC full_markup music {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ | EXPECT_SCM function_arglist function_scm_argument {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ ;
+
+function_arglist_nonmusic: EXPECT_NO_MORE_ARGS {
+ $$ = SCM_EOL;
}
- | MUSIC_FUNCTION_MUSIC_MUSIC music music {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ | EXPECT_MARKUP function_arglist_nonmusic full_markup {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument music music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+ | EXPECT_SCM function_arglist_nonmusic function_scm_argument {
+ $$ = scm_cons ($3, $2);
}
- | MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC function_scm_argument function_scm_argument music music {
- $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED);
+ ;
+
+function_arglist: EXPECT_NO_MORE_ARGS {
+ /* This is for 0-ary functions, so they don't need to
+ read a lookahead token */
+ $$ = SCM_EOL;
}
- | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup music music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+ | 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));
}
;
+
optional_id:
/**/ { $$ = SCM_EOL; }
| '=' simple_string {
relative_music:
RELATIVE absolute_pitch music {
Pitch start = *unsmob_pitch ($2);
- $$ = make_music_relative (start, $3);
+ $$ = make_music_relative (start, $3, @$);
}
| RELATIVE composite_music {
Pitch middle_c (0, 0, 0);
- $$ = make_music_relative (middle_c, $2);
+ $$ = make_music_relative (middle_c, $2, @$);
}
;
}
;
-chord_open: '<'
- ;
-
-chord_close: '>'
- ;
-
-simul_open: DOUBLE_ANGLE_OPEN
- ;
-
-simul_close: DOUBLE_ANGLE_CLOSE
- ;
-
chord_body:
- chord_open chord_body_elements chord_close
+ ANGLE_OPEN chord_body_elements ANGLE_CLOSE
{
$$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL));
}
SCM check = $4;
SCM post = $5;
- Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("pitch", $1);
- n->set_spot (@$);
if (q % 2)
n->set_property ("cautionary", SCM_BOOL_T);
if (ex % 2 || q % 2)
$$ = n->unprotect ();
}
| DRUM_PITCH post_events {
- Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("duration", $2);
n->set_property ("drum-type", $1);
- n->set_spot (@$);
if (scm_is_pair ($2)) {
SCM arts = scm_reverse_x ($2, SCM_EOL);
}
;
-music_function_chord_body:
- MUSIC_FUNCTION {
- $$ = scm_list_2 ($1, make_input (@$));
- }
- | music_function_musicless_prefix chord_body_element {
- $$ = ly_append2 ($1, scm_list_1 ($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.");
+ }
}
;
-music_function_event:
- music_function_musicless_prefix post_event {
- $$ = ly_append2 ($1, scm_list_1 ($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_identifier_musicless_prefix function_arglist_nonmusic {
+ $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
}
;
-/*
-TODO: use code generation for this
-*/
-music_function_musicless_prefix:
- MUSIC_FUNCTION_MUSIC {
- $$ = scm_list_2 ($1, make_input (@$));
- }
- | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument {
- $$ = scm_list_3 ($1, make_input (@$), $2);
- }
- | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3);
- }
- | MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+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_SCM_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument function_scm_argument {
- $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED);
+ | music_function_identifier_musicless_prefix function_arglist_nonmusic {
+ $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
}
;
-
command_element:
command_event {
$$ = $1;
$$ = MAKE_SYNTAX ("skip-music", @$, $2);
}
| E_BRACKET_OPEN {
- Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
m->set_property ("span-direction", scm_from_int (START));
- m->set_spot (@$);
$$ = m->unprotect();
}
| E_BRACKET_CLOSE {
- Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
m->set_property ("span-direction", scm_from_int (STOP));
- m->set_spot (@$);
$$ = m->unprotect ();
}
| E_BACKSLASH {
$$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED);
}
- | TRANSPOSITION pitch {
- Pitch middle_c;
- Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c);
- $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Staff"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("instrumentTransposition"), sounds_as_c.smobbed_copy ());
- }
| 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 ());
command_event:
E_TILDE {
- $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent")->unprotect ();
+ $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect ();
}
| MARK DEFAULT {
- Music *m = MY_MAKE_MUSIC ("MarkEvent");
+ Music *m = MY_MAKE_MUSIC ("MarkEvent", @$);
$$ = m->unprotect ();
}
| tempo_event {
$$ = $1;
}
| KEY DEFAULT {
- Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
+ Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
$$ = key->unprotect ();
}
| KEY NOTENAME_PITCH SCM_IDENTIFIER {
- Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
+ Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
if (scm_ilength ($3) > 0)
{
key->set_property ("pitch-alist", $3);
| HYPHEN {
if (!PARSER->lexer_->is_lyric_state ())
PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC ("HyphenEvent")->unprotect ();
+ $$ = MY_MAKE_MUSIC ("HyphenEvent", @$)->unprotect ();
}
| EXTENDER {
if (!PARSER->lexer_->is_lyric_state ())
PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC ("ExtenderEvent")->unprotect ();
+ $$ = MY_MAKE_MUSIC ("ExtenderEvent", @$)->unprotect ();
}
| script_dir direction_reqd_event {
if ($1)
string_number_event:
E_UNSIGNED {
- Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
+ Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$);
s->set_property ("string-number", scm_from_int ($1));
- s->set_spot (@$);
$$ = s->unprotect ();
}
;
if (unsmob_music (predefd))
{
m = unsmob_music (predefd)->clone ();
+ m->set_spot (@$);
}
else
{
- m = MY_MAKE_MUSIC ("Music");
+ m = MY_MAKE_MUSIC ("Music", @$);
}
- m->set_spot (@$);
$$ = m->unprotect ();
}
| EVENT_IDENTIFIER {
$$ = $1;
}
| tremolo_type {
- Music *a = MY_MAKE_MUSIC ("TremoloEvent");
- a->set_spot (@$);
+ Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$);
a->set_property ("tremolo-type", scm_from_int ($1));
$$ = a->unprotect ();
}
}
| script_abbreviation {
SCM s = PARSER->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
- Music *a = MY_MAKE_MUSIC ("ArticulationEvent");
+ Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$);
if (scm_is_string (s))
a->set_property ("articulation-type", s);
else PARSER->parser_error (@1, _ ("expecting string as script definition"));
$$ = p.smobbed_copy ();
}
| TONICNAME_PITCH sub_quotes {
- Pitch p =* unsmob_pitch ($1);
+ Pitch p = *unsmob_pitch ($1);
p = p.transposed (Pitch (-$2,0,0));
$$ = p.smobbed_copy ();
gen_text_def:
full_markup {
- Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
t->set_property ("text", $1);
- t->set_spot (@$);
$$ = t->unprotect ();
}
| string {
- Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
t->set_property ("text",
make_simple_markup ($1));
- t->set_spot (@$);
$$ = t->unprotect ();
}
| DIGIT {
- Music *t = MY_MAKE_MUSIC ("FingerEvent");
+ Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$);
t->set_property ("digit", scm_from_int ($1));
- t->set_spot (@$);
$$ = t->unprotect ();
}
;
| '|' {
$$ = scm_makfrom0str ("Bar");
}
- | '>' {
+ | ANGLE_CLOSE {
$$ = scm_makfrom0str ("Larger");
}
| '.' {
bass_figure:
FIGURE_SPACE {
- Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
- $$ = bfr->self_scm ();
- bfr->unprotect ();
- bfr->set_spot (@1);
+ Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$);
+ $$ = bfr->unprotect ();
}
| bass_number {
- Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
+ Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$);
$$ = bfr->self_scm ();
if (scm_is_number ($1))
bfr->set_property ("text", $1);
bfr->unprotect ();
- bfr->set_spot (@1);
}
| bass_figure ']' {
$$ = $1;
Music *n = 0;
if ($6)
- n = MY_MAKE_MUSIC ("RestEvent");
+ n = MY_MAKE_MUSIC ("RestEvent", @$);
else
- n = MY_MAKE_MUSIC ("NoteEvent");
+ n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("pitch", $1);
n->set_property ("duration", $5);
if ($2 % 2 || $3 % 2)
n->set_property ("force-accidental", SCM_BOOL_T);
- n->set_spot (@$);
$$ = n->unprotect ();
}
| DRUM_PITCH optional_notemode_duration {
- Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
n->set_property ("duration", $2);
n->set_property ("drum-type", $1);
Music *ev = 0;
if (ly_scm2string ($1) == "s") {
/* Space */
- ev = MY_MAKE_MUSIC ("SkipEvent");
+ ev = MY_MAKE_MUSIC ("SkipEvent", @$);
}
else {
- ev = MY_MAKE_MUSIC ("RestEvent");
+ ev = MY_MAKE_MUSIC ("RestEvent", @$);
}
ev->set_property ("duration", $2);
- ev->set_spot (@$);
$$ = ev->unprotect ();
}
| lyric_element optional_notemode_duration {
if (!PARSER->lexer_->is_lyric_state ())
PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
- Music *levent = MY_MAKE_MUSIC ("LyricEvent");
+ Music *levent = MY_MAKE_MUSIC ("LyricEvent", @$);
levent->set_property ("text", $1);
levent->set_property ("duration",$2);
- levent->set_spot (@$);
$$= levent->unprotect ();
}
;
$$ = make_chord_step ($1, 0);
}
| bare_unsigned '+' {
- $$ = make_chord_step ($1, SHARP);
+ $$ = make_chord_step ($1, SHARP_ALTERATION);
}
| bare_unsigned CHORD_MINUS {
- $$ = make_chord_step ($1, FLAT);
+ $$ = make_chord_step ($1, FLAT_ALTERATION);
}
;
%%
void
-Lily_parser::set_yydebug (bool )
+Lily_parser::set_yydebug (bool x)
{
-#if 0
- yydebug = 1;
-#endif
+ yydebug = x;
}
void
*destination = sid;
return STRING_IDENTIFIER;
} else if (unsmob_book (sid)) {
- *destination = unsmob_book (sid)->clone ()->self_scm ();
+ Book *book = unsmob_book (sid)->clone ();
+ *destination = book->self_scm ();
+ book->unprotect ();
+
return BOOK_IDENTIFIER;
} else if (scm_is_number (sid)) {
*destination = sid;
return NUMBER_IDENTIFIER;
} else if (unsmob_context_def (sid)) {
- *destination = unsmob_context_def (sid)->clone_scm ();
+ Context_def *def= unsmob_context_def (sid)->clone ();
+
+ *destination = def->self_scm ();
+ def->unprotect ();
+
return CONTEXT_DEF_IDENTIFIER;
} else if (unsmob_score (sid)) {
Score *score = new Score (*unsmob_score (sid));
*destination = score->self_scm ();
+
+ score->unprotect ();
return SCORE_IDENTIFIER;
} else if (Music *mus = unsmob_music (sid)) {
mus = mus->clone ();
bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
!= SCM_BOOL_F;
+ mus->unprotect ();
return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
} else if (unsmob_duration (sid)) {
*destination = unsmob_duration (sid)->smobbed_copy ();
} else if (unsmob_output_def (sid)) {
Output_def *p = unsmob_output_def (sid);
p = p->clone ();
-
+
*destination = p->self_scm ();
+ p->unprotect ();
return OUTPUT_DEF_IDENTIFIER;
} else if (Text_interface::is_markup (sid)) {
*destination = sid;
return v;
}
+Music *
+make_music_with_input (SCM name, Input where)
+{
+ Music *m = make_music_by_name (name);
+ m->set_spot (where);
+ return m;
+}
SCM
get_first_context_id (SCM type, Music *m)
set_music_properties (Music *p, SCM a)
{
for (SCM k = a; scm_is_pair (k); k = scm_cdr (k))
- p->internal_set_property (scm_caar (k), scm_cdar (k));
+ p->set_property (scm_caar (k), scm_cdar (k));
}
SCM
-make_chord_step (int step, int alter)
+make_chord_step (int step, Rational alter)
{
if (step == 7)
- alter += FLAT;
+ alter += FLAT_ALTERATION;
while (step < 0)
step += 7;
}
SCM
-make_music_relative (Pitch start, SCM music)
+make_music_relative (Pitch start, SCM music, Input loc)
{
- Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic");
+ Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc);
relative->set_property ("element", music);
Music *m = unsmob_music (music);
projects / lilypond.git / blobdiff