{
for (SCM k = a; gh_pair_p (k); k = ly_cdr (k))
{
- p->set_mus_property (gh_caar (k), gh_cdar (k));
+ p->internal_set_mus_property (ly_caar (k), ly_cdar (k));
}
}
%token CONSISTS
%token DURATION
%token SEQUENTIAL
-%token ELEMENTDESCRIPTIONS
+%token GROBDESCRIPTIONS
%token SIMULTANEOUS
%token CONSISTSEND
%token DENIES
%type <request> request_with_dir request_that_take_dir verbose_request
%type <i> sub_quotes sup_quotes
%type <music> simple_element request_chord command_element Simple_music Composite_music
-%type <music> Alternative_music Repeated_music
+%type <music> Repeated_music
+%type <scm> Alternative_music
%type <i> tremolo_type
%type <i> bare_int bare_unsigned
%type <i> script_dir
%type <scm> duration_length fraction
%type <scm> embedded_scm scalar
-%type <music> Music Sequential_music Simultaneous_music Music_sequence
+%type <music> Music Sequential_music Simultaneous_music
%type <music> relative_music re_rhythmed_music part_combined_music
%type <music> property_def translator_change
%type <scm> Music_list
SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL);
for (SCM s = $1; gh_pair_p (s); s = ly_cdr (s)) {
- SCM pt = gh_cdar (s);
+ SCM pt = ly_cdar (s);
if (!unsmob_pitch (pt))
THIS->parser_error ("Need pitch object.");
else
- scm_hashq_set_x (tab, gh_caar (s), pt);
+ scm_hashq_set_x (tab, ly_caar (s), pt);
}
$$ = tab;
Translator_def*td = unsmob_translator_def ($$);
td->type_aliases_ = gh_cons ($3, td->type_aliases_);
}
- | translator_spec_body ELEMENTDESCRIPTIONS embedded_scm {
+ | translator_spec_body GROBDESCRIPTIONS embedded_scm {
+ Translator_def*td = unsmob_translator_def($$);
+ // td->add_property_assign (ly_symbol2scm ("allGrobDescriptions"), $3);
for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p))
- unsmob_translator_def ($$)
- ->add_property_assign (scm_symbol_to_string (gh_caar (p)), gh_cdar (p));
-
+ td->add_property_assign (scm_symbol_to_string (ly_caar (p)), ly_cdar (p));
}
| translator_spec_body CONSISTSEND STRING {
unsmob_translator_def ($$)->add_last_element ( $3);
}
;
+/*
+The representation of a list is the
+
+ (LIST . LAST-CONS)
+
+ to have efficient append.
+*/
Music_list: /* empty */ {
$$ = gh_cons (SCM_EOL, SCM_EOL);
}
Alternative_music:
/* empty */ {
- $$ = 0;
+ $$ = SCM_EOL;
}
- | ALTERNATIVE Music_sequence {
- $$ = $2;
- $2->set_spot (THIS->here_input ());
+ | ALTERNATIVE '{' Music_list '}' {
+ $$ = $3;
}
;
-
-
-
Repeated_music:
REPEAT string bare_unsigned Music Alternative_music
{
- Music_sequence* alts = dynamic_cast <Music_sequence*> ($5);
- if (alts && $3 < alts->length_i ())
- $5->origin ()->warning (_ ("More alternatives than repeats. Junking excess alternatives."));
Music *beg = $4;
int times = $3;
+ SCM alts = gh_pair_p ($5) ? gh_car ($5) : SCM_EOL;
+ if (times < scm_ilength (alts)) {
+ unsmob_music (gh_car (alts))
+ ->origin ()->warning (
+ _("More alternatives than repeats. Junking excess alternatives."));
+ alts = ly_truncate_list (times, alts);
+ }
Repeated_music * r = new Repeated_music (SCM_EOL);
-
if (beg)
{
- r-> set_mus_property ("body", beg->self_scm ());
+ r-> set_mus_property ("element", beg->self_scm ());
scm_gc_unprotect_object (beg->self_scm ());
}
r->set_mus_property ("repeat-count", gh_int2scm (times >? 1));
- if (alts)
- {
- alts->truncate (times);
- r-> set_mus_property ("alternatives", alts->self_scm ());
- scm_gc_unprotect_object (alts->self_scm ());
- }
+ r-> set_mus_property ("elements",alts);
SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor"));
SCM result = gh_call1 (func, $2);
}
;
-Music_sequence: '{' Music_list '}' {
- $$ = new Music_sequence (SCM_EOL);
- $$->set_mus_property ("elements", ly_car ($2));
- }
- ;
-
Sequential_music:
SEQUENTIAL '{' Music_list '}' {
$$ = new Sequential_music (SCM_EOL);
$$->set_mus_property ("element", $2->self_scm ());
scm_gc_unprotect_object ($2->self_scm ());
#endif
-
-
}
| CONTEXT string '=' string Music {
Context_specced_music *csm = new Context_specced_music (SCM_EOL);
re_rhythmed_music:
ADDLYRICS Music Music {
Lyric_combine_music * l = new Lyric_combine_music (SCM_EOL);
- l->set_mus_property ("music", $2->self_scm ());
- l->set_mus_property ("lyrics", $3->self_scm ());
+ l->set_mus_property ("elements", gh_list ($2->self_scm (), $3->self_scm (), SCM_UNDEFINED));
scm_gc_unprotect_object ($3->self_scm ());
scm_gc_unprotect_object ($2->self_scm ());
$$ = l;
Part_combine_music * p = new Part_combine_music (SCM_EOL);
p->set_mus_property ("what", $2);
- p->set_mus_property ("one", $3->self_scm ());
- p->set_mus_property ("two", $4->self_scm ());
+ p->set_mus_property ("elements", gh_list ($3->self_scm (),$4->self_scm (), SCM_UNDEFINED));
scm_gc_unprotect_object ($3->self_scm ());
scm_gc_unprotect_object ($4->self_scm ());
-
$$ = p;
}
;
Key_change_req *key_p= new Key_change_req;
key_p->set_mus_property ("pitch-alist", $3);
- ((Music* )key_p)->transpose (* unsmob_pitch ($2));
+ ((Music*)key_p)->transpose (* unsmob_pitch ($2));
$$ = key_p;
}
;
TODO: junkme, use text-type == dynamic
*/
Text_script_req *d = new Text_script_req;
- d->set_mus_property ("text-type" , ly_symbol2scm ("dynamic"));
+ SCM dyn = ly_symbol2scm ("dynamic");
+ d->set_mus_property ("text-type" , dyn);
d->set_mus_property ("text", $2);
d->set_spot (THIS->here_input ());
$$ = d;
| DIGIT {
String ds = to_str ($1);
Text_script_req* t = new Text_script_req;
-
+ SCM finger = ly_symbol2scm ("finger");
t->set_mus_property ("text", ly_str02scm (ds.ch_C ()));
- t->set_mus_property ("text-type" , ly_symbol2scm ("finger"));
+ t->set_mus_property ("text-type" , finger);
t->set_spot (THIS->here_input ());
$$ = t;
}
}
| multiplied_duration {
$$ = $1;
+ THIS->default_duration_ = *unsmob_duration ($$);
}
| explicit_duration {
$$ = $1;
+ THIS->default_duration_ = *unsmob_duration ($$);
}
;
l = intlog2 ($1);
$$ = Duration (l, $2).smobbed_copy ();
-
- THIS->set_last_duration (unsmob_duration ($$));
}
| DURATION_IDENTIFIER dots {
Duration *d =unsmob_duration ($1);
Duration k (d->duration_log (),d->dot_count () + $2);
$$ = k.smobbed_copy ();
-
- THIS->set_last_duration (unsmob_duration ($$));
}
;
projects / lilypond.git / blobdiff