source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
+/*
+ Two shift/reduce problems:
+ -
+ -
+ */
+
+/*
+
+the rules for who is protecting what are very shady. TODO: uniformise
+this.
+
+
+*/
+
+#include <ctype.h>
#include <iostream.h>
+
#include "translator-def.hh"
#include "lily-guile.hh"
#include "change-iterator.hh"
#include "file-path.hh"
#include "debug.hh"
#include "dimensions.hh"
-#include "identifier.hh"
#include "command-request.hh"
#include "musical-request.hh"
#include "my-lily-parser.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 "auto-change-music.hh"
#include "part-combine-music.hh"
-
+#include "scm-hash.hh"
+#include "auto-change-iterator.hh"
+#include "un-relativable-music.hh"
#include "chord.hh"
bool
-is_duration_b (int t)
+regular_identifier_b (SCM id)
{
- return t && t == 1 << intlog2(t);
+ String str = ly_scm2string (id);
+ char const *s = str.ch_C() ;
+
+ bool v = true;
+ while (*s && v)
+ {
+ v = v && isalpha (*s);
+ s++;
+ }
+ return 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)
+{
+ return t && t == 1 << intlog2 (t);
+}
+
void
set_music_properties (Music *p, SCM a)
{
- for (SCM k = a; gh_pair_p (k); k = gh_cdr (k))
+ 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));
}
}
-// mmm JUNKME ?
-Lilypond_version oldest_version ("1.3.59");
-void
-print_lilypond_versions (ostream &os)
-{
- os << _f ("Oldest supported input version: %s", oldest_version.str ())
- << endl;
-}
-// needed for bison.simple's malloc() and free()
+
+
+// needed for bison.simple's malloc () and free ()
#include <malloc.h>
#ifndef NDEBUG
#define YYPARSE_PARAM my_lily_parser_l
#define YYLEX_PARAM my_lily_parser_l
-#define THIS ((My_lily_parser *) my_lily_parser_l)
+#define THIS\
+ ((My_lily_parser *) my_lily_parser_l)
#define yyerror THIS->parser_error
#define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f ("Expecting %d arguments", s))
%union {
Link_array<Request> *reqvec;
- Identifier *id;
- String * string;
+
+ String *string; // needed by the lexer as temporary scratch area.
Music *music;
Score *score;
Scope *scope;
-
- Musical_req* musreq;
+ Scheme_hash_table *scmhash;
Music_output_def * outputdef;
- Midi_def* midi;
- Real real;
Request * request;
/* We use SCMs to do strings, because it saves us the trouble of
/* tokens which are not keywords */
%token AUTOCHANGE
+%token ALIAS
%token APPLY
%token ARPEGGIO
%token DYNAMICSCRIPT
-%token TEXTSCRIPT
%token ACCEPTS
%token ALTERNATIVE
%token BAR
%token CONSISTS
%token DURATION
%token SEQUENTIAL
-%token ELEMENTDESCRIPTIONS
+%token GROBDESCRIPTIONS
%token SIMULTANEOUS
%token CONSISTSEND
%token DENIES
%token DURATION
%token EXTENDER
-%token FONT
-%token GRACE
+%token FIGURES FIGURE_OPEN FIGURE_CLOSE
+%token GLISSANDO
+%token GRACE
%token HEADER
%token HYPHEN
%token IN_T
%token KEY
%token LYRICS
%token MARK
-%token MEASURES
+%token MULTI_MEASURE_REST
%token MIDI
%token MM_T
-%token MUSICAL_PITCH
+%token PITCH
+%token DEFAULT
%token NAME
-%token NOTENAMES
+%token PITCHNAMES
%token NOTES
%token PAPER
%token PARTIAL
%token PENALTY
%token PROPERTY
-%token PUSH POP
+%token OVERRIDE SET REVERT
%token PT_T
%token RELATIVE
%token REMOVE
%token TRANSLATOR
%token TRANSPOSE
%token TYPE
+%token UNSET
%token CONTEXT
/* escaped */
-%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER
+%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE E_TILDE
+%token E_BACKSLASH
%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET
%type <i> exclamations questions dots
+%type <i> bass_number bass_mod
+%type <scm> bass_figure figure_list figure_spec
%token <i> DIGIT
%token <scm> NOTENAME_PITCH
%token <scm> TONICNAME_PITCH
%token <scm> CHORDMODIFIER_PITCH
%token <scm> DURATION_IDENTIFIER
+%token <scm> FRACTION
%token <id> IDENTIFIER
-%token <id> SCORE_IDENTIFIER
-%token <id> MUSIC_OUTPUT_DEF_IDENTIFIER
+%token <scm> SCORE_IDENTIFIER
+%token <scm> MUSIC_OUTPUT_DEF_IDENTIFIER
%token <scm> NUMBER_IDENTIFIER
%token <scm> REQUEST_IDENTIFIER
%token <scm> MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER
%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
%token <scm> RESTNAME
-%token <scm> STRING
+%token <scm> STRING
%token <scm> SCM_T
%token <i> UNSIGNED
-%token <real> REAL
+%token <scm> REAL
%type <outputdef> output_def
-%type <scope> lilypond_header lilypond_header_body
+%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 <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> identifier_init
-%type <scm> steno_duration optional_notemode_duration
-%type <scm> entered_notemode_duration explicit_duration
+%type <scm> steno_duration optional_notemode_duration multiplied_duration
+%type <scm> verbose_duration
%type <reqvec> pre_requests post_requests
%type <request> gen_text_def
-%type <scm> steno_musical_pitch musical_pitch absolute_musical_pitch
-%type <scm> steno_tonic_pitch
+%type <scm> steno_pitch pitch absolute_pitch
+%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
+%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
%type <music> command_req verbose_command_req
%type <request> extender_req
%type <request> hyphen_req
-%type <scm> string bare_number number_expression
+%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
%left '-' '+'
-%left '*' '/'
+
+/* We don't assign precedence to / and *, because we might need varied
+prec levels in different prods */
+
%left UNARY_MINUS
%%
| lilypond assignment { }
| lilypond error {
THIS->error_level_i_ = 1;
- //THIS->parser_error (_ ("ly invalid"));
}
| lilypond INVALID {
THIS->error_level_i_ = 1;
- //THIS->parser_error (_ ("ly invalid"));
}
;
THIS->lexer_p_->chordmodifier_tab_ = $1;
}
| lilypond_header {
- delete header_global_p;
- header_global_p = $1;
+ if (global_header_p)
+ scm_gc_unprotect_object (global_header_p->self_scm ());
+ global_header_p = $1;
}
| score_block {
score_global_array.push ($1);
}
| output_def {
- Identifier * id = new
- Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER);
if (dynamic_cast<Paper_def*> ($1))
- THIS->lexer_p_->set_identifier ("$defaultpaper", id->self_scm ());
+ THIS->lexer_p_->set_identifier ("$defaultpaper", $1->self_scm ());
else if (dynamic_cast<Midi_def*> ($1))
- THIS->lexer_p_->set_identifier ("$defaultmidi", id->self_scm ());
+ THIS->lexer_p_->set_identifier ("$defaultmidi", $1->self_scm ());
}
| embedded_scm {
// junk value
CHORDMODIFIERS notenames_body { $$ = $2; }
;
-
notenames_block:
- NOTENAMES notenames_body { $$ = $2; }
+ PITCHNAMES notenames_body { $$ = $2; }
;
-
-
notenames_body:
embedded_scm {
int i = scm_ilength ($1);
SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL);
- for (SCM s = $1; gh_pair_p (s); s = gh_cdr (s)) {
- SCM pt = gh_cdar (s);
+ for (SCM s = $1; gh_pair_p (s); s = ly_cdr (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;
lilypond_header_body:
{
- $$ = new Scope;
- THIS->lexer_p_-> scope_l_arr_.push ($$);
+ $$ = new Scheme_hash_table;
+
+ Scope *sc = new Scope ($$);
+ THIS->lexer_p_-> scope_l_arr_.push (sc);
}
- | lilypond_header_body assignment semicolon {
+ | lilypond_header_body assignment {
}
;
lilypond_header:
HEADER '{' lilypond_header_body '}' {
$$ = $3;
- THIS->lexer_p_-> scope_l_arr_.pop ();
+ delete THIS->lexer_p_-> scope_l_arr_.pop ();
}
;
*/
assignment:
STRING {
- THIS->remember_spot ();
+ THIS->push_spot ();
}
/* cont */ '=' identifier_init {
+
+ /*
+ Should find generic way of associating input with objects.
+ */
+ Input ip = THIS->pop_spot ();
+
+ if (! regular_identifier_b ($1))
+ {
+ ip.warning (_ ("Identifier should have alphabetic characters only"));
+ }
+
THIS->lexer_p_->set_identifier (ly_scm2string ($1), $4);
/*
all objects can be unprotected as soon as they're here.
*/
- Identifier * id =unsmob_identifier ($4);
- Input spot = THIS->pop_spot ();
- if (id) id->set_spot (spot);
}
;
identifier_init:
score_block {
- $$ = (new Score_identifier ($1, SCORE_IDENTIFIER))->self_scm();
+ $$ = $1->self_scm ();
+ scm_gc_unprotect_object ($$);
}
| output_def {
- $$ = (new Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER))->self_scm();
+ $$ = $1->self_scm ();
+ scm_gc_unprotect_object ($$);
}
| translator_spec_block {
$$ = $1;
}
| Music {
$$ = $1->self_scm ();
- scm_unprotect_object ($$);
+ scm_gc_unprotect_object ($$);
}
| post_request {
$$ = $1->self_scm ();
- scm_unprotect_object ($$);
+ scm_gc_unprotect_object ($$);
}
- | explicit_duration {
+ | verbose_duration {
$$ = $1;
}
| number_expression {
$$ = unsmob_translator_def ($1)->clone_scm ();
unsmob_translator_def ($$)-> set_spot (THIS->here_input ());
}
- | TYPE STRING semicolon {
+ | TYPE STRING {
$$ = Translator_def::make_scm ();
Translator_def*td = unsmob_translator_def ($$);
td->translator_group_type_ = $2;
| translator_spec_body STRING '=' embedded_scm {
unsmob_translator_def ($$)->add_property_assign ($2, $4);
}
- | translator_spec_body STRING PUSH embedded_scm '=' embedded_scm {
+ | translator_spec_body STRING OVERRIDE embedded_scm '=' embedded_scm {
unsmob_translator_def ($$)
->add_push_property (scm_string_to_symbol ($2), $4, $6);
}
- | translator_spec_body STRING POP embedded_scm {
- unsmob_translator_def($$)->add_pop_property (
+ | translator_spec_body STRING REVERT embedded_scm {
+ unsmob_translator_def ($$)->add_pop_property (
scm_string_to_symbol ($2), $4);
}
- | translator_spec_body STRING '=' identifier_init semicolon {
- SCM v = gh_int2scm (0);
- if (gh_string_p ($4) || gh_number_p ($4) || gh_boolean_p ($4))
- v = $4;
- else
- THIS->parser_error (_("Wrong type for property value"));
-
- /* ugh*/
- unsmob_translator_def($$)->add_property_assign ($2, v);
- }
- | translator_spec_body NAME STRING semicolon {
+ | translator_spec_body NAME STRING {
unsmob_translator_def ($$)->type_name_ = $3;
}
- | translator_spec_body CONSISTS STRING semicolon {
+ | translator_spec_body CONSISTS STRING {
unsmob_translator_def ($$)->add_element ($3);
}
- | translator_spec_body ELEMENTDESCRIPTIONS embedded_scm {
- for (SCM p = $3; gh_pair_p (p); p = gh_cdr (p))
- unsmob_translator_def ($$)
- ->add_property_assign (scm_symbol_to_string (gh_caar (p)), gh_cdar (p));
-
+ | translator_spec_body ALIAS STRING {
+ Translator_def*td = unsmob_translator_def ($$);
+ td->type_aliases_ = gh_cons ($3, td->type_aliases_);
}
- | translator_spec_body CONSISTSEND STRING semicolon {
+ | 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))
+ 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);
}
- | translator_spec_body ACCEPTS STRING semicolon {
+ | translator_spec_body ACCEPTS STRING {
unsmob_translator_def ($$)->set_acceptor ($3,true);
}
- | translator_spec_body DENIES STRING semicolon {
+ | translator_spec_body DENIES STRING {
unsmob_translator_def ($$)->set_acceptor ($3,false);
}
- | translator_spec_body REMOVE STRING semicolon {
+ | translator_spec_body REMOVE STRING {
unsmob_translator_def ($$)->remove_element ($3);
}
;
*/
score_block:
SCORE {
- THIS->remember_spot ();
+ THIS->push_spot ();
}
/*cont*/ '{' score_body '}' {
THIS->pop_spot ();
$$ = $4;
if (!$$->def_p_arr_.size ())
{
- Identifier *id =
- unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper"));
- $$->add_output (id ? id->access_content_Music_output_def (true) : new Paper_def );
+ Music_output_def *id =
+ unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper"));
+ $$->add_output (id ? id->clone () : new Paper_def );
}
}
-/*
- | SCORE '{' score_body error {
- $$ = $3
- $$->set_spot (THIS->here_input ());
- // THIS->here_input ().error ("SCORE INVALID");
- $$->error ("SCORE INVALID");
- THIS->parser_error (_f ("SCORE ERROR"));
- }
-*/
;
score_body:
Music {
$$ = new Score;
-
+
$$->set_spot (THIS->here_input ());
SCM m = $1->self_scm ();
- scm_unprotect_object (m);
+ scm_gc_unprotect_object (m);
$$->music_ = m;
}
| SCORE_IDENTIFIER {
- $$ = $1->access_content_Score (true);
+ $$ = new Score (*unsmob_score ($1));
+ $$->set_spot (THIS->here_input ());
}
| score_body lilypond_header {
+ scm_gc_unprotect_object ($2->self_scm ());
$$->header_p_ = $2;
}
| score_body output_def {
output_def:
music_output_def_body '}' {
$$ = $1;
- THIS-> lexer_p_-> scope_l_arr_.pop();
+ THIS-> lexer_p_-> scope_l_arr_.pop ();
}
;
music_output_def_body:
MIDI '{' {
- Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultmidi"));
+ Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultmidi"));
Midi_def* p =0;
if (id)
- p = dynamic_cast<Midi_def*> (id->access_content_Music_output_def (true));
+ p = dynamic_cast<Midi_def*> (id->clone ());
else
p = new Midi_def;
THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
}
| PAPER '{' {
- Identifier *id = unsmob_identifier (THIS->lexer_p_->lookup_identifier ("$defaultpaper"));
+ Music_output_def *id = unsmob_music_output_def (THIS->lexer_p_->lookup_identifier ("$defaultpaper"));
Paper_def *p = 0;
if (id)
- p = dynamic_cast<Paper_def*> (id->access_content_Music_output_def (true));
+ p = dynamic_cast<Paper_def*> (id->clone ());
else
p = new Paper_def;
THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_);
$$ = p;
}
| PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
- Music_output_def *p = $3->access_content_Music_output_def (true);
+ Music_output_def *p = unsmob_music_output_def ($3);
+ p = p->clone ();
THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
$$ = p;
}
| MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
- Music_output_def *p = $3->access_content_Music_output_def (true);
+ 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_body assignment semicolon {
+ | music_output_def_body assignment {
}
| music_output_def_body translator_spec_block {
| music_output_def_body STYLESHEET embedded_scm {
dynamic_cast<Paper_def*> ($$)-> style_sheet_ = $3;
}
- | music_output_def_body tempo_request semicolon {
+ | music_output_def_body tempo_request {
/*
junk this ? there already is tempo stuff in
music.
}
;
+/*
+The representation of a list is the
+
+ (LIST . LAST-CONS)
+
+ to have efficient append.
+*/
Music_list: /* empty */ {
$$ = gh_cons (SCM_EOL, SCM_EOL);
}
| Music_list Music {
SCM s = $$;
SCM c = gh_cons ($2->self_scm (), SCM_EOL);
- scm_unprotect_object ($2->self_scm ()); /* UGH */
-
-
- if (gh_pair_p (gh_cdr (s)))
- gh_set_cdr_x (gh_cdr (s), c); /* append */
+ scm_gc_unprotect_object ($2->self_scm ()); /* UGH */
+ if (gh_pair_p (ly_cdr (s)))
+ gh_set_cdr_x (ly_cdr (s), c); /* append */
else
gh_set_car_x (s, c); /* set first cons */
gh_set_cdr_x (s, c) ; /* remember last cell */
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
+ REPEAT string bare_unsigned Music Alternative_music
{
- Music_sequence* m = dynamic_cast <Music_sequence*> ($5);
- if (m && $3 < m->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 ("element", beg->self_scm ());
+ scm_gc_unprotect_object (beg->self_scm ());
+ }
+ r->set_mus_property ("repeat-count", gh_int2scm (times >? 1));
- SCM func = scm_eval2 (ly_symbol2scm ("repeat-name-to-ctor"), SCM_EOL);
+ r-> set_mus_property ("elements",alts);
+ SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor"));
SCM result = gh_call1 (func, $2);
- Repeated_music * r = new Repeated_music ($4, $3 >? 1, m);
+
set_music_properties (r, result);
r->set_spot (*$4->origin ());
}
;
-Music_sequence: '{' Music_list '}' {
- $$ = new Music_sequence (gh_car ($2));
- }
- ;
-
Sequential_music:
SEQUENTIAL '{' Music_list '}' {
- $$ = new Sequential_music (gh_car ($3));
+ $$ = new Sequential_music (SCM_EOL);
+ $$->set_mus_property ("elements", ly_car ($3));
}
| '{' Music_list '}' {
- $$ = new Sequential_music (gh_car ($2));
+ $$ = new Sequential_music (SCM_EOL);
+ $$->set_mus_property ("elements", ly_car ($2));
}
;
Simultaneous_music:
SIMULTANEOUS '{' Music_list '}'{
- $$ = new Simultaneous_music (gh_car ($3));
+ $$ = new Simultaneous_music (SCM_EOL);
+ $$->set_mus_property ("elements", ly_car ($3));
+
}
| '<' Music_list '>' {
- $$ = new Simultaneous_music (gh_car ($2));
+ $$ = new Simultaneous_music (SCM_EOL);
+ $$->set_mus_property ("elements", ly_car ($2));
}
;
SCM pred = $2;
if (!gh_symbol_p ($3))
{
- THIS->parser_error (_("Second argument must be a symbol"));
+ THIS->parser_error (_ ("Second argument must be a symbol"));
}
/*hould 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 1 argument"));
}
- Music *m = new Music;
- m->set_mus_property ("predicate", pred);
- m->set_mus_property ("symbol", $3);
- m->set_mus_property ("value", $5);
- m->set_mus_property ("type",
- Output_property_music_iterator::constructor_cxx_function);
+ Music *m = new Music (SCM_EOL);
+ 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;
}
}
| property_def
| translator_change
- | Simple_music '*' bare_unsigned '/' bare_unsigned {
- $$ = $1;
- $$->compress (Moment($3, $5 ));
- }
- | Simple_music '*' bare_unsigned {
- $$ = $1;
- $$->compress (Moment ($3, 1));
- }
;
Composite_music:
CONTEXT STRING Music {
- Context_specced_music *csm = new Context_specced_music ($3);
+ Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ 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;
}
| AUTOCHANGE STRING Music {
- Auto_change_music * chm = new Auto_change_music ($3);
+ Music * chm = new Music_wrapper (SCM_EOL);
+ chm->set_mus_property ("element", $3->self_scm ());
+ chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_cxx_function);
+
+ scm_gc_unprotect_object ($3->self_scm ());
chm->set_mus_property ("what", $2);
$$ = chm;
chm->set_spot (*$3->origin ());
}
| GRACE Music {
- $$ = new Grace_music ($2);
+#if 1
+ /*
+ The other version is for easier debugging of
+ Sequential_music_iterator in combination with grace notes.
+ */
+
+ SCM start = THIS->lexer_p_->lookup_identifier ("startGraceMusic");
+ SCM stop = THIS->lexer_p_->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);
+ scm_gc_unprotect_object (stopm->self_scm ());
+ }
+ ms = gh_cons ($2->self_scm (), ms);
+ scm_gc_unprotect_object ($2->self_scm());
+ if (startm) {
+ startm = startm->clone ();
+ ms = gh_cons (startm->self_scm () , ms);
+ scm_gc_unprotect_object (startm->self_scm ());
+ }
+
+ Music* seq = new Sequential_music (SCM_EOL);
+ seq->set_mus_property ("elements", ms);
+
+ $$ = new Grace_music (SCM_EOL);
+ $$->set_mus_property ("element", seq->self_scm ());
+ scm_gc_unprotect_object (seq->self_scm ());
+#else
+ $$ = new Grace_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 ($5);
+ | CONTEXT string '=' string Music {
+ Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ csm->set_mus_property ("element", $5->self_scm ());
+ scm_gc_unprotect_object ($5->self_scm ());
csm->set_mus_property ("context-type", $2);
csm->set_mus_property ("context-id", $4);
$$ = csm;
}
| TIMES {
- THIS->remember_spot ();
+ THIS->push_spot ();
}
/* CONTINUED */
- bare_unsigned '/' bare_unsigned Music
+ fraction Music
{
- $$ = new Time_scaled_music ($3, $5, $6);
+ int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3));
+ Music *mp = $4;
+ $$ = new Time_scaled_music (SCM_EOL);
$$->set_spot (THIS->pop_spot ());
+
+
+ $$->set_mus_property ("element", mp->self_scm ());
+ scm_gc_unprotect_object (mp->self_scm ());
+ $$->set_mus_property ("numerator", gh_int2scm (n));
+ $$->set_mus_property ("denominator", gh_int2scm (d));
+ $$->compress (Moment (Rational (n,d)));
+
}
| Repeated_music { $$ = $1; }
| Simultaneous_music { $$ = $1; }
| Sequential_music { $$ = $1; }
- | TRANSPOSE musical_pitch Music {
- $$ = new Transposed_music ($3, *unsmob_pitch ($2));
+ | TRANSPOSE pitch Music {
+ $$ = new Transposed_music (SCM_EOL);
+ Music *p = $3;
+ Pitch pit = *unsmob_pitch ($2);
+
+ p->transpose (pit);
+ $$->set_mus_property ("element", p->self_scm ());
+ scm_gc_unprotect_object (p->self_scm ());
}
| TRANSPOSE steno_tonic_pitch Music {
- $$ = new Transposed_music ($3, *unsmob_pitch ($2));
+ $$ = new Transposed_music (SCM_EOL);
+ Music *p = $3;
+ Pitch pit = *unsmob_pitch ($2);
+
+ p->transpose (pit);
+ $$->set_mus_property ("element", p->self_scm ());
+ scm_gc_unprotect_object (p->self_scm ());
+
}
| APPLY embedded_scm Music {
SCM ret = gh_call1 ($2, $3->self_scm ());
Music *m = unsmob_music (ret);
if (!m) {
THIS->parser_error ("\\apply must return a Music");
- m = new Music ();
+ m = new Music (SCM_EOL);
}
$$ = m;
}
{ $$ = $3;
THIS->lexer_p_->pop_state ();
}
+ | FIGURES
+ { THIS->lexer_p_->push_figuredbass_state (); }
+ Music
+ {
+ Music * chm = new Untransposable_music () ;
+ chm->set_mus_property ("element", $3->self_scm ());
+ $$ = chm;
+
+ THIS->lexer_p_->pop_state ();
+ }
| CHORDS
{ THIS->lexer_p_->push_chord_state (); }
Music
{
- $$ = $3;
+ Music * chm = new Un_relativable_music ;
+ chm->set_mus_property ("element", $3->self_scm ());
+ $$ = chm;
+
THIS->lexer_p_->pop_state ();
}
| LYRICS
;
relative_music:
- RELATIVE absolute_musical_pitch Music {
- $$ = new Relative_octave_music ($3, *unsmob_pitch ($2));
+ RELATIVE absolute_pitch Music {
+ Music * p = $3;
+ Pitch pit = *unsmob_pitch ($2);
+ $$ = new Relative_octave_music (SCM_EOL);
+
+ $$->set_mus_property ("element", p->self_scm ());
+ scm_gc_unprotect_object (p->self_scm ());
+
+ $$->set_mus_property ("last-pitch", p->to_relative_octave (pit).smobbed_copy ());
+
}
;
re_rhythmed_music:
ADDLYRICS Music Music {
- Lyric_combine_music * l = new Lyric_combine_music ($2, $3);
- $$ = l;
+ Lyric_combine_music * l = new Lyric_combine_music (SCM_EOL);
+ 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 ($2, $3, $4);
+ Part_combine_music * p = new Part_combine_music (SCM_EOL);
+
+ p->set_mus_property ("what", $2);
+ 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;
- t->set_mus_property ("type",
+ Music * t = new Music (SCM_EOL);
+ t->set_mus_property ("iterator-ctor",
Change_iterator::constructor_cxx_function);
t-> set_mus_property ("change-to-type", $2);
t-> set_mus_property ("change-to-id", $4);
property_def:
PROPERTY STRING '.' STRING '=' scalar {
- Music *t = new Music;
+
+ Music *t = set_property_music (scm_string_to_symbol ($4), $6);
+ Context_specced_music *csm = new Context_specced_music (SCM_EOL);
- t->set_mus_property ("type",
- Property_iterator::constructor_cxx_function);
+ 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", $2);
+ }
+ | PROPERTY STRING '.' STRING UNSET {
+ Music *t = new Music (SCM_EOL);
+
+ t->set_mus_property ("iterator-ctor",
+ Property_unset_iterator::constructor_cxx_function);
t->set_mus_property ("symbol", scm_string_to_symbol ($4));
- t->set_mus_property ("value", $6);
- Context_specced_music *csm = new Context_specced_music (t);
+ Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ 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", $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));
+ t->set_mus_property ("pop-first", SCM_BOOL_T);
+ t->set_mus_property ("grob-property", $6);
+ t->set_mus_property ("grob-value", $8);
+ Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ 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", $2);
}
- | PROPERTY STRING '.' STRING PUSH embedded_scm '=' embedded_scm {
- Music *t = new Music;
- t->set_mus_property ("type",
+ | 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));
- t->set_mus_property ("element-property", $6);
- t->set_mus_property ("element-value", $8);
- Context_specced_music *csm = new Context_specced_music (t);
+ t->set_mus_property ("grob-property", $6);
+ t->set_mus_property ("grob-value", $8);
+ Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ 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", $2);
}
- | PROPERTY STRING '.' STRING POP embedded_scm {
- Music *t = new Music;
- t->set_mus_property ("type",
+ | 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 ("element-property", $6);
+ t->set_mus_property ("grob-property", $6);
+
+ Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ csm->set_mus_property ("element", t->self_scm ());
+ scm_gc_unprotect_object (t->self_scm ());
- Context_specced_music *csm = new Context_specced_music (t);
$$ = csm;
$$->set_spot (THIS->here_input ());
request_chord:
- pre_requests simple_element post_requests {
- Music_sequence *l = dynamic_cast<Music_sequence*>($2);
- if (l) {
- for (int i=0; i < $1->size(); i++)
- l->append_music ($1->elem(i));
- for (int i=0; i < $3->size(); i++)
- l->append_music ($3->elem(i));
- }
- else
- programming_error ("Need Sequence to add music to");
- $$ = $2;
+ pre_requests {
+ THIS->push_spot ();
+ } /*cont */ simple_element post_requests {
+ Music_sequence *l = dynamic_cast<Music_sequence*> ($3);
+ $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 (gh_cons ($1->self_scm (), SCM_EOL));
+ $$ = new Request_chord (SCM_EOL);
+ $$->set_mus_property ("elements", gh_cons ($1->self_scm (), SCM_EOL));
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
}
- | BAR STRING ';' {
- Music *t = new Music;
+ | E_BACKSLASH {
+ $$ = new Music (gh_list (gh_cons (ly_symbol2scm ("name"), ly_symbol2scm ("separator")), SCM_UNDEFINED));
+ $$->set_spot (THIS->here_input ());
+ }
+ | '|' {
- t->set_mus_property ("type",
- Property_iterator::constructor_cxx_function);
- t->set_mus_property ("symbol", ly_symbol2scm ("whichBar"));
- t->set_mus_property ("value", $2);
+ extern Music * get_barcheck();
+ $$ = get_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);
+ csm->set_mus_property ("element", t->self_scm ());
+ scm_gc_unprotect_object (t->self_scm ());
- Context_specced_music *csm = new Context_specced_music (t);
$$ = csm;
$$->set_spot (THIS->here_input ());
csm->set_mus_property ("context-type", ly_str02scm ("Score"));
}
- | PARTIAL duration_length ';' {
- Music * p = new Music;
- p->set_mus_property ("symbol", ly_symbol2scm ( "measurePosition"));
- p->set_mus_property ("type",
- Property_iterator::constructor_cxx_function);
+ | PARTIAL duration_length {
+ Moment m = - unsmob_duration ($2)->length_mom ();
+ Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
- Moment m = - unsmob_duration($2)->length_mom ();
- p->set_mus_property ("value", m.smobbed_copy ());
+ Context_specced_music * sp = new Context_specced_music (SCM_EOL);
+ sp->set_mus_property ("element", p->self_scm ());
+ scm_gc_unprotect_object (p->self_scm ());
- Context_specced_music * sp = new Context_specced_music (p);
$$ =sp ;
sp-> set_mus_property ("context-type", ly_str02scm ( "Score"));
}
- | CLEF STRING ';' {
- SCM func = scm_eval2 (ly_symbol2scm ("clef-name-to-properties"), SCM_EOL);
+ | 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 = gh_cdr (s)) {
- Music * p = new Music;
- set_music_properties(p, gh_car (s));
+ 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_unprotect_object (p->self_scm ());
+ scm_gc_unprotect_object (p->self_scm ());
}
- Sequential_music * seq = new Sequential_music (l);
+ 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 ());
- Context_specced_music * sp = new Context_specced_music (seq);
$$ =sp ;
- sp-> set_mus_property("context-type", ly_str02scm("Staff"));
+ sp-> set_mus_property ("context-type", ly_str02scm ("Staff"));
}
- | TIME_T bare_unsigned '/' bare_unsigned ';' {
- Music * p = new Music;
- p->set_mus_property ("symbol",
- ly_symbol2scm ( "timeSignatureFraction"));
- p->set_mus_property ("type",
- Property_iterator::constructor_cxx_function);
+ | TIME_T fraction {
+ Music * p1 = set_property_music (ly_symbol2scm ( "timeSignatureFraction"), $2);
- p->set_mus_property ("value", gh_cons (gh_int2scm ($2),
- gh_int2scm ($4)));
+ 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);
+ seq->set_mus_property ("elements", list);
+
+
+ Context_specced_music * sp = new Context_specced_music (SCM_EOL);
+ 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 ());
+ scm_gc_unprotect_object (seq->self_scm ());
+
+ $$ = sp;
+
+/*
+ TODO: should make alias TimingContext for Score
+*/
- Context_specced_music * sp = new Context_specced_music (p);
- $$ =sp ;
sp-> set_mus_property ("context-type", ly_str02scm ( "Score"));
}
;
command_req:
shorthand_command_req { $$ = $1; }
- | verbose_command_req semicolon { $$ = $1; }
+ | verbose_command_req { $$ = $1; }
;
shorthand_command_req:
| hyphen_req {
$$ = $1;
}
- | '|' {
- $$ = new Barcheck_req;
- }
| '~' {
$$ = new Tie_req;
}
| '[' {
Span_req*b= new Span_req;
- b->set_span_dir(START);
+ b->set_span_dir (START);
b->set_mus_property ("span-type", ly_str02scm ("beam"));
$$ =b;
+
+
+ THIS->last_beam_start_ = b->self_scm ();
}
| ']' {
Span_req*b= new Span_req;
- b->set_span_dir( STOP);
+ b->set_span_dir ( STOP);
b->set_mus_property ("span-type", ly_str02scm ("beam"));
$$ = b;
}
| BREATHE {
$$ = new Breathing_sign_req;
}
+ | E_TILDE {
+ $$ = new Porrectus_req;
+ }
;
-
verbose_command_req:
- COMMANDSPANREQUEST bare_int STRING {
+ COMMANDSPANREQUEST bare_int STRING { /*TODO: junkme */
Span_req * sp_p = new Span_req;
- sp_p-> set_span_dir ( Direction($2));
+ 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 {
+ | MARK DEFAULT {
Mark_req * m = new Mark_req;
$$ = m;
}
- | MARK STRING {
+ | MARK scalar {
Mark_req *m = new Mark_req;
m->set_mus_property ("label", $2);
$$ = m;
}
- | MARK bare_unsigned {
- Mark_req *m = new Mark_req;
- m->set_mus_property ("label", gh_int2scm ($2));
- $$ = m;
- }
- | PENALTY bare_int {
+ | PENALTY SCM_T {
Break_req * b = new Break_req;
- b->set_mus_property ("penalty", gh_double2scm ( $2 / 100.0));
+ 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;
}
| tempo_request {
$$ = $1;
}
- | KEY {
+ | KEY DEFAULT {
Key_change_req *key_p= new Key_change_req;
$$ = key_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;
}
;
gen_text_def
| verbose_request
| script_abbreviation {
- SCM s = THIS->lexer_p_->lookup_identifier ("dash-" + ly_scm2string ($1));
+ SCM s = THIS->lexer_p_->lookup_identifier ("dash" + ly_scm2string ($1));
Articulation_req *a = new Articulation_req;
if (gh_string_p (s))
a->set_mus_property ("articulation-type", s);
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;
}
- | TEXTSCRIPT embedded_scm {
- Text_script_req *t = new Text_script_req;
- t->set_mus_property ("text", $2);
- t->set_spot (THIS->here_input ());
- $$ = t;
- }
| SPANREQUEST bare_int STRING {
Span_req * sp_p = new Span_req;
- sp_p->set_span_dir( Direction($2));
+ sp_p->set_span_dir ( Direction ($2));
sp_p->set_mus_property ("span-type", $3);
sp_p->set_spot (THIS->here_input ());
$$ = sp_p;
}
- | tremolo_type {
- Tremolo_req* a = new Tremolo_req;
- a->set_spot (THIS->here_input ());
- a->set_mus_property ("tremolo-type", gh_int2scm ($1));
- $$ = a;
- }
+ | tremolo_type {
+ Tremolo_req* a = new Tremolo_req;
+ 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:
}
;
-steno_musical_pitch:
+steno_pitch:
NOTENAME_PITCH {
$$ = $1;
}
}
;
-musical_pitch:
- steno_musical_pitch {
+pitch:
+ steno_pitch {
$$ = $1;
}
- | MUSICAL_PITCH embedded_scm {
- if (!unsmob_pitch ($2))
+ | explicit_pitch {
+ $$ = $1;
+ }
+ ;
+
+explicit_pitch:
+ PITCH embedded_scm {
+ $$ = $2;
+ if (!unsmob_pitch ($2)) {
THIS->parser_error (_f ("Expecting musical-pitch value", 3));
- Pitch m;
- $$ = m.smobbed_copy ();
+ $$ = Pitch ().smobbed_copy ();
+ }
}
;
-explicit_duration:
+verbose_duration:
DURATION embedded_scm {
$$ = $2;
if (!unsmob_duration ($2))
{
- THIS->parser_error (_("Must have duration object"));
+ THIS->parser_error (_ ("Must have duration object"));
$$ = Duration ().smobbed_copy ();
}
}
'(' {
Span_req* s= new Span_req;
$$ = s;
- s->set_mus_property ("span-type", ly_str02scm( "slur"));
+ s->set_mus_property ("span-type", ly_str02scm ( "slur"));
+ }
+ | E_OPEN {
+ Span_req* s= new Span_req;
+ $$ = s;
+ s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur"));
}
| E_SMALLER {
Span_req*s =new Span_req;
| ')' {
Span_req* s= new Span_req;
$$ = s;
- s->set_mus_property ("span-type", ly_str02scm( "slur"));
+ s->set_mus_property ("span-type", ly_str02scm ( "slur"));
+ }
+ | E_CLOSE {
+ Span_req* s= new Span_req;
+ $$ = s;
+ s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur"));
}
;
| 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"));
+ SCM finger = ly_symbol2scm ("finger");
+ t->set_mus_property ("text", ly_str02scm (ds.ch_C ()));
+ t->set_mus_property ("text-type" , finger);
t->set_spot (THIS->here_input ());
$$ = t;
}
script_abbreviation:
'^' {
- $$ = gh_str02scm ("hat");
+ $$ = gh_str02scm ("Hat");
}
| '+' {
- $$ = gh_str02scm("plus");
+ $$ = gh_str02scm ("Plus");
}
| '-' {
- $$ = gh_str02scm ("dash");
+ $$ = gh_str02scm ("Dash");
}
| '|' {
- $$ = gh_str02scm ("bar");
+ $$ = gh_str02scm ("Bar");
}
| '>' {
- $$ = gh_str02scm ("larger");
+ $$ = gh_str02scm ("Larger");
}
| '.' {
- $$ = gh_str02scm ("dot");
+ $$ = gh_str02scm ("Dot");
}
;
-
script_dir:
'_' { $$ = DOWN; }
| '^' { $$ = UP; }
}
;
-absolute_musical_pitch:
- steno_musical_pitch {
+absolute_pitch:
+ steno_pitch {
$$ = $1;
}
;
duration_length:
- steno_duration {
+ multiplied_duration {
$$ = $1;
}
- | duration_length '*' bare_unsigned {
- $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy ();
- }
- | duration_length '/' bare_unsigned {
- $$ = unsmob_duration ($$)->compressed (Moment (1,$3)).smobbed_copy ();
- }
- ;
-
-entered_notemode_duration:
- steno_duration {
- THIS->set_last_duration (unsmob_duration ($1));
- }
+ | verbose_duration {
+ $$ = $1;
+ }
;
optional_notemode_duration:
{
- $$ = THIS->default_duration_.smobbed_copy ();
+ Duration dd = THIS->default_duration_;
+ $$ = dd.smobbed_copy ();
+
+ THIS->beam_check ($$);
}
- | entered_notemode_duration {
+ | multiplied_duration {
$$ = $1;
+ THIS->default_duration_ = *unsmob_duration ($$);
+
+ THIS->beam_check ($$);
}
+ | verbose_duration {
+ $$ = $1;
+ THIS->default_duration_ = *unsmob_duration ($$);
+ }
;
steno_duration:
| DURATION_IDENTIFIER dots {
Duration *d =unsmob_duration ($1);
Duration k (d->duration_log (),d->dot_count () + $2);
- $$ = k.smobbed_copy ();
+ $$ = k.smobbed_copy ();
+ }
+ ;
+
+
+
+
+multiplied_duration:
+ steno_duration {
+ $$ = $1;
+ }
+ | multiplied_duration '*' bare_unsigned {
+ $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy ();
+ }
+ | multiplied_duration '*' FRACTION {
+ Rational m (gh_scm2int (ly_car ($3)), gh_scm2int (ly_cdr ($3)));
+
+ $$ = unsmob_duration ($$)->compressed (m).smobbed_copy ();
+ }
+ ;
+
+fraction:
+ FRACTION { $$ = $1; }
+ | UNSIGNED '/' UNSIGNED {
+ $$ = gh_cons (gh_int2scm ($1), gh_int2scm ($3));
}
;
;
+bass_number:
+ DIGIT
+ | UNSIGNED
+ ;
+
+bass_mod:
+ '-' { $$ = -1; }
+ | '+' { $$ = 1; }
+ | '!' { $$ = 0; }
+ ;
+
+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 ());
+ 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;
+ } else {
+ unsmob_music ($1)->set_mus_property ("force-accidental", SCM_BOOL_T);
+ }
+ }
+ ;
+
+figure_list:
+ /**/ {
+ $$ = SCM_EOL;
+ }
+ | figure_list bass_figure {
+ $$ = gh_cons ($2, $1);
+ }
+ ;
+
+figure_spec:
+ FIGURE_OPEN figure_list FIGURE_CLOSE {
+ Music * m = new Request_chord (SCM_EOL);
+ $2 = scm_reverse_x ($2, SCM_EOL);
+ m->set_mus_property ("elements", $2);
+ $$ = m->self_scm ();
+ }
+ ;
+
simple_element:
- musical_pitch exclamations questions optional_notemode_duration {
+ pitch exclamations questions optional_notemode_duration {
+
+ Input i = THIS->pop_spot ();
if (!THIS->lexer_p_->note_state_b ())
THIS->parser_error (_ ("Have to be in Note mode for notes"));
if ($2 % 2 || $3 % 2)
n->set_mus_property ("force-accidental", SCM_BOOL_T);
- Simultaneous_music*v = new Request_chord (gh_list (n->self_scm (), SCM_UNDEFINED));
+ Simultaneous_music*v = new Request_chord (SCM_EOL);
+ v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED));
-/*
-FIXME
-*/
- v->set_spot (THIS->here_input ());
- n->set_spot (THIS->here_input ());
-
+ v->set_spot (i);
+ n->set_spot (i);
$$ = v;
}
- | RESTNAME optional_notemode_duration {
-
- SCM e = SCM_UNDEFINED;
- if (ly_scm2string ($1) =="s")
- { /* Space */
- Skip_req * skip_p = new Skip_req;
- skip_p->set_mus_property ("duration" ,$2);
-
- skip_p->set_spot (THIS->here_input());
+ | figure_spec optional_notemode_duration {
+ Music * m = unsmob_music ($1);
+ 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);
+ }
+ $$ = m;
+ }
+ | RESTNAME optional_notemode_duration {
+
+ Input i = THIS->pop_spot ();
+ SCM e = SCM_UNDEFINED;
+ 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 ();
- }
- else
- {
- Rest_req * rest_req_p = new Rest_req;
- rest_req_p->set_mus_property ("duration", $2);
- rest_req_p->set_spot (THIS->here_input());
+ }
+ 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 ();
}
- Simultaneous_music* velt_p = new Request_chord (gh_list (e,SCM_UNDEFINED));
- velt_p->set_spot (THIS->here_input());
-
+ 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);
- $$ = velt_p;
+ $$ = velt_p;
}
- | MEASURES optional_notemode_duration {
+ | 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;
sp1->set_mus_property ("span-type", r);
sp2->set_mus_property ("span-type", r);
- Request_chord * rqc1 = new Request_chord (gh_list (sp1->self_scm (), SCM_UNDEFINED));
- Request_chord * rqc2 = new Request_chord (gh_list (sk->self_scm (), SCM_UNDEFINED));;
- Request_chord * rqc3 = new Request_chord(gh_list (sp2->self_scm (), SCM_UNDEFINED));;
+ 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));;
- SCM ms = gh_list (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
+ SCM ms = scm_list_n (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
- $$ = new Sequential_music (ms);
+ $$ = new Sequential_music (SCM_EOL);
+ $$->set_mus_property ("elements", ms);
}
- | STRING {
- THIS->remember_spot ();
- }
- /* cont */
- optional_notemode_duration {
- if (!THIS->lexer_p_->lyric_state_b ()) {
- THIS->pop_spot ().error (_ ("Have to be in Lyric mode for lyrics"));
- THIS->error_level_i_ = 1;
- THIS->parser_error (_ ("Giving up"));
- }
- else
- THIS->pop_spot ();
+ | 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",$3);
- lreq_p->set_spot (THIS->here_input());
- Simultaneous_music* velt_p = new Request_chord (gh_list (lreq_p->self_scm (), SCM_UNDEFINED));
-
+ 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));
$$= velt_p;
-
}
| chord {
+ Input i = THIS->pop_spot ();
+
if (!THIS->lexer_p_->chord_state_b ())
THIS->parser_error (_ ("Have to be in Chord mode for chords"));
$$ = $1;
$$ = gh_cons ($1, SCM_EOL);
}
| CHORDMODIFIER_PITCH {
- $$ = gh_cons ($1, SCM_EOL);
+ $$ = gh_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL);
}
| CHORDMODIFIER_PITCH chord_note { /* Ugh. */
- $$ = gh_list ($1, $2, SCM_UNDEFINED);
+ $$ = scm_list_n (unsmob_pitch ($1)->smobbed_copy (),
+ $2, SCM_UNDEFINED);
}
;
UTILITIES
*/
number_expression:
- bare_number {
- $$ = $1;
+ number_expression '+' number_term {
+ $$ = scm_sum ($1, $3);
}
- | '-' number_expression %prec UNARY_MINUS {
- $$ = scm_difference ($2, SCM_UNDEFINED);
+ | number_expression '-' number_term {
+ $$ = scm_difference ($1, $3);
}
- | number_expression '*' number_expression {
+ | number_term
+ ;
+
+number_term:
+ number_factor {
+ $$ = $1;
+ }
+ | number_factor '*' number_factor {
$$ = scm_product ($1, $3);
}
- | number_expression '/' number_expression {
+ | number_factor '/' number_factor {
$$ = scm_divide ($1, $3);
}
- | number_expression '+' number_expression {
- $$ = scm_sum ($1, $3);
- }
- | number_expression '-' number_expression {
- $$ = scm_difference ($1, $3);
- }
- | '(' number_expression ')' {
+ ;
+
+number_factor:
+ '(' number_expression ')' {
$$ = $2;
}
+ | '-' number_factor { /* %prec UNARY_MINUS */
+ $$ = scm_difference ($2, SCM_UNDEFINED);
+ }
+ | bare_number
;
+
bare_number:
UNSIGNED {
$$ = gh_int2scm ($1);
}
- | DIGIT {
- $$ = gh_int2scm ($1);
- }
| REAL {
- $$ = gh_double2scm ($1);
+ $$ = $1;
}
| NUMBER_IDENTIFIER {
$$ = $1;
}
| REAL CM_T {
- $$ = gh_double2scm ($1 CM);
+ $$ = gh_double2scm (gh_scm2double ($1) CM );
}
| REAL PT_T {
- $$ = gh_double2scm ($1 PT);
+ $$ = gh_double2scm (gh_scm2double ($1) PT);
}
| REAL IN_T {
- $$ = gh_double2scm ($1 INCH);
+ $$ = gh_double2scm (gh_scm2double ($1) INCH);
}
| REAL MM_T {
- $$ = gh_double2scm ($1 MM);
+ $$ = gh_double2scm (gh_scm2double ($1) MM);
}
| REAL CHAR_T {
- $$ = gh_double2scm ($1 CHAR);
+ $$ = gh_double2scm (gh_scm2double ($1) CHAR);
}
;
bare_unsigned:
- bare_number {
- if (scm_integer_p ($1) == SCM_BOOL_T) {
- $$ = gh_scm2int ($1);
-
- } else {
- THIS->parser_error (_("need integer number arg"));
- $$ = 0;
- }
- if ($$ < 0) {
- THIS->parser_error (_("Must be positive integer"));
- $$ = -$$;
- }
-
+ UNSIGNED {
+ $$ = $1;
+ }
+ | DIGIT {
+ $$ = $1;
}
;
+
bare_int:
bare_number {
if (scm_integer_p ($1) == SCM_BOOL_T)
$$ = k;
} else
{
- THIS->parser_error (_("need integer number arg"));
+ THIS->parser_error (_ ("need integer number arg"));
$$ = 0;
}
}
$$ = $1;
}
| string '+' string {
- $$ = scm_string_append (scm_listify ($1, $3, SCM_UNDEFINED));
+ $$ = scm_string_append (scm_list_n ($1, $3, SCM_UNDEFINED));
}
;
;
-semicolon:
- ';'
- ;
-
%%
void
}
+/*
+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;
+}
projects / lilypond.git / blobdiff