*/
#include <ctype.h>
-#include <iostream.h>
+
+//#include <iostream>
#include "translator-def.hh"
#include "lily-guile.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 "property-iterator.hh"
#include "file-results.hh"
#include "input.hh"
-#include "scope.hh"
#include "relative-music.hh"
#include "lyric-combine-music.hh"
#include "transposed-music.hh"
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)
{
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));
}
}
// needed for bison.simple's malloc () and free ()
+
#include <malloc.h>
+#include <stdlib.h>
+
-#ifndef NDEBUG
-#define YYDEBUG 1
-#endif
#define YYERROR_VERBOSE 1
-#define YYPARSE_PARAM my_lily_parser_l
-#define YYLEX_PARAM my_lily_parser_l
+#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 {
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
-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;
+ return lex->yylex ();
}
%token DURATION
%token EXTENDER
%token FIGURES FIGURE_OPEN FIGURE_CLOSE
+%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
%token GLISSANDO
%token GRACE
%token HEADER
%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
+%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE
+%token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE
+%token E_BACKSLASH
+%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET
+%token FIGURE_SPACE
-%type <i> exclamations questions dots
+
+%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
%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
| 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;
+ if (global_header)
+ scm_gc_unprotect_object (global_header->self_scm ());
+ global_header = $1;
}
| score_block {
- score_global_array.push ($1);
+ score_globals.push ($1);
}
| output_def {
if (dynamic_cast<Paper_def*> ($1))
- THIS->lexer_p_->set_identifier ("$defaultpaper", $1->self_scm ());
+ THIS->lexer_->set_identifier (gh_str02scm ("$defaultpaper"), $1->self_scm ());
else if (dynamic_cast<Midi_def*> ($1))
- THIS->lexer_p_->set_identifier ("$defaultmidi", $1->self_scm ());
+ THIS->lexer_->set_identifier (gh_str02scm ("$defaultmidi"), $1->self_scm ());
}
| embedded_scm {
// junk value
lilypond_header_body:
{
$$ = new Scheme_hash_table;
-
- Scope *sc = new Scope ($$);
- THIS->lexer_p_-> scope_l_arr_.push (sc);
+ THIS->lexer_-> scopes_.push ($$);
}
| lilypond_header_body assignment {
lilypond_header:
HEADER '{' lilypond_header_body '}' {
$$ = $3;
- delete THIS->lexer_p_-> scope_l_arr_.pop ();
+ THIS->lexer_->scopes_.pop ();
}
;
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.
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | explicit_duration {
+ | verbose_duration {
$$ = $1;
}
| number_expression {
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);
/*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));
}
| 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_-> scopes_.pop ();
}
;
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;
p = new Midi_def;
$$ = p;
- THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
+ THIS->lexer_->scopes_.push (p->variable_tab_);
}
| 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_-> scopes_.push (p->variable_tab_);
$$ = 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_);
+ THIS->lexer_->scopes_.push (p->variable_tab_);
$$ = p;
}
| MIDI '{' 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_);
+ THIS->lexer_->scopes_.push (p->variable_tab_);
$$ = p;
}
| music_output_def_body assignment {
*/
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->length_mom (), m);
}
| music_output_def_body error {
SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor"));
SCM result = gh_call1 (func, $2);
+ if (gh_equal_p ($2, ly_str02scm ("tremolo")))
+ {
+ /*
+ we can not get durations and other stuff correct down the line, so we have to
+ add to the duration log here.
+
+ TODO: do dots.
+ */
+ SCM func = scm_primitive_eval (ly_symbol2scm ("shift-duration-log"));
+ gh_call2 (func, r->self_scm (), gh_int2scm(-intlog2 ($3)));
+ }
+
set_music_properties (r, result);
r->set_spot (*$4->origin ());
+
$$ = r;
}
;
SEQUENTIAL '{' Music_list '}' {
$$ = new Sequential_music (SCM_EOL);
$$->set_mus_property ("elements", ly_car ($3));
+ $$->set_spot(THIS->here_input());
}
| '{' Music_list '}' {
$$ = new Sequential_music (SCM_EOL);
$$->set_mus_property ("elements", ly_car ($2));
+ $$->set_spot(THIS->here_input());
}
;
SIMULTANEOUS '{' Music_list '}'{
$$ = new Simultaneous_music (SCM_EOL);
$$->set_mus_property ("elements", ly_car ($3));
+ $$->set_spot(THIS->here_input());
}
| '<' Music_list '>' {
$$ = new Simultaneous_music (SCM_EOL);
$$->set_mus_property ("elements", ly_car ($2));
+ $$->set_spot(THIS->here_input());
}
;
}
| MUSIC_IDENTIFIER {
$$ = unsmob_music ($1)->clone ();
+
+ $$->set_spot (THIS->here_input());
}
| property_def
| translator_change
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);
$$ = 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 () ;
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 ;
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; }
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 ("symbol", 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);
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 ("symbol", scm_string_to_symbol ($4));
t->set_mus_property ("grob-property", $6);
t->set_mus_property ("grob-value", $8);
Context_specced_music *csm = new Context_specced_music (SCM_EOL);
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 ("symbol", scm_string_to_symbol ($4));
t->set_mus_property ("grob-property", $6);
Context_specced_music *csm = new Context_specced_music (SCM_EOL);
}
;
+
scalar:
- string { $$ = $1; }
- | bare_int { $$ = gh_int2scm ($1); }
- | embedded_scm { $$ = $1; }
- ;
+ string { $$ = $1; }
+ | bare_int { $$ = gh_int2scm ($1); }
+ | embedded_scm { $$ = $1; }
+ ;
request_chord:
THIS->push_spot ();
} /*cont */ simple_element post_requests {
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_req {
$$ = new Request_chord (SCM_EOL);
$$->set_mus_property ("elements", gh_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 {
+ Span_req *l = new Span_req;
+ l->set_span_dir (START);
+ l->set_mus_property ("span-type", ly_str02scm ("ligature"));
+ l->set_spot (THIS->here_input ());
+
+ $$ = new Request_chord (SCM_EOL);
+ $$->set_mus_property ("elements", gh_cons (l->self_scm (), SCM_EOL));
+ scm_gc_unprotect_object (l->self_scm());
+ $$->set_spot (THIS->here_input ());
+ }
+ | E_RIGHTSQUARE {
+ Span_req *l = new Span_req;
+ l->set_span_dir (STOP);
+ l->set_mus_property ("span-type", ly_str02scm ("ligature"));
+ l->set_spot (THIS->here_input ());
+
+ $$ = new Request_chord (SCM_EOL);
+ $$->set_mus_property ("elements", gh_cons (l->self_scm (), SCM_EOL));
+ $$->set_spot (THIS->here_input ());
+ scm_gc_unprotect_object (l->self_scm());
+
+ }
+ | E_BACKSLASH {
+ $$ = new Music (gh_list (gh_cons (ly_symbol2scm ("name"), ly_symbol2scm ("separator")), SCM_UNDEFINED));
+ $$->set_spot (THIS->here_input ());
+ }
+ | '|' {
+
+ extern Music * get_barcheck();
+ $$ = get_barcheck ();
+ $$->set_spot (THIS->here_input ());
+ }
| BAR STRING {
Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2);
| 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 ());
| hyphen_req {
$$ = $1;
}
- | '|' {
- $$ = new Barcheck_req;
- }
| '~' {
$$ = new Tie_req;
}
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;
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;
+ Span_req * sp = new Span_req;
+ sp-> set_span_dir ( Direction ($2));
+ sp->set_mus_property ("span-type",$3);
+ sp->set_spot (THIS->here_input ());
+ $$ = sp;
}
| MARK DEFAULT {
Mark_req * m = new Mark_req;
Mark_req *m = new Mark_req;
m->set_mus_property ("label", $2);
$$ = m;
-
}
| PENALTY SCM_T {
-
-
Break_req * b = new Break_req;
SCM s = $2;
if (!gh_number_p (s))
$$ = b;
}
| SKIP duration_length {
- Skip_req * skip_p = new Skip_req;
- skip_p->set_mus_property ("duration", $2);
+ Skip_req * skip = new Skip_req;
+ skip->set_mus_property ("duration", $2);
- $$ = skip_p;
+ $$ = skip;
}
| tempo_request {
$$ = $1;
}
| KEY DEFAULT {
- Key_change_req *key_p= new Key_change_req;
- $$ = key_p;
+ Key_change_req *key= new Key_change_req;
+ $$ = key;
}
| KEY NOTENAME_PITCH SCM_IDENTIFIER {
- Key_change_req *key_p= new Key_change_req;
+ Key_change_req *key= new Key_change_req;
- 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;
}
;
gen_text_def
| verbose_request
| script_abbreviation {
- SCM s = THIS->lexer_p_->lookup_identifier ("dash" + ly_scm2string ($1));
+ SCM s = THIS->lexer_->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;
}
| 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;
+ Span_req * sp = new Span_req;
+ sp->set_span_dir ( Direction ($2));
+ sp->set_mus_property ("span-type", $3);
+ sp->set_spot (THIS->here_input ());
+ $$ = sp;
}
| tremolo_type {
Tremolo_req* a = new Tremolo_req;
}
| 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;
}
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;
}
$$ = $1;
dynamic_cast<Span_req*> ($$)->set_span_dir ( START);
}
-
+ ;
+
close_request_parens:
'(' {
Span_req* s= new Span_req;
$$ = s;
s->set_mus_property ("span-type", ly_str02scm ( "slur"));
+ s->set_spot (THIS->here_input());
}
| E_OPEN {
Span_req* s= new Span_req;
$$ = 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;
$$ = s;
s->set_mus_property ("span-type", ly_str02scm ( "crescendo"));
+ s->set_spot (THIS->here_input());
}
| E_BIGGER {
Span_req*s =new Span_req;
$$ = s;
s->set_mus_property ("span-type", ly_str02scm ("decrescendo"));
+ s->set_spot (THIS->here_input());
}
;
E_EXCLAMATION {
Span_req *s = new Span_req;
s->set_mus_property ("span-type", ly_str02scm ( "crescendo"));
+ s->set_spot (THIS->here_input());
$$ = s;
}
Span_req* s= new Span_req;
$$ = s;
s->set_mus_property ("span-type", ly_str02scm ( "slur"));
+ s->set_spot (THIS->here_input());
+
}
| E_CLOSE {
Span_req* s= new Span_req;
$$ = s;
s->set_mus_property ("span-type", ly_str02scm ( "phrasing-slur"));
+ s->set_spot (THIS->here_input());
}
;
$$ = t;
}
| DIGIT {
- String ds = to_str ($1);
+ String ds = to_string ($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.to_str0 ()));
+ t->set_mus_property ("text-type" , finger);
t->set_spot (THIS->here_input ());
$$ = t;
}
}
;
-
script_dir:
'_' { $$ = DOWN; }
| '^' { $$ = UP; }
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 ($$));
}
;
;
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 {
+ Bass_figure_req *bfr = new Bass_figure_req;
+ $$ = bfr->self_scm();
+ scm_gc_unprotect_object ($$);
+ }
+ | bass_number {
+ Bass_figure_req *bfr = new Bass_figure_req;
+ $$ = 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 {
+ | figure_list br_bass_figure {
$$ = gh_cons ($2, $1);
}
;
}
;
+
+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 = new Rest_req ;
+ else
+ n = new Note_req;
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)
Simultaneous_music*v = new Request_chord (SCM_EOL);
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;
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 ();
+ Skip_req * skip = new Skip_req;
+ skip->set_mus_property ("duration" ,$2);
+ skip->set_spot (i);
+ e = skip->self_scm ();
}
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 ();
+ Rest_req * rest_req = new Rest_req;
+ rest_req->set_mus_property ("duration", $2);
+ rest_req->set_spot (i);
+ e = rest_req->self_scm ();
}
- 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);
+ Simultaneous_music* velt = new Request_chord (SCM_EOL);
+ velt-> set_mus_property ("elements", scm_list_n (e,SCM_UNDEFINED));
+ velt->set_spot (i);
- $$ = velt_p;
+ $$ = velt;
}
| MULTI_MEASURE_REST optional_notemode_duration {
Input i = 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",$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));
+ Lyric_req* lreq = new Lyric_req;
+ lreq->set_mus_property ("text", $1);
+ lreq->set_mus_property ("duration",$2);
+ lreq->set_spot (i);
+ Simultaneous_music* velt = new Request_chord (SCM_EOL);
+ velt->set_mus_property ("elements", scm_list_n (lreq->self_scm (), SCM_UNDEFINED));
- $$= velt_p;
+ $$= velt;
}
| chord {
Input i = 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_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 ();
}
%%
void
-My_lily_parser::set_yydebug (bool b)
+My_lily_parser::set_yydebug (bool )
{
-#ifdef YYDEBUG
+#if 0
yydebug = b;
#endif
}
}
+/*
+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