#include <stdlib.h>
-
+#include "scm-option.hh"
#include "translator-def.hh"
#include "lily-guile.hh"
#include "misc.hh"
%pure_parser
-/* tokens which are not keywords */
-%token AUTOCHANGE
+
+%token ACCEPTS
+%token ADDLYRICS
%token ALIAS
+%token ALTERNATIVE
+%token APPLY
%token APPLYCONTEXT
%token APPLYOUTPUT
-%token APPLY
-%token ACCEPTS
-%token ALTERNATIVE
+%token AUTOCHANGE
%token BAR
%token BREATHE
%token CHORDMODIFIERS
%token CHORDS
+%token CHORD_CLOSE
+%token CHORD_OPEN
%token CLEF
+%token COMMANDSPANREQUEST
%token CONSISTS
-%token DURATION
-%token SEQUENTIAL
-%token GROBDESCRIPTIONS
-%token SIMULTANEOUS
%token CONSISTSEND
+%token CONTEXT
+%token DEFAULT
%token DENIES
%token DESCRIPTION
+%token DURATION
%token EXTENDER
%token FIGURES FIGURE_OPEN FIGURE_CLOSE
%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
%token GRACE
+%token GROBDESCRIPTIONS
%token HEADER
%token HYPHEN
%token INVALID
%token KEY
%token LYRICS
%token MARK
-%token MULTI_MEASURE_REST
%token MIDI
-%token PITCH
-%token DEFAULT
+%token MULTI_MEASURE_REST
%token NAME
-%token PITCHNAMES
+%token NEWCONTEXT
%token NOTES
+%token OCTAVE
%token ONCE
+%token OUTPUTPROPERTY
+%token OVERRIDE SET REVERT
%token PAPER
+%token PARTCOMBINE
%token PARTIAL
+%token PITCH
+%token PITCHNAMES
%token PROPERTY
-%token OVERRIDE SET REVERT
%token RELATIVE
%token REMOVE
%token REPEAT
-%token ADDLYRICS
-%token PARTCOMBINE
+%token REST
%token SCM_T
%token SCORE
+%token SEQUENTIAL
+%token SIMULTANEOUS
%token SKIP
%token SPANREQUEST
-%token COMMANDSPANREQUEST
%token TEMPO
-%token OUTPUTPROPERTY
-%token TIME_T
%token TIMES
+%token TIME_T
%token TRANSLATOR
%token TRANSPOSE
%token TYPE
%token UNSET
-%token CONTEXT
-%token REST
-
-%token CHORD_OPEN
-%token CHORD_CLOSE
/* escaped */
%type <outputdef> output_def
%type <scm> lilypond_header lilypond_header_body
-%type <music> open_event_parens close_event_parens open_event close_event
-%type <music> event_with_dir event_that_take_dir verbose_event
+%type <music> open_event close_event
%type <i> sub_quotes sup_quotes
%type <music> simple_element event_chord command_element Simple_music Composite_music
%type <music> Repeated_music
%type <scm> verbose_duration
%type <scm> post_events
-%type <music> gen_text_def
+%type <music> gen_text_def direction_less_event direction_reqd_event
%type <scm> steno_pitch pitch absolute_pitch pitch_also_in_chords
%type <scm> explicit_pitch steno_tonic_pitch
-
-/* %type <scm> chord_additions chord_subtractions chord_notes chord_step */
-/* %type <music> chord */
-/* %type <scm> chord_note chord_inversion chord_bass */
%type <scm> duration_length fraction
%type <scm> new_chord step_number chord_items chord_item chord_separator step_numbers
%type <music> command_req verbose_command_req
%type <music> extender_req
%type <music> hyphen_req
-%type <music> string_event
+%type <music> string_number_event
%type <scm> string bare_number number_expression number_term number_factor
%type <score> score_block score_body
$$ = csm;
}
+ | NEWCONTEXT string Music {
+ static int new_context_count;
+
+ Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+
+ csm->set_mus_property ("element", $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
+
+ csm->set_mus_property ("context-type", $2);
+
+ SCM new_id = scm_number_to_string (gh_int2scm (new_context_count ++),
+ gh_int2scm (10));
+ csm->set_mus_property ("context-id", new_id);
+ $$ = csm;
+ }
| TIMES {
THIS->push_spot ();
}
scm_gc_unprotect_object (p->self_scm ());
- $$->set_mus_property ("last-pitch", p->to_relative_octave (pit).smobbed_copy ());
-
+ Pitch retpitch = p->to_relative_octave (pit);
+ if (lily_1_8_relative)
+ $$->set_mus_property ("last-pitch", retpitch.smobbed_copy ());
}
;
command_req {
$$ = MY_MAKE_MUSIC("EventChord");
$$->set_mus_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
- scm_gc_unprotect_object ($1->self_scm());
+ scm_gc_unprotect_object ($1->self_scm());
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
}
+ | OCTAVE { THIS->push_spot (); }
+ pitch {
+ Music *l = MY_MAKE_MUSIC("RelativeOctaveCheck");
+ $$ = l;
+ $$->set_spot (THIS->pop_spot ());
+ $$->set_mus_property ("pitch", $3);
+ }
| E_LEFTSQUARE {
Music *l = MY_MAKE_MUSIC("LigatureEvent");
l->set_mus_property ("span-direction", gh_int2scm (START));
| hyphen_req {
$$ = $1;
}
- | '~' {
- $$ = MY_MAKE_MUSIC("TieEvent");
- }
- | '[' {
- Music *b= MY_MAKE_MUSIC("BeamEvent");
- b->set_mus_property ("span-direction", gh_int2scm (START));
- $$ = b;
-
- THIS->last_beam_start_ = b->self_scm ();
- }
- | ']' {
- Music *b= MY_MAKE_MUSIC("BeamEvent");
- b->set_mus_property ("span-direction", gh_int2scm (STOP));
- $$ = b;
- }
| BREATHE {
$$ = MY_MAKE_MUSIC("BreathingSignEvent");
}
}
;
+
+
post_event:
- verbose_event
- | event_with_dir
- | close_event
- | string_event
+ direction_less_event {
+ $$ = $1;
+ }
+ | script_dir direction_reqd_event {
+ $2->set_mus_property ("direction", gh_int2scm ($1));
+ $$ = $2;
+ }
+ | script_dir direction_less_event {
+ $2->set_mus_property ("direction", gh_int2scm ($1));
+ $$ = $2;
+ }
+ | string_number_event
;
-string_event:
+string_number_event:
E_UNSIGNED {
Music * s = MY_MAKE_MUSIC("StringNumberEvent");
s->set_mus_property ("string-number", gh_int2scm($1));
;
-event_that_take_dir:
- gen_text_def
- | verbose_event
- | close_event
- | open_event
- | '[' {
+direction_less_event:
+ '[' {
/*
(set-articulation '~ "trill")
*/
- Music * m = MY_MAKE_MUSIC ("NewBeamEvent");
+ Music * m = MY_MAKE_MUSIC ("BeamEvent");
m->set_spot (THIS->here_input());
m->set_mus_property ("span-direction" , gh_int2scm (START));
$$ = m;
}
| ']' {
- Music * m = MY_MAKE_MUSIC ("NewBeamEvent");
+ Music * m = MY_MAKE_MUSIC ("BeamEvent");
m->set_spot (THIS->here_input());
m->set_mus_property ("span-direction" , gh_int2scm (STOP));
$$ = m;
}
| '~' {
- Music * m = MY_MAKE_MUSIC ("NewTieEvent");
+ Music * m = MY_MAKE_MUSIC ("TieEvent");
m->set_spot (THIS->here_input());
$$ = m;
}
- | script_abbreviation {
- SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
- Music *a = MY_MAKE_MUSIC("ArticulationEvent");
- if (gh_string_p (s))
- a->set_mus_property ("articulation-type", s);
- else THIS->parser_error (_ ("Expecting string as script definition"));
- $$ = a;
+ | close_event {
+ $$ = $1;
+ dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (START));
}
- ;
-
-event_with_dir:
- script_dir event_that_take_dir {
- $2->set_mus_property ("direction", gh_int2scm ($1));
- $$ = $2;
+ | open_event {
+ $$ = $1;
+ dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP))
}
- ;
-
-verbose_event:
- EVENT_IDENTIFIER {
+ | EVENT_IDENTIFIER {
$$ = unsmob_music ($1);
}
| tremolo_type {
a->set_mus_property ("tremolo-type", gh_int2scm ($1));
$$ = a;
}
+ ;
+
+direction_reqd_event:
+ gen_text_def {
+ $$ = $1;
+ }
+ | script_abbreviation {
+ SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
+ Music *a = MY_MAKE_MUSIC("ArticulationEvent");
+ if (gh_string_p (s))
+ a->set_mus_property ("articulation-type", s);
+ else THIS->parser_error (_ ("Expecting string as script definition"));
+ $$ = a;
+ }
;
-
+
sup_quotes:
'\'' {
$$ = 1;
;
close_event:
- close_event_parens {
- $$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (START))
-;
- }
- ;
-
-close_event_parens:
'(' {
Music * s= MY_MAKE_MUSIC("SlurEvent");
$$ = s;
open_event:
- open_event_parens {
- $$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP))
-;
- }
- ;
-
-open_event_parens:
E_EXCLAMATION {
Music *s = MY_MAKE_MUSIC("CrescendoEvent");
s->set_spot (THIS->here_input());
;
gen_text_def:
- embedded_scm {
- Music *t = MY_MAKE_MUSIC("TextScriptEvent");
- t->set_mus_property ("text", $1);
- t->set_spot (THIS->here_input ());
- $$ = t;
- }
- | full_markup {
+ full_markup {
Music *t = MY_MAKE_MUSIC("TextScriptEvent");
t->set_mus_property ("text", $1);
t->set_spot (THIS->here_input ());
/*
UTILITIES
+
+TODO: should deprecate in favor of Scheme?
+
*/
number_expression:
number_expression '+' number_term {
-
- THIS->
$$ = scm_sum ($1, $3);
}
| number_expression '-' number_term {
-bool
-markup_p (SCM x)
-{
- return gh_pair_p (x)
- && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature"));
-}
-
/*
*destination = p->self_scm();
return MUSIC_OUTPUT_DEF_IDENTIFIER;
- } else if (new_markup_p (sid)) {
+ } else if (Text_item::markup_p (sid)) {
*destination = sid;
return MARKUP_IDENTIFIER;
}