source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
Two shift/reduce problems:
- - empty music-list
- - empty pre-events
-
-
-
-(bullshit.
-
-s/r:
1. foo = bar.
- "bar" -> String -> Lyric -> Music
+ "bar" -> String -> Lyric -> Music -> music-assignment
- "bar" -> String
+ "bar" -> String -> string-assignment
2. \repeat
* The rules for who is protecting what are very shady. Uniformise
this.
-* There are too many lexical modes.
+* There are too many lexical modes?
*/
#include <ctype.h>
+#include <stdlib.h>
#include "translator-def.hh"
#include "lily-guile.hh"
#include "music-sequence.hh"
#include "input-smob.hh"
#include "event.hh"
+#include "text-item.hh"
+
+
+
+#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
+
+
+
+#define YYERROR_VERBOSE 1
+
+My_lily_parser* my_lily_parser;
+#define YYPARSE_PARAM my_lily_parser
+#define YYLEX_PARAM my_lily_parser
+#define THIS\
+ ((My_lily_parser *) my_lily_parser)
+
+#define yyerror THIS->parser_error
+
+
+
+
bool
regular_identifier_b (SCM id)
return v;
}
+SCM
+make_simple_markup (SCM a)
+{
+ static SCM simple;
+ if (!simple)
+ simple = scm_c_eval_string ("simple-markup");
+
+ return scm_list_n (simple, a, SCM_UNDEFINED);
+}
bool
-#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
-
Music*
set_property_music (SCM sym, SCM value)
{
return p;
}
-
-// needed for bison.simple's malloc () and free ()
-
-// #include <malloc.h>
-#include <stdlib.h>
-
-
-
-#define YYERROR_VERBOSE 1
-
-My_lily_parser* my_lily_parser;
-#define YYPARSE_PARAM my_lily_parser
-#define YYLEX_PARAM my_lily_parser
-#define THIS\
- ((My_lily_parser *) my_lily_parser)
-
-#define yyerror THIS->parser_error
-
%}
/* We use SCMs to do strings, because it saves us the trouble of
/* tokens which are not keywords */
%token AUTOCHANGE
%token ALIAS
+%token APPLYCONTEXT
%token APPLY
%token ACCEPTS
%token ALTERNATIVE
%token <scm> DURATION_IDENTIFIER
%token <scm> FRACTION
%token <id> IDENTIFIER
+%token <scm> CHORDNAMES CHORDNAMES_IDENTIFIER
+%type <scm> chordnames_block chordnames_list chord_scm
%token <scm> SCORE_IDENTIFIER
%token <i> UNSIGNED
%token <scm> REAL
+%token MARKUP
+%token <scm> MARKUP_HEAD_MARKUP0
+%token <scm> MARKUP_HEAD_MARKUP0_MARKUP1
+%token <scm> MARKUP_HEAD_SCM0
+%token <scm> MARKUP_HEAD_SCM0_MARKUP1
+%token <scm> MARKUP_HEAD_SCM0_SCM1
+%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
+
+%token <scm> MARKUP_IDENTIFIER MARKUP_HEAD_LIST0
+%type <scm> markup markup_line markup_list markup_list_body full_markup
+
%type <outputdef> output_def
%type <scm> lilypond_header lilypond_header_body
%type <music> open_event_parens close_event_parens open_event close_event
%type <scm> pre_events post_events
%type <music> gen_text_def
-%type <scm> steno_pitch pitch absolute_pitch
+%type <scm> steno_pitch pitch absolute_pitch pitch_also_in_chords
%type <scm> explicit_pitch steno_tonic_pitch
%type <scm> chord_additions chord_subtractions chord_notes chord_step
else
scm_hashq_set_x (tab, ly_caar (s), pt);
}
-
$$ = tab;
}
;
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
+ | full_markup {
+ $$ = $1;
+ }
| output_def {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
| embedded_scm {
$$ = $1;
}
+ | chordnames_block {
+ $$ = $1;
+ }
+ ;
+
+chordnames_block:
+ CHORDNAMES '{'
+ { THIS->lexer_->push_chord_state (); }
+ chordnames_list
+ { THIS->lexer_->pop_state (); }
+ '}'
+ {
+ $$ = $4;
+ }
;
+chordnames_list:
+ /* empty */ {
+ $$ = SCM_EOL;
+ }
+ | CHORDNAMES_IDENTIFIER chordnames_list {
+ $$ = scm_append (scm_list_2 ($1, $2));
+ }
+ | chord_scm '=' full_markup chordnames_list {
+ $$ = scm_cons (scm_cons ($1, $3), $4);
+ };
+
+chord_scm:
+ steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass {
+ $$ = Chord::tonic_add_sub_to_pitches ($1, $3, $4);
+ /* junk bass and inversion for now */
+ };
+
translator_spec_block:
TRANSLATOR '{' translator_spec_body '}'
{
music.
*/
int m = gh_scm2int ( $2->get_mus_property ("metronome-count"));
- Duration *d = unsmob_duration ($2->get_mus_property ("duration"));
+ Duration *d = unsmob_duration ($2->get_mus_property ("tempo-unit"));
Midi_def * md = dynamic_cast<Midi_def*> ($$);
if (md)
md->set_tempo (d->get_length (), m);
tempo_event:
TEMPO steno_duration '=' bare_unsigned {
$$ = MY_MAKE_MUSIC("TempoEvent");
- $$->set_mus_property ("duration", $2);
+ $$->set_mus_property ("tempo-unit", $2);
$$->set_mus_property ("metronome-count", gh_int2scm ( $4));
}
;
Simple_music:
event_chord { $$ = $1; }
+ | APPLYCONTEXT embedded_scm {
+ if (!gh_procedure_p ($2))
+ THIS->parser_error (_ ("\applycontext takes function argument"));
+ $$ = MY_MAKE_MUSIC ("ApplyContext");
+ $$->set_mus_property ("procedure", $2);
+ $$->set_spot (THIS->here_input());
+ }
| OUTPUTPROPERTY embedded_scm embedded_scm '=' embedded_scm {
SCM pred = $2;
if (!gh_symbol_p ($3))
| Repeated_music { $$ = $1; }
| Simultaneous_music { $$ = $1; }
| Sequential_music { $$ = $1; }
- | TRANSPOSE pitch Music {
+ | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music {
$$ = MY_MAKE_MUSIC("TransposedMusic");
- Music *p = $3;
- Pitch pit = *unsmob_pitch ($2);
+ Music *p = $4;
+ Pitch from = *unsmob_pitch ($2);
+ Pitch to = *unsmob_pitch ($3);
- p->transpose (pit);
+ p->transpose (interval (from, to));
$$->set_mus_property ("element", p->self_scm ());
scm_gc_unprotect_object (p->self_scm ());
}
- | TRANSPOSE steno_tonic_pitch Music {
- $$ = MY_MAKE_MUSIC("TransposedMusic");
- 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);
string { $$ = $1; }
| bare_int { $$ = gh_int2scm ($1); }
| embedded_scm { $$ = $1; }
+ | full_markup { $$ = $1; }
;
$$ = MY_MAKE_MUSIC("EventChord");
$$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
- scm_gc_unprotect_object (l->self_scm());
+ scm_gc_unprotect_object (l->self_scm());
$$->set_spot (THIS->here_input ());
}
| E_RIGHTSQUARE {
$$ = MY_MAKE_MUSIC("EventChord");
$$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
$$->set_spot (THIS->here_input ());
- scm_gc_unprotect_object (l->self_scm());
-
+ scm_gc_unprotect_object (l->self_scm());
}
| E_BACKSLASH {
$$ = MY_MAKE_MUSIC("VoiceSeparator");
$$ = unsmob_music (result);
}
| TIME_T fraction {
- Music * p1 = set_property_music (ly_symbol2scm ( "timeSignatureFraction"), $2);
-
- int l = gh_scm2int (ly_car ($2));
- int o = gh_scm2int (ly_cdr ($2));
-
- Moment one_beat = Moment (1)/Moment (o);
- Moment len = Moment (l) * one_beat;
-
-
- 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);
- Music *seq = MY_MAKE_MUSIC("SequentialMusic");
- seq->set_mus_property ("elements", list);
-
-
- Music * sp = MY_MAKE_MUSIC("ContextSpeccedMusic");
- sp->set_mus_property ("element", seq->self_scm ());
-
- scm_gc_unprotect_object (p3->self_scm ());
- scm_gc_unprotect_object (p2->self_scm ());
- scm_gc_unprotect_object (p1->self_scm ());
- scm_gc_unprotect_object (seq->self_scm ());
-
- $$ = sp;
+ static SCM proc;
+ if (!proc)
+ proc = scm_c_eval_string ("make-time-signature-set");
- sp-> set_mus_property ("context-type", scm_makfrom0str ( "Timing"));
+ SCM result = scm_apply_2 (proc, gh_car ($2), gh_cdr ($2), SCM_EOL);
+ scm_gc_protect_object (result);
+ $$ = unsmob_music (result);
}
;
}
| '[' {
Music *b= MY_MAKE_MUSIC("BeamEvent");
- b->set_mus_property ("span-direction", gh_int2scm (START))
-;
- $$ =b;
-
+ b->set_mus_property ("span-direction", gh_int2scm (START));
+ $$ = b;
THIS->last_beam_start_ = b->self_scm ();
}
Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
key->set_mus_property ("pitch-alist", $3);
+ key->set_mus_property ("tonic", Pitch (0,0,0).smobbed_copy());
((Music*)key)->transpose (* unsmob_pitch ($2));
- $$ = key;
+
+ $$ = key;
}
;
| verbose_event
| close_event
| open_event
+ | '[' {
+ Music * m = MY_MAKE_MUSIC ("NewBeamEvent");
+ m->set_spot (THIS->here_input());
+ m->set_mus_property ("span-direction" , gh_int2scm (START));
+ $$ = m;
+ }
+ | ']' {
+ Music * m = MY_MAKE_MUSIC ("NewBeamEvent");
+ m->set_spot (THIS->here_input());
+ m->set_mus_property ("span-direction" , gh_int2scm (STOP));
+ $$ = m;
+ }
+ | '~' {
+ Music * m = MY_MAKE_MUSIC ("NewTieEvent");
+ m->set_spot (THIS->here_input());
+ $$ = m;
+ }
| script_abbreviation {
SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
Music *a = MY_MAKE_MUSIC("ArticulationEvent");
}
| NOTENAME_PITCH sup_quotes {
Pitch p = *unsmob_pitch ($1);
- p.octave_ += $2;
+ p = p.transposed (Pitch ($2,0,0));
$$ = p.smobbed_copy ();
}
| NOTENAME_PITCH sub_quotes {
Pitch p =* unsmob_pitch ($1);
-
- p.octave_ += -$2;
+ p = p.transposed (Pitch (-$2,0,0));
$$ = p.smobbed_copy ();
-
}
;
}
| TONICNAME_PITCH sup_quotes {
Pitch p = *unsmob_pitch ($1);
- p.octave_ += $2;
+ p = p.transposed (Pitch ($2,0,0));
$$ = p.smobbed_copy ();
}
| TONICNAME_PITCH sub_quotes {
Pitch p =* unsmob_pitch ($1);
- p.octave_ += -$2;
+ p = p.transposed (Pitch (-$2,0,0));
$$ = p.smobbed_copy ();
-
}
;
}
;
+pitch_also_in_chords:
+ pitch
+ | steno_tonic_pitch
+ ;
+
explicit_pitch:
PITCH embedded_scm {
$$ = $2;
t->set_spot (THIS->here_input ());
$$ = t;
}
- | string {
+ | full_markup {
Music *t = MY_MAKE_MUSIC("TextScriptEvent");
t->set_mus_property ("text", $1);
t->set_spot (THIS->here_input ());
+ $$ = t;
+ }
+ | string {
+ Music *t = MY_MAKE_MUSIC("TextScriptEvent");
+ t->set_mus_property ("text", make_simple_markup ($1));
+ t->set_spot (THIS->here_input ());
$$ = t;
+
}
| DIGIT {
Music * t = MY_MAKE_MUSIC("FingerEvent");
- SCM finger = ly_symbol2scm ("finger");
t->set_mus_property ("digit", gh_int2scm ($1));
t->set_spot (THIS->here_input ());
$$ = t;
chord_note:
bare_unsigned {
- Pitch m;
- m.notename_ = ($1 - 1) % 7;
- m.octave_ = $1 > 7 ? 1 : 0;
- m.alteration_ = 0;
+ Pitch m($1 > 7 ? 1 : 0, ($1 - 1) % 7, 0);
$$ = m.smobbed_copy ();
}
| bare_unsigned '+' {
- Pitch m;
- m.notename_ = ($1 - 1) % 7;
- m.octave_ = $1 > 7 ? 1 : 0;
- m.alteration_ = 1;
-
+ Pitch m( $1 > 7 ? 1 : 0,($1 - 1) % 7, 1);
$$ = m.smobbed_copy ();
}
| bare_unsigned CHORD_MINUS {
- Pitch m;
- m.notename_ = ($1 - 1) % 7;
- m.octave_ = $1 > 7 ? 1 : 0;
- m.alteration_ = -1;
+ Pitch m( $1 > 7 ? 1 : 0,($1 - 1) % 7, -1);
$$ = m.smobbed_copy ();
}
;
+
+full_markup:
+ MARKUP_IDENTIFIER {
+ $$ = $1;
+ }
+ | MARKUP
+ { THIS->lexer_->push_markup_state (); }
+ markup
+ { $$ = $3;
+ THIS->lexer_->pop_state ();
+ }
+ ;
+
+markup:
+ STRING {
+ $$ = make_simple_markup ($1);
+ }
+ | MARKUP_HEAD_MARKUP0 markup {
+ $$ = scm_list_n ($1, $2, SCM_UNDEFINED);
+ }
+ | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
+ $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED);
+ }
+ | MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup {
+ $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED);
+ }
+ | markup_line {
+ $$ = $1;
+ }
+ | MARKUP_HEAD_LIST0 markup_list {
+ $$ = scm_list_n ($1,$2, SCM_UNDEFINED);
+ }
+ | MARKUP_HEAD_SCM0 embedded_scm {
+ $$ = scm_list_n ($1, $2, SCM_UNDEFINED);
+ }
+ | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm markup {
+ $$ = scm_list_n ($1, $2, $3, $4, SCM_UNDEFINED);
+ }
+ | MARKUP_IDENTIFIER {
+ $$ = $1;
+ }
+
+ ;
+
+markup_list:
+ CHORD_OPEN markup_list_body CHORD_CLOSE { $$ = scm_reverse_x ($2, SCM_EOL); }
+ ;
+
+markup_line:
+ '{' markup_list_body '}' {
+ static SCM line ;
+ if (!line)
+ line = scm_c_eval_string ("line-markup");
+
+ $$ = scm_list_n (line, scm_reverse_x ($2, SCM_EOL), SCM_UNDEFINED);
+ }
+ ;
+
+markup_list_body:
+ /**/ { $$ = SCM_EOL; }
+ | markup_list_body markup {
+ $$ = gh_cons ($2, $1) ;
+ }
+ ;
+
+
%%
void
}
+
+bool
+markup_p (SCM x)
+{
+ return gh_pair_p (x)
+ && SCM_BOOL_F != scm_object_property (gh_car (x), ly_symbol2scm ("markup-signature"));
+}
/*
It is a little strange, to have this function in this file, but
otherwise, we have to import music classes into the lexer.
*destination = p->self_scm();
return MUSIC_OUTPUT_DEF_IDENTIFIER;
+ } else if (new_markup_p (sid)) {
+ *destination = sid;
+ return MARKUP_IDENTIFIER;
}
+
return -1;
}