*/
#include <ctype.h>
-#include <iostream.h>
#include "translator-def.hh"
#include "lily-guile.hh"
-#include "change-iterator.hh"
#include "misc.hh"
#include "my-lily-lexer.hh"
#include "paper-def.hh"
#include "midi-def.hh"
#include "main.hh"
#include "file-path.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "dimensions.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
#include "my-lily-parser.hh"
-#include "context-specced-music.hh"
#include "score.hh"
-#include "music-list.hh"
-#include "output-property-music-iterator.hh"
-#include "property-iterator.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
#include "input.hh"
-#include "scope.hh"
-#include "relative-music.hh"
-#include "lyric-combine-music.hh"
-#include "transposed-music.hh"
-#include "time-scaled-music.hh"
-#include "repeated-music.hh"
-#include "untransposable-music.hh"
#include "lilypond-input-version.hh"
-#include "grace-music.hh"
-#include "part-combine-music.hh"
#include "scm-hash.hh"
#include "auto-change-iterator.hh"
-#include "un-relativable-music.hh"
#include "chord.hh"
+#include "ly-modules.hh"
+#include "music-sequence.hh"
+#include "input-smob.hh"
+#include "event.hh"
bool
regular_identifier_b (SCM id)
{
String str = ly_scm2string (id);
- char const *s = str.ch_C() ;
+ char const *s = str.to_str0 () ;
bool v = true;
while (*s && v)
}
-Music*
-set_property_music (SCM sym, SCM value)
-{
- Music * p = new Music (SCM_EOL);
- p->set_mus_property ("symbol", sym);
- p->set_mus_property ("iterator-ctor",
- Property_iterator::constructor_cxx_function);
-
- p->set_mus_property ("value", value);
- return p;
-}
bool
is_duration_b (int t)
{
for (SCM k = a; gh_pair_p (k); k = ly_cdr (k))
{
- p->set_mus_property (ly_caar (k), ly_cdar (k));
+ p->internal_set_mus_property (ly_caar (k), ly_cdar (k));
}
}
+#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
-
+Music*
+set_property_music (SCM sym, SCM value)
+{
+ Music * p = MY_MAKE_MUSIC("PropertySet");
+ p->set_mus_property ("symbol", sym);
+ p->set_mus_property ("value", value);
+ return p;
+}
// needed for bison.simple's malloc () and free ()
-#include <malloc.h>
-#ifndef NDEBUG
-#define YYDEBUG 1
-#endif
+// #include <malloc.h>
+#include <stdlib.h>
+
+
#define YYERROR_VERBOSE 1
-#define YYPARSE_PARAM my_lily_parser_l
-#define YYLEX_PARAM my_lily_parser_l
+My_lily_parser* my_lily_parser;
+#define YYPARSE_PARAM my_lily_parser
+#define YYLEX_PARAM my_lily_parser
#define THIS\
- ((My_lily_parser *) my_lily_parser_l)
+ ((My_lily_parser *) my_lily_parser)
#define yyerror THIS->parser_error
-#define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f ("Expecting %d arguments", s))
%}
+/* We use SCMs to do strings, because it saves us the trouble of
+deleting them. Let's hope that a stack overflow doesnt trigger a move
+of the parse stack onto the heap. */
+
%union {
- Link_array<Request> *reqvec;
+ Link_array<Music> *reqvec;
String *string; // needed by the lexer as temporary scratch area.
Music *music;
Score *score;
- Scope *scope;
- Scheme_hash_table *scmhash;
Music_output_def * outputdef;
-
- Request * request;
-
- /* We use SCMs to do strings, because it saves us the trouble of
-deleting them. Let's hope that a stack overflow doesnt trigger a move
-of the parse stack onto the heap. */
-
SCM scm;
-
- Tempo_req *tempo;
int i;
}
%{
int
-yylex (YYSTYPE *s, void * v_l)
+yylex (YYSTYPE *s, void * v)
{
- My_lily_parser *pars_l = (My_lily_parser*) v_l;
- My_lily_lexer * lex_l = pars_l->lexer_p_;
+ My_lily_parser *pars = (My_lily_parser*) v;
+ My_lily_lexer * lex = pars->lexer_;
- lex_l->lexval_l = (void*) s;
- return lex_l->yylex ();
+ lex->lexval = (void*) s;
+ lex->prepare_for_next_token();
+ return lex->yylex ();
}
%token AUTOCHANGE
%token ALIAS
%token APPLY
-%token ARPEGGIO
-%token DYNAMICSCRIPT
%token ACCEPTS
%token ALTERNATIVE
%token BAR
%token SIMULTANEOUS
%token CONSISTSEND
%token DENIES
-%token DURATION
%token EXTENDER
%token FIGURES FIGURE_OPEN FIGURE_CLOSE
-%token GLISSANDO
+%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
%token GRACE
%token HEADER
%token HYPHEN
%token NAME
%token PITCHNAMES
%token NOTES
+%token ONCE
%token PAPER
%token PARTIAL
-%token PENALTY
%token PROPERTY
%token OVERRIDE SET REVERT
%token PT_T
%token PARTCOMBINE
%token SCM_T
%token SCORE
-%token SCRIPT
%token SKIP
%token SPANREQUEST
-%token STYLESHEET
%token COMMANDSPANREQUEST
%token TEMPO
%token OUTPUTPROPERTY
%token TYPE
%token UNSET
%token CONTEXT
+%token REST
/* escaped */
-%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE E_TILDE
-%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET
-
-%type <i> exclamations questions dots
+%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE
+%token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE
+%token E_BACKSLASH
+%token <i> E_UNSIGNED
+%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET CHORD_SLASH
+%token FIGURE_SPACE
+
+%type <i> exclamations questions dots optional_rest
%type <i> bass_number bass_mod
-%type <scm> bass_figure figure_list figure_spec
+%type <scm> br_bass_figure bass_figure figure_list figure_spec
%token <i> DIGIT
%token <scm> NOTENAME_PITCH
%token <scm> TONICNAME_PITCH
%token <scm> SCORE_IDENTIFIER
%token <scm> MUSIC_OUTPUT_DEF_IDENTIFIER
-
%token <scm> NUMBER_IDENTIFIER
-%token <scm> REQUEST_IDENTIFIER
+%token <scm> EVENT_IDENTIFIER
%token <scm> MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER
%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
%token <scm> RESTNAME
%token <scm> REAL
%type <outputdef> output_def
-%type <scmhash> lilypond_header lilypond_header_body
-%type <request> open_request_parens close_request_parens open_request close_request
-%type <request> request_with_dir request_that_take_dir verbose_request
+%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 <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> simple_element event_chord command_element Simple_music Composite_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> identifier_init
%type <scm> steno_duration optional_notemode_duration multiplied_duration
-%type <scm> explicit_duration
+%type <scm> verbose_duration
-%type <reqvec> pre_requests post_requests
-%type <request> gen_text_def
+%type <reqvec> pre_events post_events
+%type <music> gen_text_def
%type <scm> steno_pitch pitch absolute_pitch
%type <scm> explicit_pitch steno_tonic_pitch
%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 <music> property_def translator_change simple_property_def
%type <scm> Music_list
%type <outputdef> music_output_def_body
-%type <request> shorthand_command_req
-%type <request> post_request
+%type <music> shorthand_command_req
+%type <music> post_event
%type <music> command_req verbose_command_req
-%type <request> extender_req
-%type <request> hyphen_req
+%type <music> extender_req
+%type <music> hyphen_req
+%type <music> string_event
%type <scm> string bare_number number_expression number_term number_factor
%type <score> score_block score_body
%type <scm> translator_spec_block translator_spec_body
-%type <tempo> tempo_request
+%type <music> tempo_event
%type <scm> notenames_body notenames_block chordmodifiers_block
%type <scm> script_abbreviation
| lilypond toplevel_expression {}
| lilypond assignment { }
| lilypond error {
- THIS->error_level_i_ = 1;
+ THIS->error_level_ = 1;
}
| lilypond INVALID {
- THIS->error_level_i_ = 1;
+ THIS->error_level_ = 1;
}
;
toplevel_expression:
notenames_block {
- THIS->lexer_p_->pitchname_tab_ = $1;
+ THIS->lexer_->pitchname_tab_ = $1;
}
| chordmodifiers_block {
- THIS->lexer_p_->chordmodifier_tab_ = $1;
+ THIS->lexer_->chordmodifier_tab_ = $1;
}
| lilypond_header {
- if (global_header_p)
- scm_gc_unprotect_object (global_header_p->self_scm ());
- global_header_p = $1;
+ THIS->input_file_->header_ = $1;
}
| score_block {
- score_global_array.push ($1);
+ THIS->input_file_->scores_.push ($1);
}
| output_def {
if (dynamic_cast<Paper_def*> ($1))
- THIS->lexer_p_->set_identifier ("$defaultpaper", $1->self_scm ());
+ THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultpaper"), $1->self_scm ());
else if (dynamic_cast<Midi_def*> ($1))
- THIS->lexer_p_->set_identifier ("$defaultmidi", $1->self_scm ());
+ THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultmidi"), $1->self_scm ());
}
- | embedded_scm {
- // junk value
- }
;
embedded_scm:
lilypond_header_body:
{
- $$ = new Scheme_hash_table;
-
- Scope *sc = new Scope ($$);
- THIS->lexer_p_-> scope_l_arr_.push (sc);
+ $$ = ly_make_anonymous_module ();
+ THIS->lexer_->add_scope ($$);
}
| lilypond_header_body assignment {
-
+
}
;
lilypond_header:
HEADER '{' lilypond_header_body '}' {
- $$ = $3;
- delete THIS->lexer_p_-> scope_l_arr_.pop ();
+ $$ = THIS->lexer_-> remove_scope();
}
;
if (! regular_identifier_b ($1))
{
- ip.warning (_ ("Identifier should have alphabetic characters only"));
+ ip.warning (_ ("Identifier should have alphabetic characters only"));
}
- THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4);
+ THIS->lexer_->set_identifier ($1, $4);
/*
TODO: devise standard for protection in parser.
*/
}
+ | embedded_scm { }
;
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | post_request {
+ | post_event {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | explicit_duration {
+ | verbose_duration {
$$ = $1;
}
| number_expression {
translator_spec_body:
TRANSLATOR_IDENTIFIER {
- $$ = unsmob_translator_def ($1)->clone_scm ();
+ $$ = $1;
unsmob_translator_def ($$)-> set_spot (THIS->here_input ());
}
| TYPE STRING {
unsmob_translator_def ($$)
->add_push_property (scm_string_to_symbol ($2), $4, $6);
}
+ | translator_spec_body STRING SET embedded_scm '=' embedded_scm {
+ unsmob_translator_def ($$)
+ ->add_push_property (scm_string_to_symbol ($2), $4, $6);
+ }
| translator_spec_body STRING REVERT embedded_scm {
unsmob_translator_def ($$)->add_pop_property (
scm_string_to_symbol ($2), $4);
}
| translator_spec_body ALIAS STRING {
Translator_def*td = unsmob_translator_def ($$);
- td->type_aliases_ = gh_cons ($3, td->type_aliases_);
+ td->type_aliases_ = scm_cons ($3, td->type_aliases_);
}
| translator_spec_body GROBDESCRIPTIONS embedded_scm {
Translator_def*td = unsmob_translator_def($$);
/*cont*/ '{' score_body '}' {
THIS->pop_spot ();
$$ = $4;
- if (!$$->def_p_arr_.size ())
+ if (!$$->defs_.size ())
{
Music_output_def *id =
- unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper"));
+ unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"));
$$->add_output (id ? id->clone () : new Paper_def );
}
}
$$->set_spot (THIS->here_input ());
SCM m = $1->self_scm ();
scm_gc_unprotect_object (m);
+
+ /*
+ guh.
+ */
+ SCM check_funcs = scm_c_eval_string ("toplevel-music-functions");
+ for (; gh_pair_p (check_funcs); check_funcs = gh_cdr (check_funcs))
+ m = gh_call1 (gh_car (check_funcs), m);
$$->music_ = m;
+
}
| SCORE_IDENTIFIER {
- $$ = new Score (*unsmob_score ($1));
+ $$ = unsmob_score ($1);
$$->set_spot (THIS->here_input ());
}
| score_body lilypond_header {
- scm_gc_unprotect_object ($2->self_scm ());
- $$->header_p_ = $2;
+ $$->header_ = $2;
}
| score_body output_def {
$$->add_output ($2);
output_def:
music_output_def_body '}' {
$$ = $1;
- THIS-> lexer_p_-> scope_l_arr_.pop ();
+ THIS-> lexer_-> remove_scope ();
}
;
music_output_def_body:
MIDI '{' {
- Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultmidi"));
+ Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi"));
-
- Midi_def* p =0;
- if (id)
- p = dynamic_cast<Midi_def*> (id->clone ());
- else
- p = new Midi_def;
- $$ = p;
- THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
+ Midi_def* p =0;
+ if (id)
+ p = dynamic_cast<Midi_def*> (id->clone ());
+ else
+ p = new Midi_def;
+
+ $$ = p;
+ THIS->lexer_->add_scope (p->scope_);
}
| PAPER '{' {
- Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper"));
+ Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"));
Paper_def *p = 0;
if (id)
p = dynamic_cast<Paper_def*> (id->clone ());
else
p = new Paper_def;
- THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_);
+
+ THIS->lexer_->add_scope (p->scope_);
$$ = p;
}
| PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
- Music_output_def *p = unsmob_music_output_def ($3);
- p = p->clone ();
- THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
- $$ = p;
+ Music_output_def * o = unsmob_music_output_def ($3);
+ $$ =o;
+
+ THIS->lexer_->add_scope (o->scope_);
}
| MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
- Music_output_def *p = unsmob_music_output_def ($3);
- p = p->clone ();
+ Music_output_def * o = unsmob_music_output_def ($3);
+ $$ = o;
- THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
- $$ = p;
+ THIS->lexer_->add_scope (o->scope_);
}
| music_output_def_body assignment {
| music_output_def_body translator_spec_block {
$$->assign_translator ($2);
}
- | music_output_def_body STYLESHEET embedded_scm {
- dynamic_cast<Paper_def*> ($$)-> style_sheet_ = $3;
- }
- | music_output_def_body tempo_request {
+ | music_output_def_body tempo_event {
/*
junk this ? there already is tempo stuff in
music.
*/
int m = gh_scm2int ( $2->get_mus_property ("metronome-count"));
Duration *d = unsmob_duration ($2->get_mus_property ("duration"));
- dynamic_cast<Midi_def*> ($$)->set_tempo (d->length_mom (), m);
+ Midi_def * md = dynamic_cast<Midi_def*> ($$);
+ if (md)
+ md->set_tempo (d->get_length (), m);
}
| music_output_def_body error {
}
;
-tempo_request:
+tempo_event:
TEMPO steno_duration '=' bare_unsigned {
- $$ = new Tempo_req;
+ $$ = MY_MAKE_MUSIC("TempoEvent");
$$->set_mus_property ("duration", $2);
$$->set_mus_property ("metronome-count", gh_int2scm ( $4));
}
;
+/*
+The representation of a list is the
+
+ (LIST . LAST-CONS)
+
+ to have efficient append.
+*/
Music_list: /* empty */ {
- $$ = gh_cons (SCM_EOL, SCM_EOL);
+ $$ = scm_cons (SCM_EOL, SCM_EOL);
}
| Music_list Music {
SCM s = $$;
- SCM c = gh_cons ($2->self_scm (), SCM_EOL);
+ SCM c = scm_cons ($2->self_scm (), SCM_EOL);
scm_gc_unprotect_object ($2->self_scm ()); /* UGH */
if (gh_pair_p (ly_cdr (s)))
gh_set_cdr_x (ly_cdr (s), c); /* append */
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);
+ static SCM proc;
+ if (!proc)
+ proc = scm_c_eval_string ("make-repeated-music");
+ SCM mus = scm_call_1 (proc, $2);
+ scm_gc_protect_object (mus); // UGH.
+ Music *r =unsmob_music (mus);
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 ());
- }
- SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor"));
- SCM result = gh_call1 (func, $2);
-
- set_music_properties (r, result);
-
+ r-> set_mus_property ("elements",alts);
+ if (gh_equal_p ($2, scm_makfrom0str ("tremolo")))
+ {
+ /*
+ we can not get durations and other stuff correct down the line, so we have to
+ add to the duration log here.
+ */
+ SCM func = scm_primitive_eval (ly_symbol2scm ("shift-duration-log"));
+ if (($3 % 3) == 0)
+ gh_call3 (func, r->self_scm (), gh_int2scm(-intlog2 ($3*2/3)),gh_int2scm(1));
+ else
+ gh_call3 (func, r->self_scm (), gh_int2scm(-intlog2 ($3)), gh_int2scm(0));
+ }
r->set_spot (*$4->origin ());
- $$ = r;
- }
- ;
-Music_sequence: '{' Music_list '}' {
- $$ = new Music_sequence (SCM_EOL);
- $$->set_mus_property ("elements", ly_car ($2));
+ $$ = r;
}
;
Sequential_music:
SEQUENTIAL '{' Music_list '}' {
- $$ = new Sequential_music (SCM_EOL);
+ $$ = MY_MAKE_MUSIC("SequentialMusic");
$$->set_mus_property ("elements", ly_car ($3));
+ $$->set_spot(THIS->here_input());
}
| '{' Music_list '}' {
- $$ = new Sequential_music (SCM_EOL);
+ $$ = MY_MAKE_MUSIC("SequentialMusic");
$$->set_mus_property ("elements", ly_car ($2));
+ $$->set_spot(THIS->here_input());
}
;
Simultaneous_music:
SIMULTANEOUS '{' Music_list '}'{
- $$ = new Simultaneous_music (SCM_EOL);
+ $$ = MY_MAKE_MUSIC("SimultaneousMusic");
$$->set_mus_property ("elements", ly_car ($3));
+ $$->set_spot(THIS->here_input());
}
| '<' Music_list '>' {
- $$ = new Simultaneous_music (SCM_EOL);
+ $$ = MY_MAKE_MUSIC("SimultaneousMusic");
$$->set_mus_property ("elements", ly_car ($2));
+ $$->set_spot(THIS->here_input());
}
;
Simple_music:
- request_chord { $$ = $1; }
+ event_chord { $$ = $1; }
| OUTPUTPROPERTY embedded_scm embedded_scm '=' embedded_scm {
SCM pred = $2;
if (!gh_symbol_p ($3))
{
THIS->parser_error (_ ("Second argument must be a symbol"));
}
- /*hould check # args */
+ /* Should check # args */
if (!gh_procedure_p (pred))
{
- THIS->parser_error (_ ("First argument must be a procedure taking 1 argument"));
+ THIS->parser_error (_ ("First argument must be a procedure taking one argument"));
}
- Music *m = new Music (SCM_EOL);
+ Music*m = MY_MAKE_MUSIC("OutputPropertySetMusic");
m->set_mus_property ("predicate", pred);
m->set_mus_property ("grob-property", $3);
m->set_mus_property ("grob-value", $5);
- m->set_mus_property ("iterator-ctor",
- Output_property_music_iterator::constructor_cxx_function);
$$ = m;
}
| MUSIC_IDENTIFIER {
- $$ = unsmob_music ($1)->clone ();
+ $$ = unsmob_music ($1);
}
| property_def
| translator_change
Composite_music:
CONTEXT STRING Music {
- Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ 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);
- csm->set_mus_property ("context-id", ly_str02scm (""));
+ csm->set_mus_property ("context-id", scm_makfrom0str (""));
$$ = csm;
}
| AUTOCHANGE STRING Music {
- Music * chm = new Music_wrapper (SCM_EOL);
+ Music*chm = MY_MAKE_MUSIC("AutoChangeMusic");
chm->set_mus_property ("element", $3->self_scm ());
- chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_cxx_function);
+ chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_proc);
scm_gc_unprotect_object ($3->self_scm ());
chm->set_mus_property ("what", $2);
Sequential_music_iterator in combination with grace notes.
*/
- SCM start = THIS->lexer_p_->lookup_identifier ("startGraceMusic");
- SCM stop = THIS->lexer_p_->lookup_identifier ("stopGraceMusic");
+ SCM start = THIS->lexer_->lookup_identifier ("startGraceMusic");
+ SCM stop = THIS->lexer_->lookup_identifier ("stopGraceMusic");
Music *startm = unsmob_music (start);
Music *stopm = unsmob_music (stop);
SCM ms = SCM_EOL;
if (stopm) {
stopm = stopm->clone ();
- ms = gh_cons (stopm->self_scm (), ms);
+ ms = scm_cons (stopm->self_scm (), ms);
scm_gc_unprotect_object (stopm->self_scm ());
}
- ms = gh_cons ($2->self_scm (), ms);
+ ms = scm_cons ($2->self_scm (), ms);
scm_gc_unprotect_object ($2->self_scm());
if (startm) {
startm = startm->clone ();
- ms = gh_cons (startm->self_scm () , ms);
+ ms = scm_cons (startm->self_scm () , ms);
scm_gc_unprotect_object (startm->self_scm ());
}
- Music* seq = new Sequential_music (SCM_EOL);
+
+ Music* seq = MY_MAKE_MUSIC("SequentialMusic");
seq->set_mus_property ("elements", ms);
- $$ = new Grace_music (SCM_EOL);
+
+ $$ = MY_MAKE_MUSIC("GraceMusic");
$$->set_mus_property ("element", seq->self_scm ());
scm_gc_unprotect_object (seq->self_scm ());
#else
- $$ = new Grace_music (SCM_EOL);
+ $$ = MY_MAKE_MUSIC("GraceMusic");
$$->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);
+ Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+
csm->set_mus_property ("element", $5->self_scm ());
scm_gc_unprotect_object ($5->self_scm ());
{
int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3));
Music *mp = $4;
- $$ = new Time_scaled_music (SCM_EOL);
+ $$= MY_MAKE_MUSIC("TimeScaledMusic");
$$->set_spot (THIS->pop_spot ());
| Simultaneous_music { $$ = $1; }
| Sequential_music { $$ = $1; }
| TRANSPOSE pitch Music {
- $$ = new Transposed_music (SCM_EOL);
+ $$ = MY_MAKE_MUSIC("TransposedMusic");
Music *p = $3;
Pitch pit = *unsmob_pitch ($2);
scm_gc_unprotect_object (p->self_scm ());
}
| TRANSPOSE steno_tonic_pitch Music {
- $$ = new Transposed_music (SCM_EOL);
+ $$ = MY_MAKE_MUSIC("TransposedMusic");
Music *p = $3;
Pitch pit = *unsmob_pitch ($2);
Music *m = unsmob_music (ret);
if (!m) {
THIS->parser_error ("\\apply must return a Music");
- m = new Music (SCM_EOL);
+ m = MY_MAKE_MUSIC("Music");
}
$$ = m;
}
| NOTES
- { THIS->lexer_p_->push_note_state (); }
+ { THIS->lexer_->push_note_state (); }
Music
{ $$ = $3;
- THIS->lexer_p_->pop_state ();
+ THIS->lexer_->pop_state ();
}
| FIGURES
- { THIS->lexer_p_->push_figuredbass_state (); }
+ { THIS->lexer_->push_figuredbass_state (); }
Music
{
- Music * chm = new Untransposable_music () ;
+ Music * chm = MY_MAKE_MUSIC("UntransposableMusic");
chm->set_mus_property ("element", $3->self_scm ());
$$ = chm;
+ scm_gc_unprotect_object ($3->self_scm());
- THIS->lexer_p_->pop_state ();
+ THIS->lexer_->pop_state ();
}
| CHORDS
- { THIS->lexer_p_->push_chord_state (); }
+ { THIS->lexer_->push_chord_state (); }
Music
{
- Music * chm = new Un_relativable_music ;
+ Music * chm = MY_MAKE_MUSIC("UnrelativableMusic");
chm->set_mus_property ("element", $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm());
$$ = chm;
- THIS->lexer_p_->pop_state ();
+ THIS->lexer_->pop_state ();
}
| LYRICS
- { THIS->lexer_p_->push_lyric_state (); }
+ { THIS->lexer_->push_lyric_state (); }
Music
{
$$ = $3;
- THIS->lexer_p_->pop_state ();
+ THIS->lexer_->pop_state ();
}
| relative_music { $$ = $1; }
| re_rhythmed_music { $$ = $1; }
RELATIVE absolute_pitch Music {
Music * p = $3;
Pitch pit = *unsmob_pitch ($2);
- $$ = new Relative_octave_music (SCM_EOL);
+ $$ = MY_MAKE_MUSIC("RelativeOctaveMusic");
$$->set_mus_property ("element", p->self_scm ());
scm_gc_unprotect_object (p->self_scm ());
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 ());
+ Music*l =MY_MAKE_MUSIC("LyricCombineMusic");
+ 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_combined_music:
PARTCOMBINE STRING Music Music {
- Part_combine_music * p = new Part_combine_music (SCM_EOL);
-
+ Music * p= MY_MAKE_MUSIC("PartCombineMusic");
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;
}
;
translator_change:
TRANSLATOR STRING '=' STRING {
- Music * t = new Music (SCM_EOL);
- t->set_mus_property ("iterator-ctor",
- Change_iterator::constructor_cxx_function);
+ Music*t= MY_MAKE_MUSIC("TranslatorChange");
t-> set_mus_property ("change-to-type", $2);
t-> set_mus_property ("change-to-id", $4);
;
property_def:
+ simple_property_def
+ | ONCE simple_property_def {
+ $$ = $2;
+ SCM e = $2->get_mus_property ("element");
+ unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T);
+ }
+ ;
+
+simple_property_def:
PROPERTY STRING '.' STRING '=' scalar {
-
Music *t = set_property_music (scm_string_to_symbol ($4), $6);
- Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
+ csm->set_mus_property ("element", t->self_scm ());
scm_gc_unprotect_object (t->self_scm ());
$$ = csm;
csm-> set_mus_property ("context-type", $2);
}
| PROPERTY STRING '.' STRING UNSET {
- Music *t = new Music (SCM_EOL);
-
- t->set_mus_property ("iterator-ctor",
- Property_unset_iterator::constructor_cxx_function);
+
+ Music *t = MY_MAKE_MUSIC("PropertyUnset");
t->set_mus_property ("symbol", scm_string_to_symbol ($4));
- Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
csm->set_mus_property ("element", t->self_scm ());
scm_gc_unprotect_object (t->self_scm ());
csm-> set_mus_property ("context-type", $2);
}
| PROPERTY STRING '.' STRING SET embedded_scm '=' embedded_scm {
- Music *t = new Music (SCM_EOL);
- t->set_mus_property ("iterator-ctor",
- Push_property_iterator::constructor_cxx_function);
- t->set_mus_property ("symbols", scm_string_to_symbol ($4));
+ bool autobeam
+ = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
+ bool itc = internal_type_checking_global_b;
+ Music *t = MY_MAKE_MUSIC("OverrideProperty");
+ t->set_mus_property ("symbol", scm_string_to_symbol ($4));
t->set_mus_property ("pop-first", SCM_BOOL_T);
+ if (autobeam)
+ internal_type_checking_global_b = false;
t->set_mus_property ("grob-property", $6);
+ if (autobeam)
+ internal_type_checking_global_b = itc;
t->set_mus_property ("grob-value", $8);
- Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+
+ Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
csm->set_mus_property ("element", t->self_scm ());
scm_gc_unprotect_object (t->self_scm ());
$$ = csm;
csm-> set_mus_property ("context-type", $2);
}
- | PROPERTY STRING '.' STRING OVERRIDE embedded_scm '=' embedded_scm {
- Music *t = new Music (SCM_EOL);
- t->set_mus_property ("iterator-ctor",
- Push_property_iterator::constructor_cxx_function);
- t->set_mus_property ("symbols", scm_string_to_symbol ($4));
+ | PROPERTY STRING '.' STRING OVERRIDE
+ embedded_scm '=' embedded_scm
+ {
+ /*
+ UGH UGH UGH UGH.
+ */
+ bool autobeam
+ = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
+ bool itc = internal_type_checking_global_b;
+
+ Music *t = MY_MAKE_MUSIC("OverrideProperty");
+ t->set_mus_property ("symbol", scm_string_to_symbol ($4));
+ if (autobeam)
+ internal_type_checking_global_b = false;
t->set_mus_property ("grob-property", $6);
t->set_mus_property ("grob-value", $8);
- Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ if (autobeam)
+ internal_type_checking_global_b = itc;
+
+ Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
csm->set_mus_property ("element", t->self_scm ());
scm_gc_unprotect_object (t->self_scm ());
$$->set_spot (THIS->here_input ());
csm-> set_mus_property ("context-type", $2);
+
}
| PROPERTY STRING '.' STRING REVERT embedded_scm {
- Music *t = new Music (SCM_EOL);
- t->set_mus_property ("iterator-ctor",
- Pop_property_iterator::constructor_cxx_function);
- t->set_mus_property ("symbols", scm_string_to_symbol ($4));
- t->set_mus_property ("grob-property", $6);
+ Music *t = MY_MAKE_MUSIC("RevertProperty");
+ bool autobeam
+ = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
+ bool itc = internal_type_checking_global_b;
- Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ t->set_mus_property ("symbol", scm_string_to_symbol ($4));
+ if (autobeam)
+ internal_type_checking_global_b = false;
+ t->set_mus_property ("grob-property", $6);
+ if (autobeam)
+ internal_type_checking_global_b = itc;
+
+ Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
csm->set_mus_property ("element", t->self_scm ());
scm_gc_unprotect_object (t->self_scm ());
}
;
+
scalar:
- string { $$ = $1; }
- | bare_int { $$ = gh_int2scm ($1); }
- | embedded_scm { $$ = $1; }
- ;
+ string { $$ = $1; }
+ | bare_int { $$ = gh_int2scm ($1); }
+ | embedded_scm { $$ = $1; }
+ ;
-request_chord:
- pre_requests {
+event_chord:
+ pre_events {
THIS->push_spot ();
- } /*cont */ simple_element post_requests {
+ } /*cont */ simple_element post_events {
Music_sequence *l = dynamic_cast<Music_sequence*> ($3);
- if (l) {
- for (int i=0; i < $1->size (); i++)
- l->append_music ($1->elem (i));
- for (int i=0; i < $4->size (); i++)
- l->append_music ($4->elem (i));
- }
- else
- programming_error ("Need Sequence to add music to");
+
+ $1->concat (*$4);
+ for (int i=0; i < $1->size (); i++) {
+ Music * m = $1->elem (i);
+ l->append_music (m);
+ }
$$ = $3;
+
+ delete $1;
+ delete $4;
}
| command_element
;
command_element:
command_req {
- $$ = new Request_chord (SCM_EOL);
- $$->set_mus_property ("elements", gh_cons ($1->self_scm (), SCM_EOL));
+ $$ = MY_MAKE_MUSIC("EventChord");
+ $$->set_mus_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
+ scm_gc_unprotect_object ($1->self_scm());
+
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
}
+ | E_LEFTSQUARE {
+ Music *l = MY_MAKE_MUSIC("LigatureEvent");
+ l->set_mus_property ("span-direction", gh_int2scm (START));
+ l->set_spot (THIS->here_input ());
+
+ $$ = MY_MAKE_MUSIC("EventChord");
+ $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
+ scm_gc_unprotect_object (l->self_scm());
+ $$->set_spot (THIS->here_input ());
+ }
+ | E_RIGHTSQUARE {
+ Music *l = MY_MAKE_MUSIC("LigatureEvent");
+ l->set_mus_property ("span-direction", gh_int2scm (STOP));
+ l->set_spot (THIS->here_input ());
+
+ $$ = MY_MAKE_MUSIC("EventChord");
+ $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
+ $$->set_spot (THIS->here_input ());
+ scm_gc_unprotect_object (l->self_scm());
+
+ }
+ | E_BACKSLASH {
+ $$ = MY_MAKE_MUSIC("VoiceSeparator");
+ $$->set_spot (THIS->here_input ());
+ }
+ | '|' {
+
+ $$ = MY_MAKE_MUSIC("BarCheck");
+ $$->set_spot (THIS->here_input ());
+ }
| BAR STRING {
Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2);
- Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
csm->set_mus_property ("element", t->self_scm ());
scm_gc_unprotect_object (t->self_scm ());
$$ = csm;
$$->set_spot (THIS->here_input ());
- csm->set_mus_property ("context-type", ly_str02scm ("Score"));
+ csm->set_mus_property ("context-type", scm_makfrom0str ("Timing"));
}
| PARTIAL duration_length {
- Moment m = - unsmob_duration ($2)->length_mom ();
+ Moment m = - unsmob_duration ($2)->get_length ();
Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
- Context_specced_music * sp = new Context_specced_music (SCM_EOL);
+ Music * sp = MY_MAKE_MUSIC("ContextSpeccedMusic");
sp->set_mus_property ("element", p->self_scm ());
scm_gc_unprotect_object (p->self_scm ());
$$ =sp ;
- sp-> set_mus_property ("context-type", ly_str02scm ( "Score"));
+ sp-> set_mus_property ("context-type", scm_makfrom0str ("Timing"));
}
| CLEF STRING {
- SCM func = scm_primitive_eval (ly_symbol2scm ("clef-name-to-properties"));
- SCM result = gh_call1 (func, $2);
-
- SCM l = SCM_EOL;
- for (SCM s = result ; gh_pair_p (s); s = ly_cdr (s)) {
- Music * p = new Music (SCM_EOL);
- set_music_properties (p, ly_car (s));
- l = gh_cons (p->self_scm (), l);
- scm_gc_unprotect_object (p->self_scm ());
- }
- Sequential_music * seq = new Sequential_music (SCM_EOL);
- seq->set_mus_property ("elements", l);
-
- Context_specced_music * sp = new Context_specced_music (SCM_EOL);
- sp->set_mus_property ("element", seq->self_scm ());
- scm_gc_unprotect_object (seq->self_scm ());
+ static SCM proc ;
+ if (!proc)
+ proc = scm_c_eval_string ("make-clef-set");
- $$ =sp ;
- sp-> set_mus_property ("context-type", ly_str02scm ("Staff"));
+ SCM result = scm_call_1 (proc, $2);
+ scm_gc_protect_object (result);
+ $$ = unsmob_music (result);
}
| TIME_T fraction {
Music * p1 = set_property_music (ly_symbol2scm ( "timeSignatureFraction"), $2);
- int l = gh_scm2int (ly_car ($2));
- int o = gh_scm2int (ly_cdr ($2));
-
- Moment one_beat = Moment (1)/Moment (o);
- Moment len = Moment (l) * one_beat;
+ int l = gh_scm2int (ly_car ($2));
+ int o = gh_scm2int (ly_cdr ($2));
+
+ Moment one_beat = Moment (1)/Moment (o);
+ Moment len = Moment (l) * one_beat;
Music *p2 = set_property_music (ly_symbol2scm ("measureLength"), len.smobbed_copy ());
Music *p3 = set_property_music (ly_symbol2scm ("beatLength"), one_beat.smobbed_copy ());
SCM list = scm_list_n (p1->self_scm (), p2->self_scm (), p3->self_scm(), SCM_UNDEFINED);
- Sequential_music *seq = new Sequential_music (SCM_EOL);
+ Music *seq = MY_MAKE_MUSIC("SequentialMusic");
seq->set_mus_property ("elements", list);
- Context_specced_music * sp = new Context_specced_music (SCM_EOL);
+ Music * sp = MY_MAKE_MUSIC("ContextSpeccedMusic");
sp->set_mus_property ("element", seq->self_scm ());
-
-
scm_gc_unprotect_object (p3->self_scm ());
scm_gc_unprotect_object (p2->self_scm ());
scm_gc_unprotect_object (p1->self_scm ());
$$ = sp;
-/*
- TODO: should make alias TimingContext for Score
-*/
-
- sp-> set_mus_property ("context-type", ly_str02scm ( "Score"));
+ sp-> set_mus_property ("context-type", scm_makfrom0str ( "Timing"));
}
;
| hyphen_req {
$$ = $1;
}
- | '|' {
- $$ = new Barcheck_req;
- }
| '~' {
- $$ = new Tie_req;
+ $$ = MY_MAKE_MUSIC("TieEvent");
}
| '[' {
- Span_req*b= new Span_req;
- b->set_span_dir (START);
- b->set_mus_property ("span-type", ly_str02scm ("beam"));
+ Music *b= MY_MAKE_MUSIC("BeamEvent");
+ b->set_mus_property ("span-direction", gh_int2scm (START))
+;
$$ =b;
+
+
+ THIS->last_beam_start_ = b->self_scm ();
}
| ']' {
- Span_req*b= new Span_req;
- b->set_span_dir ( STOP);
- b->set_mus_property ("span-type", ly_str02scm ("beam"));
+ Music *b= MY_MAKE_MUSIC("BeamEvent");
+ b->set_mus_property ("span-direction", gh_int2scm (STOP));
$$ = b;
}
| BREATHE {
- $$ = new Breathing_sign_req;
+ $$ = MY_MAKE_MUSIC("BreathingSignEvent");
}
| E_TILDE {
- $$ = new Porrectus_req;
+ $$ = MY_MAKE_MUSIC("PorrectusEvent");
}
;
verbose_command_req:
- COMMANDSPANREQUEST bare_int STRING { /*TODO: junkme */
- Span_req * sp_p = new Span_req;
- sp_p-> set_span_dir ( Direction ($2));
- sp_p->set_mus_property ("span-type",$3);
- sp_p->set_spot (THIS->here_input ());
- $$ = sp_p;
- }
- | MARK DEFAULT {
- Mark_req * m = new Mark_req;
+ MARK DEFAULT {
+ Music * m = MY_MAKE_MUSIC("MarkEvent");
$$ = m;
}
| MARK scalar {
- Mark_req *m = new Mark_req;
+ Music *m = MY_MAKE_MUSIC("MarkEvent");
m->set_mus_property ("label", $2);
$$ = m;
-
- }
- | PENALTY SCM_T {
-
-
- Break_req * b = new Break_req;
- SCM s = $2;
- if (!gh_number_p (s))
- s =gh_int2scm (0);
-
- b->set_mus_property ("penalty", s);
- b->set_spot (THIS->here_input ());
- $$ = b;
}
| SKIP duration_length {
- Skip_req * skip_p = new Skip_req;
- skip_p->set_mus_property ("duration", $2);
+ Music * skip = MY_MAKE_MUSIC("SkipEvent");
+ skip->set_mus_property ("duration", $2);
- $$ = skip_p;
+ $$ = skip;
}
- | tempo_request {
+ | tempo_event {
$$ = $1;
}
| KEY DEFAULT {
- Key_change_req *key_p= new Key_change_req;
- $$ = key_p;
+ Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
+ $$ = key;
}
| KEY NOTENAME_PITCH SCM_IDENTIFIER {
- Key_change_req *key_p= new Key_change_req;
+ Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
- key_p->set_mus_property ("pitch-alist", $3);
- ((Music* )key_p)->transpose (* unsmob_pitch ($2));
- $$ = key_p;
+ key->set_mus_property ("pitch-alist", $3);
+ ((Music*)key)->transpose (* unsmob_pitch ($2));
+ $$ = key;
}
;
-post_requests:
+post_events:
{
- $$ = new Link_array<Request>;
+ $$ = new Link_array<Music>;
}
- | post_requests post_request {
+ | post_events post_event {
$2->set_spot (THIS->here_input ());
$$->push ($2);
}
;
-post_request:
- verbose_request
- | request_with_dir
- | close_request
+post_event:
+ verbose_event
+ | event_with_dir
+ | close_event
+ | string_event
;
+string_event:
+ E_UNSIGNED {
+ Music * s = MY_MAKE_MUSIC("StringNumberEvent");
+ s->set_mus_property ("string-number", gh_int2scm($1));
+ s->set_spot (THIS->here_input ());
+ $$ = s;
+ }
+ ;
-request_that_take_dir:
+
+event_that_take_dir:
gen_text_def
- | verbose_request
+ | verbose_event
+ | close_event
+ | open_event
| script_abbreviation {
- SCM s = THIS->lexer_p_->lookup_identifier ("dash" + ly_scm2string ($1));
- Articulation_req *a = new Articulation_req;
+ 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"));
}
;
-request_with_dir:
- script_dir request_that_take_dir {
- if (Script_req * gs = dynamic_cast<Script_req*> ($2))
- gs->set_direction (Direction ($1));
- else if ($1)
- $2->origin ()->warning (_ ("Can't specify direction for this request"));
+event_with_dir:
+ script_dir event_that_take_dir {
+ $2->set_mus_property ("direction", gh_int2scm ($1));
$$ = $2;
}
;
-verbose_request:
- REQUEST_IDENTIFIER {
- $$ = dynamic_cast<Request*> (unsmob_music ($1)->clone ());
- $$->set_spot (THIS->here_input ());
- }
- | DYNAMICSCRIPT embedded_scm {
- /*
- TODO: junkme, use text-type == dynamic
- */
- Text_script_req *d = new Text_script_req;
- d->set_mus_property ("text-type" , ly_symbol2scm ("dynamic"));
- d->set_mus_property ("text", $2);
- d->set_spot (THIS->here_input ());
- $$ = d;
- }
- | SPANREQUEST bare_int STRING {
- Span_req * sp_p = new Span_req;
- sp_p->set_span_dir ( Direction ($2));
- sp_p->set_mus_property ("span-type", $3);
- sp_p->set_spot (THIS->here_input ());
- $$ = sp_p;
+verbose_event:
+ EVENT_IDENTIFIER {
+ $$ = unsmob_music ($1);
}
| tremolo_type {
- Tremolo_req* a = new Tremolo_req;
+ Music * a = MY_MAKE_MUSIC("TremoloEvent");
a->set_spot (THIS->here_input ());
a->set_mus_property ("tremolo-type", gh_int2scm ($1));
$$ = a;
}
- | SCRIPT STRING {
- Articulation_req * a = new Articulation_req;
- a->set_mus_property ("articulation-type", $2);
- a->set_spot (THIS->here_input ());
- $$ = a;
- }
- /*
-duh, junk this syntax from the parser, if possible.
- */
- | ARPEGGIO {
- Arpeggio_req *a = new Arpeggio_req;
- a->set_spot (THIS->here_input ());
- $$ = a;
- }
- | GLISSANDO {
- Glissando_req *g = new Glissando_req;
- g->set_spot /* No pun intended */ (THIS->here_input ());
- $$ = g;
- }
;
sup_quotes:
}
| NOTENAME_PITCH sup_quotes {
Pitch p = *unsmob_pitch ($1);
- p.octave_i_ += $2;
+ p.octave_ += $2;
$$ = p.smobbed_copy ();
}
| NOTENAME_PITCH sub_quotes {
Pitch p =* unsmob_pitch ($1);
- p.octave_i_ += -$2;
+ p.octave_ += -$2;
$$ = p.smobbed_copy ();
}
}
| TONICNAME_PITCH sup_quotes {
Pitch p = *unsmob_pitch ($1);
- p.octave_i_ += $2;
+ p.octave_ += $2;
$$ = p.smobbed_copy ();
}
| TONICNAME_PITCH sub_quotes {
Pitch p =* unsmob_pitch ($1);
- p.octave_i_ += -$2;
+ p.octave_ += -$2;
$$ = p.smobbed_copy ();
}
}
;
-explicit_duration:
+verbose_duration:
DURATION embedded_scm {
$$ = $2;
if (!unsmob_duration ($2))
extender_req:
EXTENDER {
- if (!THIS->lexer_p_->lyric_state_b ())
+ if (!THIS->lexer_->lyric_state_b ())
THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = new Extender_req;
+ $$ = MY_MAKE_MUSIC("ExtenderEvent");
}
;
hyphen_req:
HYPHEN {
- if (!THIS->lexer_p_->lyric_state_b ())
+ if (!THIS->lexer_->lyric_state_b ())
THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = new Hyphen_req;
+ $$ = MY_MAKE_MUSIC("HyphenEvent");
}
;
-close_request:
- close_request_parens {
+close_event:
+ close_event_parens {
$$ = $1;
- dynamic_cast<Span_req*> ($$)->set_span_dir ( START);
+ dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (START))
+;
}
-
-close_request_parens:
+ ;
+
+close_event_parens:
'(' {
- Span_req* s= new Span_req;
+ Music * s= MY_MAKE_MUSIC("SlurEvent");
$$ = s;
- s->set_mus_property ("span-type", ly_str02scm ( "slur"));
+ s->set_spot (THIS->here_input());
}
| E_OPEN {
- Span_req* s= new Span_req;
+ Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent");
$$ = s;
- s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur"));
+ s->set_spot (THIS->here_input());
}
| E_SMALLER {
- Span_req*s =new Span_req;
+ Music *s =MY_MAKE_MUSIC("CrescendoEvent");
$$ = s;
- s->set_mus_property ("span-type", ly_str02scm ( "crescendo"));
+ s->set_spot (THIS->here_input());
}
| E_BIGGER {
- Span_req*s =new Span_req;
+ Music *s =MY_MAKE_MUSIC("DecrescendoEvent");
$$ = s;
- s->set_mus_property ("span-type", ly_str02scm ("decrescendo"));
+ s->set_spot (THIS->here_input());
}
;
-open_request:
- open_request_parens {
+open_event:
+ open_event_parens {
$$ = $1;
- dynamic_cast<Span_req*> ($$)->set_span_dir (STOP);
+ dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP))
+;
}
;
-open_request_parens:
+open_event_parens:
E_EXCLAMATION {
- Span_req *s = new Span_req;
- s->set_mus_property ("span-type", ly_str02scm ( "crescendo"));
+ Music *s = MY_MAKE_MUSIC("CrescendoEvent");
+ s->set_spot (THIS->here_input());
$$ = s;
}
| ')' {
- Span_req* s= new Span_req;
+ Music * s= MY_MAKE_MUSIC("SlurEvent");
$$ = s;
- s->set_mus_property ("span-type", ly_str02scm ( "slur"));
+ s->set_spot (THIS->here_input());
+
}
| E_CLOSE {
- Span_req* s= new Span_req;
+ Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent");
$$ = s;
- s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur"));
+ s->set_mus_property ("span-type", scm_makfrom0str ( "phrasing-slur"));
+ s->set_spot (THIS->here_input());
}
;
gen_text_def:
embedded_scm {
- Text_script_req *t = new Text_script_req;
+ Music *t = MY_MAKE_MUSIC("TextScriptEvent");
t->set_mus_property ("text", $1);
t->set_spot (THIS->here_input ());
$$ = t;
}
| string {
- Text_script_req *t = new Text_script_req;
+ Music *t = MY_MAKE_MUSIC("TextScriptEvent");
t->set_mus_property ("text", $1);
t->set_spot (THIS->here_input ());
$$ = t;
}
| DIGIT {
- String ds = to_str ($1);
- Text_script_req* t = new Text_script_req;
-
- t->set_mus_property ("text", ly_str02scm (ds.ch_C ()));
- t->set_mus_property ("text-type" , ly_symbol2scm ("finger"));
+ String ds = to_string ($1);
+ Music * t = MY_MAKE_MUSIC("TextScriptEvent");
+ SCM finger = ly_symbol2scm ("finger");
+ t->set_mus_property ("text", scm_makfrom0str (ds.to_str0 ()));
+ t->set_mus_property ("text-type" , finger);
t->set_spot (THIS->here_input ());
$$ = t;
}
script_abbreviation:
'^' {
- $$ = gh_str02scm ("Hat");
+ $$ = scm_makfrom0str ("Hat");
}
| '+' {
- $$ = gh_str02scm ("Plus");
+ $$ = scm_makfrom0str ("Plus");
}
| '-' {
- $$ = gh_str02scm ("Dash");
+ $$ = scm_makfrom0str ("Dash");
}
| '|' {
- $$ = gh_str02scm ("Bar");
+ $$ = scm_makfrom0str ("Bar");
}
| '>' {
- $$ = gh_str02scm ("Larger");
+ $$ = scm_makfrom0str ("Larger");
}
| '.' {
- $$ = gh_str02scm ("Dot");
+ $$ = scm_makfrom0str ("Dot");
+ }
+ | '_' {
+ $$ = scm_makfrom0str ("Underscore");
}
;
-
script_dir:
'_' { $$ = DOWN; }
| '^' { $$ = UP; }
| '-' { $$ = CENTER; }
;
-pre_requests:
+pre_events:
{
- $$ = new Link_array<Request>;
+ $$ = new Link_array<Music>;
}
- | pre_requests open_request {
+ | pre_events open_event {
$$->push ($2);
}
;
multiplied_duration {
$$ = $1;
}
- | explicit_duration {
+ | verbose_duration {
$$ = $1;
}
;
optional_notemode_duration:
{
- $$ = THIS->default_duration_.smobbed_copy ();
+ Duration dd = THIS->default_duration_;
+ $$ = dd.smobbed_copy ();
+
+ THIS->beam_check ($$);
}
| multiplied_duration {
$$ = $1;
+ THIS->default_duration_ = *unsmob_duration ($$);
+
+ THIS->beam_check ($$);
}
- | explicit_duration {
+ | verbose_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 ($$));
+ *d = k;
+ $$ = $1;
}
;
fraction:
FRACTION { $$ = $1; }
| UNSIGNED '/' UNSIGNED {
- $$ = gh_cons (gh_int2scm ($1), gh_int2scm ($3));
+ $$ = scm_cons (gh_int2scm ($1), gh_int2scm ($3));
}
;
;
bass_figure:
- bass_number {
- Pitch p ;
- p .notename_i_ = $1 - 1;
- p.normalise();
-
- Note_req * nr = new Note_req;
- $$ = nr->self_scm ();
- nr->set_mus_property ("pitch", p.smobbed_copy ());
+ FIGURE_SPACE {
+ Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
+ $$ = bfr->self_scm();
+ scm_gc_unprotect_object ($$);
+ }
+ | bass_number {
+ Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
+ $$ = bfr->self_scm();
+
+ bfr->set_mus_property ("figure", gh_int2scm ($1));
+
scm_gc_unprotect_object ($$);
}
| bass_figure bass_mod {
- if ($2) {
- SCM sp = unsmob_music ($1)->get_mus_property ("pitch");
- unsmob_pitch (sp)->alteration_i_ += $2;
+ Music *m = unsmob_music ($1);
+ if ($2) {
+ SCM salter =m->get_mus_property ("alteration");
+ int alter = gh_number_p ( salter) ? gh_scm2int (salter) : 0;
+ m->set_mus_property ("alteration",
+ gh_int2scm (alter + $2));
} else {
- unsmob_music ($1)->set_mus_property ("force-accidental", SCM_BOOL_T);
+ m->set_mus_property ("alteration", gh_int2scm (0));
}
}
;
+br_bass_figure:
+ '[' bass_figure {
+ $$ = $2;
+ unsmob_music ($$)->set_mus_property ("bracket-start", SCM_BOOL_T);
+ }
+ | bass_figure {
+ $$ = $1;
+ }
+ | br_bass_figure ']' {
+ $$ = $1;
+ unsmob_music ($1)->set_mus_property ("bracket-stop", SCM_BOOL_T);
+ }
+ ;
+
figure_list:
/**/ {
$$ = SCM_EOL;
}
- | figure_list bass_figure {
- $$ = gh_cons ($2, $1);
+ | figure_list br_bass_figure {
+ $$ = scm_cons ($2, $1);
}
;
figure_spec:
FIGURE_OPEN figure_list FIGURE_CLOSE {
- Music * m = new Request_chord (SCM_EOL);
+ Music * m = MY_MAKE_MUSIC("EventChord");
$2 = scm_reverse_x ($2, SCM_EOL);
m->set_mus_property ("elements", $2);
$$ = m->self_scm ();
}
;
+
+optional_rest:
+ /**/ { $$ = 0; }
+ | REST { $$ = 1; }
+ ;
+
simple_element:
- pitch exclamations questions optional_notemode_duration {
+ pitch exclamations questions optional_notemode_duration optional_rest {
Input i = THIS->pop_spot ();
- if (!THIS->lexer_p_->note_state_b ())
+ if (!THIS->lexer_->note_state_b ())
THIS->parser_error (_ ("Have to be in Note mode for notes"));
- Note_req *n = new Note_req;
+ Music *n = 0;
+ if ($5)
+ n = MY_MAKE_MUSIC("RestEvent");
+ else
+ n = MY_MAKE_MUSIC("NoteEvent");
n->set_mus_property ("pitch", $1);
n->set_mus_property ("duration", $4);
+
if ($3 % 2)
n->set_mus_property ("cautionary", SCM_BOOL_T);
if ($2 % 2 || $3 % 2)
n->set_mus_property ("force-accidental", SCM_BOOL_T);
- Simultaneous_music*v = new Request_chord (SCM_EOL);
+ Music *v = MY_MAKE_MUSIC("EventChord");
v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED));
-
+ scm_gc_unprotect_object (n->self_scm());
+
v->set_spot (i);
n->set_spot (i);
$$ = v;
Input i = THIS->pop_spot ();
m->set_spot (i);
for (SCM s = m->get_mus_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
- {
- unsmob_music (ly_car (s))->set_mus_property ("duration", $2);
- }
+ {
+ unsmob_music (ly_car (s))->set_mus_property ("duration", $2);
+ }
$$ = m;
}
| RESTNAME optional_notemode_duration {
Input i = THIS->pop_spot ();
SCM e = SCM_UNDEFINED;
+ Music * ev = 0;
if (ly_scm2string ($1) =="s") {
/* Space */
- Skip_req * skip_p = new Skip_req;
- skip_p->set_mus_property ("duration" ,$2);
- skip_p->set_spot (i);
- e = skip_p->self_scm ();
+ ev = MY_MAKE_MUSIC("SkipEvent");
}
- else {
- Rest_req * rest_req_p = new Rest_req;
- rest_req_p->set_mus_property ("duration", $2);
- rest_req_p->set_spot (i);
- e = rest_req_p->self_scm ();
+ else {
+ ev = MY_MAKE_MUSIC("RestEvent");
+
}
- Simultaneous_music* velt_p = new Request_chord (SCM_EOL);
- velt_p-> set_mus_property ("elements", scm_list_n (e,SCM_UNDEFINED));
- velt_p->set_spot (i);
+ ev->set_mus_property ("duration" ,$2);
+ ev->set_spot (i);
+ Music * velt = MY_MAKE_MUSIC("EventChord");
+ velt->set_mus_property ("elements", scm_list_n (ev->self_scm (),SCM_UNDEFINED));
+ velt->set_spot (i);
- $$ = velt_p;
+ $$ = velt;
}
| MULTI_MEASURE_REST optional_notemode_duration {
- Input i = THIS->pop_spot ();
-
- Skip_req * sk = new Skip_req;
- sk->set_mus_property ("duration", $2);
- Span_req *sp1 = new Span_req;
- Span_req *sp2 = new Span_req;
- sp1-> set_span_dir ( START);
- sp2-> set_span_dir ( STOP);
- SCM r = ly_str02scm ("rest");
- sp1->set_mus_property ("span-type", r);
- sp2->set_mus_property ("span-type", r);
-
- Request_chord * rqc1 = new Request_chord (SCM_EOL);
- rqc1->set_mus_property ("elements", scm_list_n (sp1->self_scm (), SCM_UNDEFINED));
- Request_chord * rqc2 = new Request_chord (SCM_EOL);
- rqc2->set_mus_property ("elements", scm_list_n (sk->self_scm (), SCM_UNDEFINED));;
- Request_chord * rqc3 = new Request_chord (SCM_EOL);
- rqc3->set_mus_property ("elements", scm_list_n (sp2->self_scm (), SCM_UNDEFINED));;
+ THIS->pop_spot ();
- SCM ms = scm_list_n (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
+ static SCM proc ;
+ if (!proc)
+ proc = scm_c_eval_string ("make-multi-measure-rest");
- $$ = new Sequential_music (SCM_EOL);
- $$->set_mus_property ("elements", ms);
+ SCM mus = scm_call_2 (proc, $2,
+ make_input (THIS->here_input()));
+ scm_gc_protect_object (mus);
+ $$ = unsmob_music (mus);
}
| STRING optional_notemode_duration {
Input i = THIS->pop_spot ();
- Lyric_req* lreq_p = new Lyric_req;
- lreq_p->set_mus_property ("text", $1);
- lreq_p->set_mus_property ("duration",$2);
- lreq_p->set_spot (i);
- Simultaneous_music* velt_p = new Request_chord (SCM_EOL);
- velt_p->set_mus_property ("elements", scm_list_n (lreq_p->self_scm (), SCM_UNDEFINED));
+ Music * lreq = MY_MAKE_MUSIC("LyricEvent");
+ lreq->set_mus_property ("text", $1);
+ lreq->set_mus_property ("duration",$2);
+ lreq->set_spot (i);
+ Music * velt = MY_MAKE_MUSIC("EventChord");
+ velt->set_mus_property ("elements", scm_list_n (lreq->self_scm (), SCM_UNDEFINED));
- $$= velt_p;
+ $$= velt;
}
| chord {
- Input i = THIS->pop_spot ();
+ THIS->pop_spot ();
- if (!THIS->lexer_p_->chord_state_b ())
+ if (!THIS->lexer_->chord_state_b ())
THIS->parser_error (_ ("Have to be in Chord mode for chords"));
$$ = $1;
}
chord_notes:
chord_step {
- $$ = $1
+ $$ = $1;
}
| chord_notes '.' chord_step {
$$ = gh_append2 ($$, $3);
{
$$ = SCM_EOL;
}
- | '/' steno_tonic_pitch {
+ | CHORD_SLASH steno_tonic_pitch {
$$ = $2;
}
;
chord_step:
chord_note {
- $$ = gh_cons ($1, SCM_EOL);
+ $$ = scm_cons ($1, SCM_EOL);
}
| CHORDMODIFIER_PITCH {
- $$ = gh_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL);
+ $$ = scm_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL);
}
| CHORDMODIFIER_PITCH chord_note { /* Ugh. */
$$ = scm_list_n (unsmob_pitch ($1)->smobbed_copy (),
chord_note:
bare_unsigned {
Pitch m;
- m.notename_i_ = ($1 - 1) % 7;
- m.octave_i_ = $1 > 7 ? 1 : 0;
- m.alteration_i_ = 0;
+ m.notename_ = ($1 - 1) % 7;
+ m.octave_ = $1 > 7 ? 1 : 0;
+ m.alteration_ = 0;
$$ = m.smobbed_copy ();
}
| bare_unsigned '+' {
Pitch m;
- m.notename_i_ = ($1 - 1) % 7;
- m.octave_i_ = $1 > 7 ? 1 : 0;
- m.alteration_i_ = 1;
+ m.notename_ = ($1 - 1) % 7;
+ m.octave_ = $1 > 7 ? 1 : 0;
+ m.alteration_ = 1;
$$ = m.smobbed_copy ();
}
| bare_unsigned CHORD_MINUS {
Pitch m;
- m.notename_i_ = ($1 - 1) % 7;
- m.octave_i_ = $1 > 7 ? 1 : 0;
- m.alteration_i_ = -1;
+ m.notename_ = ($1 - 1) % 7;
+ m.octave_ = $1 > 7 ? 1 : 0;
+ m.alteration_ = -1;
$$ = m.smobbed_copy ();
}
;
number_factor:
- '(' number_expression ')' {
- $$ = $2;
- }
- | '-' number_factor { /* %prec UNARY_MINUS */
+ '-' number_factor { /* %prec UNARY_MINUS */
$$ = scm_difference ($2, SCM_UNDEFINED);
}
| bare_number
%%
void
-My_lily_parser::set_yydebug (bool b)
+My_lily_parser::set_yydebug (bool )
{
-#ifdef YYDEBUG
- yydebug = b;
+#if 0
+ yydebug = 1;
#endif
}
void
My_lily_parser::do_yyparse ()
{
-
current_parser = this;;
yyparse ((void*)this);
}
+/*
+Should make this optional? It will also complain when you do
+
+ [s4]
+
+which is entirely legitimate.
+
+Or we can scrap it. Barchecks should detect wrong durations, and
+skipTypesetting speeds it up a lot.
+*/
+
+void
+My_lily_parser::beam_check (SCM dur)
+{
+ Duration *d = unsmob_duration (dur);
+ if (unsmob_music (last_beam_start_) && d->duration_log () <= 2)
+ {
+ Music * m = unsmob_music (last_beam_start_);
+ m->origin ()->warning (_("Suspect duration found following this beam"));
+ }
+ last_beam_start_ = SCM_EOL;
+}
+
+
+/*
+It is a little strange, to have this function in this file, but
+otherwise, we have to import music classes into the lexer.
+
+*/
+int
+My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid)
+{
+ if (gh_string_p (sid)) {
+ *destination = sid;
+ return STRING_IDENTIFIER;
+ } else if (gh_number_p (sid)) {
+ *destination = sid;
+ return NUMBER_IDENTIFIER;
+ } else if (unsmob_translator_def (sid)) {
+ *destination = unsmob_translator_def (sid)->clone_scm();
+ return TRANSLATOR_IDENTIFIER;
+ } else if (unsmob_score (sid)) {
+ Score *sc = new Score (*unsmob_score (sid));
+ *destination =sc->self_scm ();
+ return SCORE_IDENTIFIER;
+ } else if (Music * mus =unsmob_music (sid)) {
+ *destination = unsmob_music (sid)->clone ()->self_scm();
+ unsmob_music (*destination)->
+ set_mus_property ("origin", make_input (last_input_));
+ return dynamic_cast<Event*> (mus)
+ ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
+ } else if (unsmob_duration (sid)) {
+ *destination = unsmob_duration (sid)->smobbed_copy();
+ return DURATION_IDENTIFIER;
+ } else if (unsmob_music_output_def (sid)) {
+ Music_output_def *p = unsmob_music_output_def (sid);
+ p = p->clone ();
+
+ *destination = p->self_scm();
+ return MUSIC_OUTPUT_DEF_IDENTIFIER;
+ }
+ return -1;
+}
projects / lilypond.git / blobdiff