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>
*/
#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 "repeated-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)
{
- return t && t == 1 << intlog2(t);
+ return t && t == 1 << intlog2 (t);
}
}
-// 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 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 PITCHNAMES
%token NOTES
%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
%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET
%type <i> exclamations questions dots
%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 <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> explicit_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 <request> extender_req
%type <request> hyphen_req
%type <scm> string bare_number number_expression
+
%type <score> score_block score_body
%type <scm> translator_spec_block translator_spec_body
THIS->lexer_p_->chordmodifier_tab_ = $1;
}
| lilypond_header {
- delete header_global_p;
- header_global_p = $1;
+ if (global_header_p)
+ scm_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
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, gh_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 ();
}
;
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);
+ /*
+ Should find generic way of associating input with objects.
+ */
+ THIS->pop_spot ();
}
;
identifier_init:
score_block {
- $$ = (new Score_identifier ($1, SCORE_IDENTIFIER))->self_scm();
+ $$ = $1->self_scm ();
+ scm_unprotect_object ($$);
}
| output_def {
- $$ = (new Music_output_def_identifier ($1, MUSIC_OUTPUT_DEF_IDENTIFIER))->self_scm();
+ $$ = $1->self_scm ();
+ scm_unprotect_object ($$);
}
| translator_spec_block {
$$ = $1;
$$ = 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;
->add_push_property (scm_string_to_symbol ($2), $4, $6);
}
| translator_spec_body STRING REVERT embedded_scm {
- unsmob_translator_def($$)->add_pop_property (
+ 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 ALIAS STRING {
+ Translator_def*td = unsmob_translator_def ($$);
+ td->type_aliases_ = gh_cons ($3, td->type_aliases_);
+ }
| 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 CONSISTSEND STRING semicolon {
+ | 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);
}
;
$$ = $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);
$$->music_ = m;
}
| SCORE_IDENTIFIER {
- $$ = $1->access_content_Score (true);
+ $$ = new Score (*unsmob_score ($1));
+ $$->set_spot (THIS->here_input ());
}
| score_body lilypond_header {
+ scm_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.
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 */
else
Repeated_music:
- REPEAT STRING bare_unsigned Music Alternative_music
+ REPEAT string bare_unsigned Music Alternative_music
{
Music_sequence* alts = dynamic_cast <Music_sequence*> ($5);
if (alts && $3 < alts->length_i ())
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 (SCM_EOL);
- m->set_mus_property ("predicate", pred);
- m->set_mus_property ("symbol", $3);
- m->set_mus_property ("value", $5);
- m->set_mus_property ("iterator-ctor",
- Output_property_music_iterator::constructor_cxx_function);
+ Music *m = new Music (SCM_EOL);
+ m->set_mus_property ("predicate", pred);
+ m->set_mus_property ("symbol", $3);
+ m->set_mus_property ("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));
- }
;
$$ = csm;
}
| AUTOCHANGE STRING Music {
- Auto_change_music * chm = new Auto_change_music (SCM_EOL);
+ 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_unprotect_object ($3->self_scm ());
chm->set_mus_property ("what", $2);
scm_unprotect_object ($2->self_scm ());
}
- | CONTEXT STRING '=' STRING Music {
+ | CONTEXT string '=' string Music {
Context_specced_music *csm = new Context_specced_music (SCM_EOL);
csm->set_mus_property ("element", $5->self_scm ());
scm_unprotect_object ($5->self_scm ());
| Repeated_music { $$ = $1; }
| Simultaneous_music { $$ = $1; }
| Sequential_music { $$ = $1; }
- | TRANSPOSE musical_pitch Music {
+ | TRANSPOSE pitch Music {
$$ = new Transposed_music (SCM_EOL);
Music *p = $3;
Pitch pit = *unsmob_pitch ($2);
{ 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 {
+ RELATIVE absolute_pitch Music {
Music * p = $3;
Pitch pit = *unsmob_pitch ($2);
$$ = new Relative_octave_music (SCM_EOL);
p->set_mus_property ("one", $3->self_scm ());
p->set_mus_property ("two", $4->self_scm ());
- scm_unprotect_object ($3->self_scm());
- scm_unprotect_object ($4->self_scm());
+ scm_unprotect_object ($3->self_scm ());
+ scm_unprotect_object ($4->self_scm ());
$$ = p;
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));
+
+ Context_specced_music *csm = new Context_specced_music (SCM_EOL);
+ csm->set_mus_property ("element", t->self_scm ());
+ scm_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",
request_chord:
pre_requests simple_element post_requests {
- Music_sequence *l = dynamic_cast<Music_sequence*>($2);
+ 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));
+ 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");
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
}
- | BAR STRING ';' {
+ | BAR STRING {
Music *t = new Music (SCM_EOL);
t->set_mus_property ("iterator-ctor",
csm->set_mus_property ("context-type", ly_str02scm ("Score"));
}
- | PARTIAL duration_length ';' {
+ | PARTIAL duration_length {
Music * p = new Music (SCM_EOL);
p->set_mus_property ("symbol", ly_symbol2scm ( "measurePosition"));
p->set_mus_property ("iterator-ctor",
Property_iterator::constructor_cxx_function);
- Moment m = - unsmob_duration($2)->length_mom ();
+ 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 ;
sp-> set_mus_property ("context-type", ly_str02scm ( "Score"));
}
- | CLEF STRING ';' {
+ | CLEF STRING {
SCM func = scm_eval2 (ly_symbol2scm ("clef-name-to-properties"), SCM_EOL);
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 (SCM_EOL);
- set_music_properties(p, gh_car (s));
+ set_music_properties (p, gh_car (s));
l = gh_cons (p->self_scm (), l);
scm_unprotect_object (p->self_scm ());
}
scm_unprotect_object (seq->self_scm ());
$$ =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 ';' {
+ | TIME_T bare_unsigned '/' bare_unsigned {
Music * p = new Music (SCM_EOL);
p->set_mus_property ("symbol",
ly_symbol2scm ( "timeSignatureFraction"));
scm_unprotect_object (p->self_scm ());
$$ = sp;
+
+/*
+ TODO: should make alias TimingContext for Score
+*/
+
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:
}
| '[' {
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;
}
| ']' {
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;
}
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;
}
;
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 ());
}
;
-steno_musical_pitch:
+steno_pitch:
NOTENAME_PITCH {
$$ = $1;
}
}
;
-musical_pitch:
- steno_musical_pitch {
+pitch:
+ steno_pitch {
+ $$ = $1;
+ }
+ | explicit_pitch {
$$ = $1;
}
- | MUSICAL_PITCH embedded_scm {
- if (!unsmob_pitch ($2))
+ ;
+
+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 ();
+ }
}
;
$$ = $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"));
}
;
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", ly_str02scm (ds.ch_C ()));
t->set_mus_property ("text-type" , ly_symbol2scm ("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");
}
;
-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));
- }
+ | explicit_duration {
+ $$ = $1;
+ }
;
optional_notemode_duration:
{
$$ = THIS->default_duration_.smobbed_copy ();
}
- | entered_notemode_duration {
+ | multiplied_duration {
$$ = $1;
}
+ | explicit_duration {
+ $$ = $1;
+ }
;
steno_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 ();
+ $$ = k.smobbed_copy ();
+
+ THIS->set_last_duration (unsmob_duration ($$));
+ }
+ ;
+
+
+
+
+multiplied_duration:
+ steno_duration {
+ $$ = $1;
+ }
+ | multiplied_duration '*' bare_unsigned {
+ $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy ();
+ }
+ | multiplied_duration '/' bare_unsigned {
+ $$ = unsmob_duration ($$)->compressed (Moment (1,$3)).smobbed_copy ();
}
;
simple_element:
- musical_pitch exclamations questions optional_notemode_duration {
+ pitch exclamations questions optional_notemode_duration {
if (!THIS->lexer_p_->note_state_b ())
THIS->parser_error (_ ("Have to be in Note mode for notes"));
Skip_req * skip_p = new Skip_req;
skip_p->set_mus_property ("duration" ,$2);
- skip_p->set_spot (THIS->here_input());
+ skip_p->set_spot (THIS->here_input ());
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());
+ rest_req_p->set_spot (THIS->here_input ());
e = rest_req_p->self_scm ();
}
Simultaneous_music* velt_p = new Request_chord (SCM_EOL);
velt_p-> set_mus_property ("elements", gh_list (e,SCM_UNDEFINED));
- velt_p->set_spot (THIS->here_input());
+ velt_p->set_spot (THIS->here_input ());
$$ = velt_p;
}
- | MEASURES optional_notemode_duration {
+ | MULTI_MEASURE_REST optional_notemode_duration {
Skip_req * sk = new Skip_req;
sk->set_mus_property ("duration", $2);
Span_req *sp1 = new Span_req;
rqc1->set_mus_property ("elements", gh_list (sp1->self_scm (), SCM_UNDEFINED));
Request_chord * rqc2 = new Request_chord (SCM_EOL);
rqc2->set_mus_property ("elements", gh_list (sk->self_scm (), SCM_UNDEFINED));;
- Request_chord * rqc3 = new Request_chord(SCM_EOL);
+ Request_chord * rqc3 = new Request_chord (SCM_EOL);
rqc3->set_mus_property ("elements", gh_list (sp2->self_scm (), SCM_UNDEFINED));;
SCM ms = gh_list (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
$$ = 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 {
+
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());
+ lreq_p->set_mus_property ("duration",$2);
+ lreq_p->set_spot (THIS->here_input ());
Simultaneous_music* velt_p = new Request_chord (SCM_EOL);
velt_p->set_mus_property ("elements", gh_list (lreq_p->self_scm (), SCM_UNDEFINED));
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;
}
}
;
-semicolon:
- ';'
- ;
-
%%
void
projects / lilypond.git / blobdiff