%{ // -*-Fundamental-*-
/*
- parser.yy -- Bison/C++ parser for lilypond
+ parser.yy -- Bison/C++ parser for LilyPond
source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
- Two shift/reduce problems:
- -
- -
- */
-/*
+TODO:
-the rules for who is protecting what are very shady. TODO: uniformise
-this.
+* The rules for who is protecting what are very shady. Uniformise
+ this.
+* There are too many lexical modes?
*/
-#include <iostream.h>
#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+
-#include "translator-def.hh"
+#include "book.hh"
+#include "context-def.hh"
+#include "dimensions.hh"
+#include "event.hh"
+#include "file-path.hh"
+#include "input-smob.hh"
+#include "input.hh"
#include "lily-guile.hh"
-#include "change-iterator.hh"
+#include "lilypond-input-version.hh"
+#include "ly-module.hh"
+#include "main.hh"
+#include "midi-def.hh"
#include "misc.hh"
+#include "music-list.hh"
+#include "music-sequence.hh"
#include "my-lily-lexer.hh"
-#include "paper-def.hh"
-#include "midi-def.hh"
-#include "main.hh"
-#include "file-path.hh"
-#include "warn.hh"
-#include "dimensions.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
#include "my-lily-parser.hh"
-#include "context-specced-music.hh"
-#include "score.hh"
-#include "music-list.hh"
-#include "output-property-music-iterator.hh"
-#include "property-iterator.hh"
-#include "input-file-results.hh"
-#include "input.hh"
-#include "relative-music.hh"
-#include "lyric-combine-music.hh"
-#include "transposed-music.hh"
-#include "time-scaled-music.hh"
-#include "repeated-music.hh"
-#include "untransposable-music.hh"
-#include "lilypond-input-version.hh"
-#include "grace-music.hh"
-#include "part-combine-music.hh"
+#include "paper-book.hh"
+#include "paper-def.hh"
#include "scm-hash.hh"
-#include "auto-change-iterator.hh"
-#include "un-relativable-music.hh"
-#include "chord.hh"
-#include "ly-modules.hh"
+#include "scm-option.hh"
+#include "score.hh"
+#include "text-item.hh"
+#include "warn.hh"
+
+#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
+
+Music *property_op_to_music (SCM op);
+Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops_);
+SCM get_next_unique_context ();
+
+#define YYERROR_VERBOSE 1
+
+#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
+
+/* Add symbols to the TAGS field of a music object. */
+
+void
+tag_music (Music *m, SCM tag, Input ip)
+{
+ SCM tags = m->get_property ("tags");
+ if (ly_c_symbol_p (tag))
+ tags = scm_cons (tag, tags);
+ else if (ly_c_list_p (tag))
+ tags = ly_append2 (tag, tags);
+ else
+ ip.warning (_ ("Tag must be symbol or list of symbols."));
+
+ m->set_property ("tags", tags);
+}
bool
-regular_identifier_b (SCM id)
+is_regular_identifier (SCM id)
{
String str = ly_scm2string (id);
- char const *s = str.to_str0 () ;
+ char const *s = str.to_str0 ();
bool v = true;
+#if 0
+ isalpha (*s);
+ s++;
+#endif
while (*s && v)
{
- v = v && isalpha (*s);
+ v = v && isalnum (*s);
s++;
}
return v;
}
+SCM
+make_simple_markup (SCM encoding, SCM a)
+{
+ SCM simple = ly_scheme_function ("simple-markup");
+ if (ly_c_symbol_p (encoding))
+ return scm_list_3 (ly_scheme_function ("encoded-simple-markup"),
+ encoding, a);
+ return scm_list_2 (simple, a);
+}
bool
-is_duration_b (int t)
+is_duration (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 = ly_cdr (k))
- {
- p->internal_set_mus_property (ly_caar (k), ly_cdar (k));
- }
+ for (SCM k = a; ly_c_pair_p (k); k = ly_cdr (k))
+ p->internal_set_property (ly_caar (k), ly_cdar (k));
}
+SCM
+make_chord_step (int step, int alter)
+{
+ if (step == 7)
+ alter += FLAT;
+
+ while (step < 0)
+ step += 7;
+ Pitch m ((step -1) / 7, (step - 1) % 7, alter);
+ return m.smobbed_copy ();
+}
-SCM make_music_proc;
-Music*
-parser_make_music (SCM sym)
+SCM
+make_chord (SCM pitch, SCM dur, SCM modification_list)
{
- if (!make_music_proc)
- make_music_proc = scm_primitive_eval (ly_symbol2scm ("make-music-by-name"));
-
- SCM rv = scm_call_1 (make_music_proc, sym);
-
- /*
- UGH.
- */
- scm_gc_protect_object (rv);
- return unsmob_music (rv);
+ SCM chord_ctor = ly_scheme_function ("construct-chord");
+ SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list);
+ scm_gc_protect_object (ch);
+ return ch;
}
-#define MY_MAKE_MUSIC(x) parser_make_music (ly_symbol2scm (x))
+/* Todo: actually also use apply iso. call too ... */
+bool
+ly_input_procedure_p (SCM x)
+{
+ return ly_c_procedure_p (x)
+ || (ly_c_pair_p (x) && ly_c_procedure_p (ly_car (x)));
+}
-Music*
+Music*
set_property_music (SCM sym, SCM value)
{
- Music * p = MY_MAKE_MUSIC("PropertySet");
- p->set_mus_property ("symbol", sym);
- p->set_mus_property ("value", value);
+ Music *p = MY_MAKE_MUSIC ("PropertySet");
+ p->set_property ("symbol", sym);
+ p->set_property ("value", value);
return p;
}
+Music*
+make_music_relative (Pitch start, Music *music)
+{
+ Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic");
+ relative->set_property ("element", music->self_scm ());
+
+ Pitch last = music->to_relative_octave (start);
+ if (lily_1_8_relative)
+ music->set_property ("last-pitch", last.smobbed_copy ());
+ return relative;
+}
-// needed for bison.simple's malloc () and free ()
-
-// #include <malloc.h>
-#include <stdlib.h>
-
-
-
-#define YYERROR_VERBOSE 1
-
-#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
+Music*
+make_lyric_combine_music (SCM name, Music *music)
+{
+ Music *combine = MY_MAKE_MUSIC ("NewLyricCombineMusic");
+ combine->set_property ("element", music->self_scm ());
+ combine->set_property ("associated-context", name);
+ return combine;
+}
%}
deleting them. Let's hope that a stack overflow doesnt trigger a move
of the parse stack onto the heap. */
+%left NEWLYRICS
%union {
-
- Link_array<Music> *reqvec;
-
- String *string; // needed by the lexer as temporary scratch area.
- Music *music;
- Score *score;
- Scheme_hash_table *scmhash;
- Music_output_def * outputdef;
- SCM scm;
- Tempo_req *tempo;
- int i;
+ Book *book;
+ Music_output_def *outputdef;
+ SCM scm;
+ String *string;
+ Music *music;
+ Score *score;
+ int i;
}
%{
int
-yylex (YYSTYPE *s, void * v)
+yylex (YYSTYPE *s, void *v)
{
- My_lily_parser *pars = (My_lily_parser*) v;
- My_lily_lexer * lex = pars->lexer_;
+ My_lily_parser *pars = (My_lily_parser*) v;
+ My_lily_lexer *lex = pars->lexer_;
lex->lexval = (void*) s;
+ lex->prepare_for_next_token ();
return lex->yylex ();
}
%}
+%expect 3
+
+/*
+ Three shift/reduce problems:
+
+2. \markup identifier.
+
+3. \markup { }
+
+4. \repeat
+ \repeat .. \alternative
+
+
+ \repeat { \repeat .. \alternative }
+
+or
+
+ \repeat { \repeat } \alternative
+
+)
+ */
+
+
%pure_parser
-/* tokens which are not keywords */
-%token AUTOCHANGE
-%token ALIAS
-%token APPLY
-%token ARPEGGIO
-%token DYNAMICSCRIPT
%token ACCEPTS
+%token ADDLYRICS
+%token ADDQUOTE
+%token LYRICSTO
+%token ALIAS
%token ALTERNATIVE
+%token APPLYCONTEXT
+%token APPLYOUTPUT
+%token AUTOCHANGE
%token BAR
+%token BOOK
%token BREATHE
+%token CHANGE
%token CHORDMODIFIERS
%token CHORDS
-%token CHAR_T
+%token DOUBLE_ANGLE_OPEN
+%token DOUBLE_ANGLE_CLOSE
%token CLEF
-%token CM_T
+%token COMMANDSPANREQUEST
%token CONSISTS
-%token DURATION
-%token SEQUENTIAL
-%token GROBDESCRIPTIONS
-%token SIMULTANEOUS
%token CONSISTSEND
+%token CONTEXT
+%token DEFAULT
%token DENIES
-%token DURATION
+%token DESCRIPTION
%token EXTENDER
%token FIGURES FIGURE_OPEN FIGURE_CLOSE
%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
-%token GLISSANDO
-%token GRACE
+%token GRACE
+%token ACCIACCATURA
+%token APPOGGIATURA
+%token GROBDESCRIPTIONS
%token HEADER
%token HYPHEN
-%token IN_T
%token INVALID
%token KEY
%token LYRICS
+%token LYRICS_STRING
%token MARK
-%token MULTI_MEASURE_REST
%token MIDI
-%token MM_T
-%token PITCH
-%token DEFAULT
+%token MULTI_MEASURE_REST
%token NAME
-%token PITCHNAMES
+%token NEWCONTEXT
%token NOTES
+%token OCTAVE
%token ONCE
+%token OVERRIDE SET REVERT
%token PAPER
+%token PARTCOMBINE
%token PARTIAL
-%token PENALTY
-%token PROPERTY
-%token OVERRIDE SET REVERT
-%token PT_T
+%token QUOTE
%token RELATIVE
%token REMOVE
%token REPEAT
-%token ADDLYRICS
-%token PARTCOMBINE
+%token REST
%token SCM_T
%token SCORE
-%token SCRIPT
+%token SEQUENTIAL
+%token NEWLYRICS
+%token SIMULTANEOUS
%token SKIP
%token SPANREQUEST
-%token STYLESHEET
-%token COMMANDSPANREQUEST
+%token TAG
%token TEMPO
-%token OUTPUTPROPERTY
-%token TIME_T
%token TIMES
-%token TRANSLATOR
+%token TIME_T
%token TRANSPOSE
+%token TRANSPOSITION
%token TYPE
%token UNSET
-%token CONTEXT
-%token REST
+%token WITH
/* escaped */
+/* FIXME: this sucks. The user will get to see these names:
+ syntax error, unexpected E_CHAR:
+ \
+ %%
+ */
%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 CHORD_SLASH
%token FIGURE_SPACE
-%type <i> exclamations questions dots optional_rest
-%type <i> bass_number bass_mod
-%type <scm> br_bass_figure bass_figure figure_list figure_spec
%token <i> DIGIT
%token <scm> NOTENAME_PITCH
%token <scm> TONICNAME_PITCH
%token <scm> DURATION_IDENTIFIER
%token <scm> FRACTION
%token <id> IDENTIFIER
-
-
+%token DRUMS
+%token <scm> DRUM_PITCH
+%token <scm> CHORD_MODIFIER
%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> EVENT_IDENTIFIER
+%token <scm> MUSIC_IDENTIFIER CONTEXT_DEF_IDENTIFIER
+%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
%token <scm> RESTNAME
-%token <scm> STRING
+%token <scm> STRING
%token <scm> SCM_T
%token <i> UNSIGNED
%token <scm> REAL
+%token MARKUP
+%token <scm> MARKUP_HEAD_MARKUP0
+%token <scm> MARKUP_HEAD_EMPTY
+%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_SCM2
+%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
+
+%token <scm> MUSIC_FUNCTION_SCM
+%token <scm> MUSIC_FUNCTION_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_MUSIC
+%token <scm> MUSIC_FUNCTION_MUSIC_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC
+
+%token <scm> MARKUP_IDENTIFIER MARKUP_HEAD_LIST0
+%type <scm> markup markup_line markup_list markup_list_body full_markup
+
+%type <book> book_block book_body
+%type <i> exclamations questions dots optional_rest
+%type <i> bass_mod
+%type <scm> grace_head
+%type <scm> oct_check
+%type <scm> context_mod_list
+%type <scm> lyric_element
+%type <scm> bass_number br_bass_figure bass_figure figure_list figure_spec
+%type <scm> new_lyrics
%type <outputdef> output_def
-%type <scm> lilypond_header lilypond_header_body
-%type <music> open_request_parens close_request_parens open_request close_request
-%type <music> request_with_dir request_that_take_dir verbose_request
+%type <scm> lilypond_header lilypond_header_body
+%type <music> open_event close_event
%type <i> sub_quotes sup_quotes
-%type <music> simple_element request_chord command_element Simple_music Composite_music
+%type <music> toplevel_music
+%type <music> simple_element event_chord command_element
+%type <music> Composite_music Simple_music Prefix_composite_music Generic_prefix_music
+%type <scm> Generic_prefix_music_scm
+%type <music> Grouped_music_list
%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> identifier_init
+%type <scm> simple_string
-%type <scm> steno_duration optional_notemode_duration multiplied_duration
-%type <scm> verbose_duration
+%type <music> note_chord_element chord_body chord_body_element
+%type <scm> chord_body_elements
+%type <scm> steno_duration optional_notemode_duration multiplied_duration
-%type <reqvec> pre_requests post_requests
-%type <music> gen_text_def
-%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> post_events
+%type <music> gen_text_def direction_less_event direction_reqd_event
+%type <scm> steno_pitch pitch absolute_pitch pitch_also_in_chords
+%type <scm> steno_tonic_pitch
%type <scm> duration_length fraction
-%type <scm> embedded_scm scalar
-%type <music> Music Sequential_music Simultaneous_music
-%type <music> relative_music re_rhythmed_music part_combined_music
-%type <music> property_def translator_change simple_property_def
-%type <scm> Music_list
-%type <outputdef> music_output_def_body
-%type <music> shorthand_command_req
-%type <music> post_request
-%type <music> command_req verbose_command_req
-%type <music> extender_req
-%type <music> hyphen_req
-%type <music> string_request
-%type <scm> string bare_number number_expression number_term number_factor
-
+%type <scm> chord_item chord_items chord_separator new_chord
+%type <scm> step_number step_numbers
+
+%type <scm> embedded_scm scalar
+%type <music> Music Sequential_music Simultaneous_music
+%type <music> relative_music re_rhythmed_music
+%type <music> music_property_def context_change
+%type <scm> context_prop_spec
+%type <scm> Music_list
+%type <scm> property_operation
+%type <scm> context_mod context_def_mod optional_context_mod
+%type <outputdef> music_output_def_body music_output_def_head
+%type <music> post_event tagged_post_event
+%type <music> command_req
+%type <music> string_number_event
+%type <scm> string bare_number number_expression number_term number_factor
%type <score> score_block score_body
-%type <scm> translator_spec_block translator_spec_body
-%type <tempo> tempo_request
-%type <scm> notenames_body notenames_block chordmodifiers_block
+%type <scm> context_def_spec_block context_def_spec_body
+%type <music> tempo_event
%type <scm> script_abbreviation
%%
lilypond: /* empty */
- | lilypond toplevel_expression {}
- | lilypond assignment { }
+ | lilypond toplevel_expression {
+ }
+ | lilypond assignment {
+ }
| lilypond error {
- THIS->error_level_ = 1;
+ THIS->error_level_ = 1;
}
| lilypond INVALID {
- THIS->error_level_ = 1;
+ THIS->error_level_ = 1;
}
;
toplevel_expression:
- notenames_block {
- THIS->lexer_->pitchname_tab_ = $1;
+ lilypond_header {
+ THIS->header_ = $1;
}
- | chordmodifiers_block {
- THIS->lexer_->chordmodifier_tab_ = $1;
+ | add_quote {
+
}
- | lilypond_header {
- THIS->input_file_->header_ = $1;
+ | book_block {
+ Book *book = $1;
+ SCM proc = THIS->lexer_->lookup_identifier ("toplevel-book-handler");
+ scm_call_2 (proc, THIS->self_scm (), book->self_scm ());
+ scm_gc_unprotect_object (book->self_scm ());
}
| score_block {
- THIS->input_file_->scores_.push ($1);
+ Score *score = $1;
+
+ SCM proc = THIS->lexer_->lookup_identifier ("toplevel-score-handler");
+ scm_call_2 (proc, THIS->self_scm (), score->self_scm ());
+ scm_gc_unprotect_object (score->self_scm ());
+ }
+ | toplevel_music {
+ Music *music = $1;
+ SCM proc = THIS->lexer_->lookup_identifier ("toplevel-music-handler");
+ scm_call_2 (proc, THIS->self_scm (), music->self_scm ());
+ scm_gc_unprotect_object (music->self_scm ());
}
| output_def {
+ SCM id = SCM_EOL;
if (dynamic_cast<Paper_def*> ($1))
- THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultpaper"), $1->self_scm ());
+ id = scm_makfrom0str ("$defaultpaper");
else if (dynamic_cast<Midi_def*> ($1))
- THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultmidi"), $1->self_scm ());
+ id = scm_makfrom0str ("$defaultmidi");
+ THIS->lexer_->set_identifier (id, $1->self_scm ());
+ scm_gc_unprotect_object ($1->self_scm ());
}
- | embedded_scm {
- // junk value
- }
- ;
-
-embedded_scm:
- SCM_T
- | SCM_IDENTIFIER
;
-
-chordmodifiers_block:
- CHORDMODIFIERS notenames_body { $$ = $2; }
+toplevel_music:
+ Composite_music {
+ }
;
-notenames_block:
- PITCHNAMES notenames_body { $$ = $2; }
+embedded_scm:
+ SCM_T
+ | SCM_IDENTIFIER
;
-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 = ly_cdr (s)) {
- SCM pt = ly_cdar (s);
- if (!unsmob_pitch (pt))
- THIS->parser_error ("Need pitch object.");
- else
- scm_hashq_set_x (tab, ly_caar (s), pt);
- }
-
- $$ = tab;
- }
- ;
lilypond_header_body:
{
- $$ = ly_make_anonymous_module ();
+ $$ = ly_make_anonymous_module ();
THIS->lexer_->add_scope ($$);
}
- | lilypond_header_body assignment {
+ | lilypond_header_body assignment {
}
;
lilypond_header:
HEADER '{' lilypond_header_body '}' {
- $$ = THIS->lexer_-> remove_scope();
+ $$ = THIS->lexer_->remove_scope ();
}
;
*/
Input ip = THIS->pop_spot ();
- if (! regular_identifier_b ($1))
+ if (! is_regular_identifier ($1))
{
ip.warning (_ ("Identifier should have alphabetic characters only"));
}
*/
}
+ | embedded_scm { }
;
-
identifier_init:
score_block {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
+ | full_markup {
+ $$ = $1;
+ }
| output_def {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | translator_spec_block {
+ | context_def_spec_block {
$$ = $1;
}
| Music {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | post_request {
+ | post_event {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | verbose_duration {
- $$ = $1;
- }
| number_expression {
$$ = $1;
}
}
;
-translator_spec_block:
- TRANSLATOR '{' translator_spec_body '}'
+context_def_spec_block:
+ CONTEXT '{' context_def_spec_body '}'
{
$$ = $3;
}
;
-translator_spec_body:
- TRANSLATOR_IDENTIFIER {
- $$ = unsmob_translator_def ($1)->clone_scm ();
- unsmob_translator_def ($$)-> set_spot (THIS->here_input ());
- }
- | TYPE STRING {
- $$ = Translator_def::make_scm ();
- Translator_def*td = unsmob_translator_def ($$);
- td->translator_group_type_ = $2;
- td->set_spot (THIS->here_input ());
- }
- | translator_spec_body STRING '=' embedded_scm {
- unsmob_translator_def ($$)->add_property_assign ($2, $4);
+context_def_spec_body:
+ /**/ {
+ $$ = Context_def::make_scm ();
+ unsmob_context_def ($$)->set_spot (THIS->here_input ());
}
- | 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 SET embedded_scm '=' embedded_scm {
- unsmob_translator_def ($$)
- ->add_push_property (scm_string_to_symbol ($2), $4, $6);
- }
- | translator_spec_body STRING REVERT embedded_scm {
- unsmob_translator_def ($$)->add_pop_property (
- scm_string_to_symbol ($2), $4);
- }
- | translator_spec_body NAME STRING {
- unsmob_translator_def ($$)->type_name_ = $3;
+ | CONTEXT_DEF_IDENTIFIER {
+ $$ = $1;
+ unsmob_context_def ($$)->set_spot (THIS->here_input ());
}
- | translator_spec_body CONSISTS STRING {
- unsmob_translator_def ($$)->add_element ($3);
+ | context_def_spec_body GROBDESCRIPTIONS embedded_scm {
+ Context_def*td = unsmob_context_def ($$);
+
+ for (SCM p = $3; ly_c_pair_p (p); p = ly_cdr (p)) {
+ SCM tag = ly_caar (p);
+
+ /* TODO: should make new tag "grob-definition" ? */
+ td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"),
+ tag, scm_cons (ly_cdar (p), SCM_EOL)));
+ }
}
- | translator_spec_body ALIAS STRING {
- Translator_def*td = unsmob_translator_def ($$);
- td->type_aliases_ = scm_cons ($3, td->type_aliases_);
+ | context_def_spec_body context_mod {
+ unsmob_context_def ($$)->add_context_mod ($2);
}
- | 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));
+ ;
+
+book_block:
+ BOOK {
+ THIS->push_spot ();
}
- | translator_spec_body CONSISTSEND STRING {
- unsmob_translator_def ($$)->add_last_element ( $3);
+ /*cont*/ '{' book_body '}' {
+ THIS->pop_spot ();
+ $$ = $4;
}
- | translator_spec_body ACCEPTS STRING {
- unsmob_translator_def ($$)->set_acceptor ($3,true);
+ ;
+
+book_body:
+ {
+ $$ = new Book;
+ $$->set_spot (THIS->here_input ());
}
- | translator_spec_body DENIES STRING {
- unsmob_translator_def ($$)->set_acceptor ($3,false);
+ | book_body score_block {
+ $$->scores_.push ($2);
+ scm_gc_unprotect_object ($2->self_scm ());
}
- | translator_spec_body REMOVE STRING {
- unsmob_translator_def ($$)->remove_element ($3);
+ | book_body error {
}
;
-/*
- SCORE
-*/
score_block:
- SCORE {
+ SCORE {
THIS->push_spot ();
}
/*cont*/ '{' score_body '}' {
THIS->pop_spot ();
$$ = $4;
- if (!$$->defs_.size ())
- {
- Music_output_def *id =
- unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"));
- $$->add_output (id ? id->clone () : new Paper_def );
- }
}
;
/*
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);
+ SCM check_funcs = ly_scheme_function ("toplevel-music-functions");
+ for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs))
+ m = scm_call_1 (ly_car (check_funcs), m);
$$->music_ = m;
}
| SCORE_IDENTIFIER {
- $$ = new Score (*unsmob_score ($1));
+ $$ = new Score ( *unsmob_score ($1));
$$->set_spot (THIS->here_input ());
}
| score_body lilypond_header {
$$->header_ = $2;
}
| score_body output_def {
- $$->add_output ($2);
+ $$->defs_.push ($2);
+ scm_gc_unprotect_object ($2->self_scm ());
}
| score_body error {
output_def:
music_output_def_body '}' {
$$ = $1;
- THIS-> lexer_-> remove_scope ();
+ THIS->lexer_->remove_scope ();
+ THIS->lexer_->pop_state ();
}
;
-music_output_def_body:
- MIDI '{' {
+music_output_def_head:
+ MIDI {
Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi"));
- Midi_def* p =0;
+ Midi_def *p = 0;
if (id)
p = dynamic_cast<Midi_def*> (id->clone ());
else
$$ = p;
THIS->lexer_->add_scope (p->scope_);
}
- | PAPER '{' {
+ | PAPER {
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_->add_scope (p->scope_);
- $$ = p;
- }
- | PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
- Music_output_def *p = unsmob_music_output_def ($3);
- p = p->clone ();
+
THIS->lexer_->add_scope (p->scope_);
$$ = p;
}
- | MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
- Music_output_def *p = unsmob_music_output_def ($3);
- p = p->clone ();
+ ;
- THIS->lexer_->add_scope (p->scope_);
- $$ = p;
+
+music_output_def_body:
+ music_output_def_head '{' {
+ $$ = $1;
+ $$->input_origin_. set_spot (THIS->here_input ());
+ THIS->lexer_->push_initial_state ();
+ }
+ | music_output_def_head '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
+ scm_gc_unprotect_object ($1->self_scm ());
+ Music_output_def *o = unsmob_music_output_def ($3);
+ o->input_origin_.set_spot (THIS->here_input ());
+ $$ = o;
+ THIS->lexer_->remove_scope ();
+ THIS->lexer_->add_scope (o->scope_);
+ THIS->lexer_->push_initial_state ();
}
| music_output_def_body assignment {
}
- | music_output_def_body translator_spec_block {
- $$->assign_translator ($2);
+ | music_output_def_body context_def_spec_block {
+ $$->assign_context_def ($2);
}
- | music_output_def_body STYLESHEET embedded_scm {
- dynamic_cast<Paper_def*> ($$)-> style_sheet_ = $3;
- }
- | music_output_def_body tempo_request {
+ | music_output_def_body tempo_event {
/*
junk this ? there already is tempo stuff in
music.
*/
- int m = gh_scm2int ( $2->get_mus_property ("metronome-count"));
- Duration *d = unsmob_duration ($2->get_mus_property ("duration"));
- Midi_def * md = dynamic_cast<Midi_def*> ($$);
+ int m = ly_scm2int ( $2->get_property ("metronome-count"));
+ Duration *d = unsmob_duration ($2->get_property ("tempo-unit"));
+ Midi_def *md = dynamic_cast<Midi_def*> ($$);
if (md)
- md->set_tempo (d->length_mom (), m);
+ md->set_tempo (d->get_length (), m);
+ scm_gc_unprotect_object ($2->self_scm ());
}
| music_output_def_body error {
}
;
-tempo_request:
+tempo_event:
TEMPO steno_duration '=' bare_unsigned {
- $$ = MY_MAKE_MUSIC("TempoEvent");
- $$->set_mus_property ("duration", $2);
- $$->set_mus_property ("metronome-count", gh_int2scm ( $4));
+ $$ = MY_MAKE_MUSIC ("MetronomeChangeEvent");
+ $$->set_property ("tempo-unit", $2);
+ $$->set_property ("metronome-count", scm_int2num ( $4));
}
;
to have efficient append.
*/
-Music_list: /* empty */ {
+Music_list:
+ /* empty */ {
$$ = scm_cons (SCM_EOL, SCM_EOL);
}
| Music_list Music {
SCM s = $$;
- SCM c = scm_cons ($2->self_scm (), SCM_EOL);
+ SCM c = scm_cons ($2->self_scm (), SCM_EOL);
scm_gc_unprotect_object ($2->self_scm ()); /* UGH */
- if (gh_pair_p (ly_cdr (s)))
- gh_set_cdr_x (ly_cdr (s), c); /* append */
+ if (ly_c_pair_p (ly_cdr (s)))
+ scm_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 */
+ scm_set_car_x (s, c); /* set first cons */
+ scm_set_cdr_x (s, c); /* remember last cell */
+ }
+ | Music_list embedded_scm {
}
| Music_list error {
}
}
;
+
Repeated_music:
- REPEAT string bare_unsigned Music Alternative_music
+ REPEAT simple_string bare_unsigned Music Alternative_music
{
Music *beg = $4;
int times = $3;
- SCM alts = gh_pair_p ($5) ? gh_car ($5) : SCM_EOL;
+ SCM alts = ly_c_pair_p ($5) ? ly_car ($5) : SCM_EOL;
if (times < scm_ilength (alts)) {
- unsmob_music (gh_car (alts))
+ unsmob_music (ly_car (alts))
->origin ()->warning (
- _("More alternatives than repeats. Junking excess alternatives."));
+ _ ("More alternatives than repeats. Junking excess alternatives."));
alts = ly_truncate_list (times, alts);
}
-
- Music *r = MY_MAKE_MUSIC("RepeatedMusic");
+
+
+ SCM proc = ly_scheme_function ("make-repeated-music");
+
+ SCM mus = scm_call_1 (proc, $2);
+ scm_gc_protect_object (mus); // UGH.
+ Music *r = unsmob_music (mus);
if (beg)
{
- r-> set_mus_property ("element", beg->self_scm ());
+ r-> set_property ("element", beg->self_scm ());
scm_gc_unprotect_object (beg->self_scm ());
}
- r->set_mus_property ("repeat-count", gh_int2scm (times >? 1));
-
- r-> set_mus_property ("elements",alts);
- SCM func = scm_primitive_eval (ly_symbol2scm ("repeat-name-to-ctor"));
- SCM result = gh_call1 (func, $2);
+ r->set_property ("repeat-count", scm_int2num (times >? 1));
+
+ r-> set_property ("elements",alts);
+ if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) {
+ /*
+ TODO: move this code to Scheme.
+ */
+
+ /*
+ we can not get durations and other stuff correct down the line, so we have to
+ add to the duration log here.
+ */
+ SCM func = ly_scheme_function ("shift-duration-log");
+
+ int dots = ($3 % 3) ? 0 : 1;
+ int shift = -intlog2 ((dots) ? ($3*2/3) : $3);
+
+ Sequential_music *seq = dynamic_cast<Sequential_music*> ($4);
+
+ if (seq) {
+ int list_len = scm_ilength (seq->music_list ());
+ if (list_len != 2)
+ seq->origin ()->warning ("Chord tremolo must have 2 elements.");
+ shift -= 1;
+ r->compress (Moment (Rational (1, list_len)));
+ }
+ scm_call_3 (func, r->self_scm (), scm_int2num (shift),scm_int2num (dots));
- if (gh_equal_p ($2, scm_makfrom0str ("tremolo")))
- {
- /*
- we can not get durations and other stuff correct down the line, so we have to
- add to the duration log here.
- */
- SCM func = scm_primitive_eval (ly_symbol2scm ("shift-duration-log"));
- if (($3 % 3) == 0)
- gh_call3 (func, r->self_scm (), gh_int2scm(-intlog2 ($3*2/3)),gh_int2scm(1));
- else
- gh_call3 (func, r->self_scm (), gh_int2scm(-intlog2 ($3)), gh_int2scm(0));
}
-
- set_music_properties (r, result);
-
r->set_spot (*$4->origin ());
$$ = r;
Sequential_music:
SEQUENTIAL '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC("SequentialMusic");
- $$->set_mus_property ("elements", ly_car ($3));
- $$->set_spot(THIS->here_input());
+ $$ = MY_MAKE_MUSIC ("SequentialMusic");
+ $$->set_property ("elements", ly_car ($3));
+ $$->set_spot (THIS->here_input ());
}
| '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC("SequentialMusic");
- $$->set_mus_property ("elements", ly_car ($2));
- $$->set_spot(THIS->here_input());
+ $$ = MY_MAKE_MUSIC ("SequentialMusic");
+ $$->set_property ("elements", ly_car ($2));
+ $$->set_spot (THIS->here_input ());
}
;
Simultaneous_music:
SIMULTANEOUS '{' Music_list '}'{
- $$ = MY_MAKE_MUSIC("SimultaneousMusic");
- $$->set_mus_property ("elements", ly_car ($3));
- $$->set_spot(THIS->here_input());
+ $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
+ $$->set_property ("elements", ly_car ($3));
+ $$->set_spot (THIS->here_input ());
}
- | '<' Music_list '>' {
- $$ = MY_MAKE_MUSIC("SimultaneousMusic");
- $$->set_mus_property ("elements", ly_car ($2));
- $$->set_spot(THIS->here_input());
+ | simul_open Music_list simul_close {
+ $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
+ $$->set_property ("elements", ly_car ($2));
+ $$->set_spot (THIS->here_input ());
}
;
Simple_music:
- request_chord { $$ = $1; }
- | OUTPUTPROPERTY embedded_scm embedded_scm '=' embedded_scm {
- SCM pred = $2;
- if (!gh_symbol_p ($3))
- {
- THIS->parser_error (_ ("Second argument must be a symbol"));
- }
- /* Should check # args */
- if (!gh_procedure_p (pred))
- {
- THIS->parser_error (_ ("First argument must be a procedure taking one argument"));
- }
+ event_chord { $$ = $1; }
+ | APPLYOUTPUT embedded_scm {
+ if (!ly_input_procedure_p ($2))
+ THIS->parser_error (_ ("\\applycontext takes function argument"));
+ $$ = MY_MAKE_MUSIC ("ApplyOutputEvent");
+ $$->set_property ("procedure", $2);
+ $$->set_spot (THIS->here_input ());
+ }
+ | APPLYCONTEXT embedded_scm {
+ if (!ly_input_procedure_p ($2))
+ THIS->parser_error (_ ("\\applycontext takes function argument"));
+ $$ = MY_MAKE_MUSIC ("ApplyContext");
+ $$->set_property ("procedure", $2);
+ $$->set_spot (THIS->here_input ());
+ }
+ | MUSIC_IDENTIFIER {
+ $$ = unsmob_music ($1);
+ }
+ | music_property_def
+ | context_change
+ ;
- Music*m = MY_MAKE_MUSIC("OutputPropertySetMusic");
- m->set_mus_property ("predicate", pred);
- m->set_mus_property ("grob-property", $3);
- m->set_mus_property ("grob-value", $5);
- $$ = m;
+optional_context_mod:
+ /**/ { $$ = SCM_EOL; }
+ | WITH { THIS->lexer_->push_initial_state (); }
+ '{' context_mod_list '}'
+ {
+ THIS->lexer_->pop_state ();
+ $$ = $4;
}
- | MUSIC_IDENTIFIER {
- $$ = unsmob_music ($1)->clone ();
+ ;
+
+grace_head:
+ GRACE { $$ = scm_makfrom0str ("Grace"); }
+ | ACCIACCATURA { $$ = scm_makfrom0str ("Acciaccatura"); }
+ | APPOGGIATURA { $$ = scm_makfrom0str ("Appoggiatura"); }
+ ;
- $$->set_spot (THIS->here_input());
+context_mod_list:
+ /* */ { $$ = SCM_EOL; }
+ | context_mod_list context_mod {
+ $$ = scm_cons ($2, $1);
}
- | property_def
- | translator_change
;
Composite_music:
- CONTEXT STRING Music {
- Music*csm =TYPED_MAKE_MUSIC("ContextSpeccedMusic");
+ Prefix_composite_music { $$ = $1; }
+ | Grouped_music_list { $$ = $1; }
+ ;
- csm->set_mus_property ("element", $3->self_scm ());
+Grouped_music_list:
+ Simultaneous_music { $$ = $1; }
+ | Sequential_music { $$ = $1; }
+ ;
+
+Generic_prefix_music_scm:
+ MUSIC_FUNCTION_SCM {
+ THIS->push_spot ();
+ } embedded_scm {
+ $$ = scm_list_3 ($1, make_input (THIS->pop_spot ()), $3);
+ }
+ | MUSIC_FUNCTION_MUSIC {
+ THIS->push_spot ();
+ } Music {
+ $$ = scm_list_3 ($1, make_input (THIS->pop_spot ()), $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
+ }
+ | MUSIC_FUNCTION_SCM_MUSIC {
+ THIS->push_spot ();
+ } embedded_scm Music {
+ $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4->self_scm ());
+ scm_gc_unprotect_object ($4->self_scm ());
+ }
+ | MUSIC_FUNCTION_MUSIC_MUSIC {
+ THIS->push_spot ();
+ } Music Music {
+ $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3->self_scm (), $4->self_scm ());
scm_gc_unprotect_object ($3->self_scm ());
+ scm_gc_unprotect_object ($4->self_scm ());
+ }
+ | MUSIC_FUNCTION_SCM_MUSIC_MUSIC {
+ THIS->push_spot ();
+ } embedded_scm Music Music {
+ $$ = scm_list_5 ($1, make_input (THIS->pop_spot ()),
+ $3, $4->self_scm (), $5->self_scm ());
+ scm_gc_unprotect_object ($5->self_scm ());
+ scm_gc_unprotect_object ($4->self_scm ());
+ }
+ ;
+
+Generic_prefix_music:
+ Generic_prefix_music_scm {
+ SCM func = ly_car ($1);
+ Input *loc = unsmob_input (ly_cadr ($1));
+ SCM args = ly_cddr ($1);
+ SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
+ int k = 0;
+ bool ok = true;
+ for (SCM s = sig, t = args;
+ ok && ly_c_pair_p (s) && ly_c_pair_p (t);
+ s = ly_cdr (s), t = ly_cdr (t)) {
+ k++;
+ if (scm_call_1 (ly_car (s), ly_car (t)) != SCM_BOOL_T)
+ {
+ loc->error (_f ("Argument %d failed typecheck", k));
+ THIS->error_level_ = 1;
+ ok = false;
+ }
+ }
+ SCM m = SCM_EOL;
+ if (ok)
+ m = scm_apply_0 (func, ly_cdr ($1));
+ if (unsmob_music (m))
+ {
+ $$ = unsmob_music (m);
+ scm_gc_protect_object (m);
+ }
+ else
+ {
+ if (ok)
+ loc->error (_ ("Music head function should return Music object."));
+ $$ = MY_MAKE_MUSIC ("Music");
+ }
+ $$->set_spot (*loc);
+ }
+ ;
- csm->set_mus_property ("context-type",$2);
- csm->set_mus_property ("context-id", scm_makfrom0str (""));
- $$ = csm;
+Prefix_composite_music:
+ Generic_prefix_music {
+ $$ = $1;
+ }
+ |AUTOCHANGE Music {
+ SCM proc = ly_scheme_function ("make-autochange-music");
+
+ SCM res = scm_call_1 (proc, $2->self_scm ());
+ scm_gc_unprotect_object ($2->self_scm ());
+ $$ = unsmob_music (res);
+ scm_gc_protect_object (res);
+ $$->set_spot (THIS->here_input ());
}
- | AUTOCHANGE STRING Music {
- Music*chm = MY_MAKE_MUSIC("AutoChangeMusic");
- chm->set_mus_property ("element", $3->self_scm ());
+ | PARTCOMBINE Music Music {
+ SCM proc = ly_scheme_function ("make-part-combine-music");
+ SCM res = scm_call_1 (proc, scm_listify ($2->self_scm (),
+ $3->self_scm (), SCM_UNDEFINED));
scm_gc_unprotect_object ($3->self_scm ());
- chm->set_mus_property ("what", $2);
-
- $$ = chm;
- chm->set_spot (*$3->origin ());
+ scm_gc_unprotect_object ($2->self_scm ());
+ $$ = unsmob_music (res);
+ scm_gc_protect_object (res);
+ $$->set_spot (THIS->here_input ());
}
- | GRACE Music {
+ | grace_head Music {
#if 1
/*
The other version is for easier debugging of
Sequential_music_iterator in combination with grace notes.
*/
- SCM start = THIS->lexer_->lookup_identifier ("startGraceMusic");
- SCM stop = THIS->lexer_->lookup_identifier ("stopGraceMusic");
+/*
+
+TODO: should distinguish between both grace types in the
+basic music objects too, since the meaning is different.
+
+*/
+
+ String start_str = "start" + ly_scm2string ($1) + "Music";
+ String stop_str = "stop" + ly_scm2string ($1) + "Music";
+
+ SCM start = THIS->lexer_->lookup_identifier (start_str);
+ SCM stop = THIS->lexer_->lookup_identifier (stop_str);
+
Music *startm = unsmob_music (start);
Music *stopm = unsmob_music (stop);
scm_gc_unprotect_object (stopm->self_scm ());
}
ms = scm_cons ($2->self_scm (), ms);
- scm_gc_unprotect_object ($2->self_scm());
+ scm_gc_unprotect_object ($2->self_scm ());
if (startm) {
startm = startm->clone ();
- ms = scm_cons (startm->self_scm () , ms);
+ ms = scm_cons (startm->self_scm (), ms);
scm_gc_unprotect_object (startm->self_scm ());
}
-
- Music* seq = MY_MAKE_MUSIC("SequentialMusic");
- seq->set_mus_property ("elements", ms);
+ Music* seq = MY_MAKE_MUSIC ("SequentialMusic");
+ seq->set_property ("elements", ms);
- $$ = MY_MAKE_MUSIC("GraceMusic");
- $$->set_mus_property ("element", seq->self_scm ());
+ $$ = MY_MAKE_MUSIC ("GraceMusic");
+ $$->set_property ("element", seq->self_scm ());
scm_gc_unprotect_object (seq->self_scm ());
#else
- $$ = MY_MAKE_MUSIC("GraceMusic");
- $$->set_mus_property ("element", $2->self_scm ());
+ $$ = MY_MAKE_MUSIC ("GraceMusic");
+ $$->set_property ("element", $2->self_scm ());
scm_gc_unprotect_object ($2->self_scm ());
#endif
}
- | CONTEXT string '=' string Music {
- Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
-
- 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);
+ | CONTEXT simple_string '=' simple_string optional_context_mod Music {
+ $$ = context_spec_music ($2, $4, $6, $5);
- $$ = csm;
}
+ | CONTEXT simple_string optional_context_mod Music {
+ $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
+ }
+ | NEWCONTEXT simple_string optional_context_mod Music {
+ $$ = context_spec_music ($2, get_next_unique_context (), $4,
+ $3);
+ }
+
| TIMES {
THIS->push_spot ();
}
- /* CONTINUED */
+ /* CONTINUED */
fraction Music
{
- int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3));
+ int n = ly_scm2int (ly_car ($3)); int d = ly_scm2int (ly_cdr ($3));
Music *mp = $4;
- $$= MY_MAKE_MUSIC("TimeScaledMusic");
- $$->set_spot (THIS->pop_spot ());
+ $$= MY_MAKE_MUSIC ("TimeScaledMusic");
+ $$->set_spot (THIS->pop_spot ());
- $$->set_mus_property ("element", mp->self_scm ());
+ $$->set_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));
+ $$->set_property ("numerator", scm_int2num (n));
+ $$->set_property ("denominator", scm_int2num (d));
$$->compress (Moment (Rational (n,d)));
}
| Repeated_music { $$ = $1; }
- | Simultaneous_music { $$ = $1; }
- | Sequential_music { $$ = $1; }
- | TRANSPOSE pitch Music {
- $$ = MY_MAKE_MUSIC("TransposedMusic");
- Music *p = $3;
- Pitch pit = *unsmob_pitch ($2);
-
- p->transpose (pit);
- $$->set_mus_property ("element", p->self_scm ());
+ | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music {
+ $$ = MY_MAKE_MUSIC ("TransposedMusic");
+ Music *p = $4;
+ Pitch from = *unsmob_pitch ($2);
+ Pitch to = *unsmob_pitch ($3);
+
+ p->transpose (interval (from, to));
+ $$->set_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 ());
-
+ | NOTES
+ {
+ SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
+ THIS->lexer_->push_note_state (alist_to_hashq (nn));
}
- | 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 = MY_MAKE_MUSIC("Music");
- }
- $$ = m;
+ Music
+ { $$ = $3;
+ THIS->lexer_->pop_state ();
+ }
+ | DRUMS
+ {
+ SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
+ THIS->lexer_->push_note_state (alist_to_hashq (nn));
}
- | NOTES
- { THIS->lexer_->push_note_state (); }
+ /* FIXME: This used to be: */
Music
+/* Grouped_music_list */
{ $$ = $3;
THIS->lexer_->pop_state ();
}
| FIGURES
{ THIS->lexer_->push_figuredbass_state (); }
+ /* FIXME: This used to be:
Music
+ but that breaks web build
+ */
+ Grouped_music_list
{
- Music * chm = MY_MAKE_MUSIC("UntransposableMusic");
- chm->set_mus_property ("element", $3->self_scm ());
+ Music *chm = MY_MAKE_MUSIC ("UntransposableMusic");
+ chm->set_property ("element", $3->self_scm ());
$$ = chm;
- scm_gc_unprotect_object ($3->self_scm());
+ scm_gc_unprotect_object ($3->self_scm ());
THIS->lexer_->pop_state ();
}
- | CHORDS
- { THIS->lexer_->push_chord_state (); }
+ | CHORDS {
+ SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
+ THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
+ nn = THIS->lexer_->lookup_identifier ("pitchnames");
+ THIS->lexer_->push_chord_state (alist_to_hashq (nn));
+
+ }
+ /* FIXME:
Music
- {
- Music * chm = MY_MAKE_MUSIC("UnrelativableMusic");
- chm->set_mus_property ("element", $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm());
+*/
+ Grouped_music_list
+ {
+ Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
+ chm->set_property ("element", $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
$$ = chm;
THIS->lexer_->pop_state ();
}
| LYRICS
{ THIS->lexer_->push_lyric_state (); }
+ /* FIXME:
Music
+*/
+ Grouped_music_list
{
$$ = $3;
THIS->lexer_->pop_state ();
}
| relative_music { $$ = $1; }
- | re_rhythmed_music { $$ = $1; }
- | part_combined_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
+ | TAG embedded_scm Music {
+ tag_music ($3, $2, THIS->here_input ());
+ $$ = $3;
+ }
;
relative_music:
RELATIVE absolute_pitch Music {
- Music * p = $3;
- Pitch pit = *unsmob_pitch ($2);
- $$ = MY_MAKE_MUSIC("RelativeOctaveMusic");
-
- $$->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 ());
-
+ Music *m = $3;
+ Pitch start = *unsmob_pitch ($2);
+ $$ = make_music_relative (start, m);
+ scm_gc_unprotect_object (m->self_scm ());
+ }
+ | RELATIVE Composite_music {
+ Music *m = $2;
+ /* FIXME: why is octave==0 and default not middleC? */
+ Pitch middle_c (-1, 0, 0);
+ $$ = make_music_relative (middle_c, m);
+ scm_gc_unprotect_object (m->self_scm ());
+ }
+ ;
+
+new_lyrics:
+ NEWLYRICS { THIS->lexer_->push_lyric_state (); }
+ /*cont */
+ Grouped_music_list {
+ /* Can also use Music at the expensive of two S/Rs similar to
+ \repeat \alternative */
+ THIS->lexer_->pop_state ();
+#if 0
+ Music *music = MY_MAKE_MUSIC ("SimultaneousMusic");
+ music->set_property ("elements", scm_list_1 ($3->self_scm ()));
+ $$ = music;
+#else
+ $$ = scm_cons ($3->self_scm (), SCM_EOL);
+#endif
+ }
+ | new_lyrics NEWLYRICS { THIS->lexer_->push_lyric_state (); }
+ Grouped_music_list {
+ THIS->lexer_->pop_state ();
+ $$ = scm_cons ($4->self_scm (), $1);
}
;
re_rhythmed_music:
ADDLYRICS Music Music {
- Music*l =MY_MAKE_MUSIC("LyricCombineMusic");
- l->set_mus_property ("elements", gh_list ($2->self_scm (), $3->self_scm (), SCM_UNDEFINED));
- scm_gc_unprotect_object ($3->self_scm ());
- scm_gc_unprotect_object ($2->self_scm ());
- $$ = l;
+ Music *m = MY_MAKE_MUSIC ("LyricCombineMusic");
+ m->set_property ("elements", scm_listify ($2->self_scm (),
+ $3->self_scm (), SCM_UNDEFINED));
+ scm_gc_unprotect_object ($3->self_scm ());
+ scm_gc_unprotect_object ($2->self_scm ());
+ $$ = m;
}
- ;
+ | Grouped_music_list new_lyrics {
-part_combined_music:
- PARTCOMBINE STRING Music Music {
- Music * p= MY_MAKE_MUSIC("PartCombineMusic");
- p->set_mus_property ("what", $2);
- p->set_mus_property ("elements", gh_list ($3->self_scm (),$4->self_scm (), SCM_UNDEFINED));
+ /* FIXME: should find out uniqueXXX name from music */
+ SCM name = $1->get_property ("context-id");
+ //if (name == SCM_EOL)
+ if (!ly_c_string_p (name))
+ name = scm_makfrom0str ("");
- scm_gc_unprotect_object ($3->self_scm ());
- scm_gc_unprotect_object ($4->self_scm ());
+ SCM context = scm_makfrom0str ("Lyrics");
+ Music *all = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$ = p;
+ SCM lst = SCM_EOL;
+ for (SCM s = $2; ly_c_pair_p (s); s = ly_cdr (s))
+ {
+ Music *music = unsmob_music (ly_car (s));
+ Music *com = make_lyric_combine_music (name, music);
+ Music *csm = context_spec_music (context,
+ get_next_unique_context (), com, SCM_EOL);
+ lst = scm_cons (csm->self_scm (), lst);
+ }
+ /* FIXME: only first lyric music is accepted,
+ the rest is junked */
+ all->set_property ("elements", scm_cons ($1->self_scm (),
+ lst));
+ $$ = all;
+ scm_gc_unprotect_object ($1->self_scm ());
+ }
+ | LYRICSTO string Music {
+ Music *music = $3;
+ SCM name = $2;
+ $$ = make_lyric_combine_music (name, music);
+ scm_gc_unprotect_object (music->self_scm ());
}
;
-translator_change:
- TRANSLATOR STRING '=' STRING {
- Music*t= MY_MAKE_MUSIC("TranslatorChange");
- t-> set_mus_property ("change-to-type", $2);
- t-> set_mus_property ("change-to-id", $4);
+context_change:
+ CHANGE STRING '=' STRING {
+ Music*t= MY_MAKE_MUSIC ("ContextChange");
+ t-> set_property ("change-to-type", scm_string_to_symbol ($2));
+ t-> set_property ("change-to-id", $4);
$$ = t;
$$->set_spot (THIS->here_input ());
}
;
-property_def:
- simple_property_def
- | ONCE simple_property_def {
- $$ = $2;
- SCM e = $2->get_mus_property ("element");
- unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T);
+property_operation:
+ STRING '=' scalar {
+ $$ = scm_list_3 (ly_symbol2scm ("assign"),
+ scm_string_to_symbol ($1), $3);
+ }
+ | UNSET simple_string {
+ $$ = scm_list_2 (ly_symbol2scm ("unset"),
+ scm_string_to_symbol ($2));
+ }
+ | OVERRIDE simple_string embedded_scm '=' embedded_scm {
+ $$ = scm_list_4 (ly_symbol2scm ("push"),
+ scm_string_to_symbol ($2), $3, $5);
+ }
+ | REVERT simple_string embedded_scm {
+ $$ = scm_list_3 (ly_symbol2scm ("pop"),
+ scm_string_to_symbol ($2), $3);
}
;
-simple_property_def:
- PROPERTY STRING '.' STRING '=' scalar {
- Music *t = set_property_music (scm_string_to_symbol ($4), $6);
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+context_def_mod:
+ CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); }
+ | CONSISTS { $$ = ly_symbol2scm ("consists"); }
+ | REMOVE { $$ = ly_symbol2scm ("remove"); }
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
+ | ACCEPTS { $$ = ly_symbol2scm ("accepts"); }
+ | DENIES { $$ = ly_symbol2scm ("denies"); }
- $$ = csm;
- $$->set_spot (THIS->here_input ());
+ | ALIAS { $$ = ly_symbol2scm ("alias"); }
+ | TYPE { $$ = ly_symbol2scm ("translator-type"); }
+ | DESCRIPTION { $$ = ly_symbol2scm ("description"); }
+ | NAME { $$ = ly_symbol2scm ("context-name"); }
+ ;
- csm-> set_mus_property ("context-type", $2);
+context_mod:
+ property_operation { $$ = $1; }
+ | context_def_mod STRING {
+ $$ = scm_list_2 ($1, $2);
}
- | PROPERTY STRING '.' STRING UNSET {
-
- Music *t = MY_MAKE_MUSIC("PropertyUnset");
- t->set_mus_property ("symbol", scm_string_to_symbol ($4));
+ ;
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
+context_prop_spec:
+ simple_string {
+ $$ = scm_list_2 (ly_symbol2scm ("Bottom"),
+ scm_string_to_symbol ($1));
+ }
+ | simple_string '.' simple_string {
+ $$ = scm_list_2 (scm_string_to_symbol ($1),
+ scm_string_to_symbol ($3));
+ }
+ ;
- $$ = csm;
- $$->set_spot (THIS->here_input ());
+music_property_def:
+ OVERRIDE context_prop_spec embedded_scm '=' scalar {
+ $$ = property_op_to_music (scm_list_4 (
+ ly_symbol2scm ("poppush"),
+ ly_cadr ($2),
+ $3, $5));
+ $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ }
+ | REVERT context_prop_spec embedded_scm {
+ $$ = property_op_to_music (scm_list_3 (
+ ly_symbol2scm ("pop"),
+ ly_cadr ($2),
+ $3));
- csm-> set_mus_property ("context-type", $2);
+ $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
- | PROPERTY STRING '.' STRING SET embedded_scm '=' embedded_scm {
- bool autobeam
- = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
- bool itc = internal_type_checking_global_b;
- Music *t = MY_MAKE_MUSIC("OverrideProperty");
+ | SET context_prop_spec '=' scalar {
+ $$ = property_op_to_music (scm_list_3 (
+ ly_symbol2scm ("assign"),
+ ly_cadr ($2),
+ $4));
+ $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ }
+ | UNSET context_prop_spec {
+ $$ = property_op_to_music (scm_list_2 (
+ ly_symbol2scm ("unset"),
+ ly_cadr ($2)));
+ $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ }
+ | ONCE music_property_def {
+ SCM e = $2->get_property ("element");
+ unsmob_music (e)->set_property ("once", SCM_BOOL_T);
+ $$ = $2;
- t->set_mus_property ("symbol", scm_string_to_symbol ($4));
- t->set_mus_property ("pop-first", SCM_BOOL_T);
- if (autobeam)
- internal_type_checking_global_b = false;
- t->set_mus_property ("grob-property", $6);
- if (autobeam)
- internal_type_checking_global_b = itc;
- t->set_mus_property ("grob-value", $8);
+ }
+ ;
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
- $$ = csm;
- $$->set_spot (THIS->here_input ());
- csm-> set_mus_property ("context-type", $2);
+string:
+ STRING {
+ $$ = $1;
}
- | PROPERTY STRING '.' STRING OVERRIDE
- embedded_scm '=' embedded_scm
- {
- /*
- UGH UGH UGH UGH.
- */
- bool autobeam
- = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
- bool itc = internal_type_checking_global_b;
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
+ | string '+' string {
+ $$ = scm_string_append (scm_list_2 ($1, $3));
+ }
+ ;
- Music *t = MY_MAKE_MUSIC("OverrideProperty");
- t->set_mus_property ("symbol", scm_string_to_symbol ($4));
- if (autobeam)
- internal_type_checking_global_b = false;
- t->set_mus_property ("grob-property", $6);
- t->set_mus_property ("grob-value", $8);
- if (autobeam)
- internal_type_checking_global_b = itc;
+simple_string: STRING {
+ }
+ | LYRICS_STRING {
+ }
+ ;
+
+scalar: string {
+ }
+ | LYRICS_STRING {
+ }
+ | bare_int {
+ $$ = scm_int2num ($1);
+ }
+ | embedded_scm {
+ }
+ | full_markup {
+ }
+ | DIGIT {
+ $$ = scm_int2num ($1);
+ }
+ ;
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
+/*
+FIXME: remove or fix this comment. What is `This'?
- $$ = csm;
- $$->set_spot (THIS->here_input ());
+This is a trick:
+
+Adding pre_events to the simple_element
+makes the choice between
+
+ string: STRING
+
+and
+
+ simple_element: STRING
- csm-> set_mus_property ("context-type", $2);
+a single shift/reduction conflict.
+nevertheless, this is not very clean, and we should find a different
+solution.
+
+*/
+pre_events: {
+ THIS->push_spot ();
}
- | PROPERTY STRING '.' STRING REVERT embedded_scm {
- Music *t = MY_MAKE_MUSIC("RevertProperty");
- bool autobeam
- = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
- bool itc = internal_type_checking_global_b;
+ ;
- t->set_mus_property ("symbol", scm_string_to_symbol ($4));
- if (autobeam)
- internal_type_checking_global_b = false;
- t->set_mus_property ("grob-property", $6);
- if (autobeam)
- internal_type_checking_global_b = itc;
-
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
+event_chord:
+ pre_events simple_element post_events {
+ SCM elts = $2-> get_property ("elements");
- $$ = csm;
- $$->set_spot (THIS->here_input ());
+ elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL));
- csm-> set_mus_property ("context-type", $2);
+ $2->set_property ("elements", elts);
+ $$ = $2;
}
+ | command_element
+ | note_chord_element
;
-scalar:
- string { $$ = $1; }
- | bare_int { $$ = gh_int2scm ($1); }
- | embedded_scm { $$ = $1; }
- ;
+note_chord_element:
+ chord_body optional_notemode_duration post_events
+ {
+ SCM dur = unsmob_duration ($2)->smobbed_copy ();
+ SCM es = $1->get_property ("elements");
+ SCM postevs = scm_reverse_x ($3, SCM_EOL);
+ for (SCM s = es; ly_c_pair_p (s); s = ly_cdr (s))
+ unsmob_music (ly_car (s))->set_property ("duration", dur);
+ es = ly_append2 (es, postevs);
-request_chord:
- 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);
+ $1-> set_property ("elements", es);
+ $$ = $1;
+ }
+ ;
+
+chord_open: '<'
+ ;
+
+chord_close: '>'
+ ;
+
+simul_open: DOUBLE_ANGLE_OPEN
+ ;
+
+simul_close: DOUBLE_ANGLE_CLOSE
+ ;
+
+chord_body:
+ chord_open chord_body_elements chord_close
+ {
+ $$ = MY_MAKE_MUSIC ("EventChord");
+ $$->set_property ("elements",
+ scm_reverse_x ($2, SCM_EOL));
+ }
+ ;
+
+chord_body_elements:
+ /* empty */ { $$ = SCM_EOL; }
+ | chord_body_elements chord_body_element {
+ $$ = scm_cons ($2->self_scm (), $1);
+ scm_gc_unprotect_object ($2->self_scm ());
+ }
+ ;
+
+chord_body_element:
+ pitch exclamations questions post_events
+ {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ n->set_property ("pitch", $1);
+ if ($3 % 2)
+ n->set_property ("cautionary", SCM_BOOL_T);
+ if ($2 % 2 || $3 % 2)
+ n->set_property ("force-accidental", SCM_BOOL_T);
+
+ if (ly_c_pair_p ($4)) {
+ SCM arts = scm_reverse_x ($4, SCM_EOL);
+ n->set_property ("articulations", arts);
}
- $$ = $3;
+ $$ = n;
+ }
+ | DRUM_PITCH post_events {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ n->set_property ("duration", $2);
+ n->set_property ("drum-type", $1);
+ n->set_spot (THIS->here_input ());
- delete $1;
- delete $4;
+ if (ly_c_pair_p ($2)) {
+ SCM arts = scm_reverse_x ($2, SCM_EOL);
+ n->set_property ("articulations", arts);
+ }
+ $$ = n;
+ }
+ ;
+
+add_quote:
+ ADDQUOTE string Music {
+ SCM adder = ly_scheme_function ("add-quotable");
+
+ scm_call_2 (adder, $2, $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
}
- | command_element
;
command_element:
command_req {
- $$ = MY_MAKE_MUSIC("RequestChord");
- $$->set_mus_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
- scm_gc_unprotect_object ($1->self_scm());
+ $$ = MY_MAKE_MUSIC ("EventChord");
+ $$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
+ scm_gc_unprotect_object ($1->self_scm ());
$$-> set_spot (THIS->here_input ());
$1-> set_spot (THIS->here_input ());
}
+ | SKIP duration_length {
+ Music *skip = MY_MAKE_MUSIC ("SkipMusic");
+ skip->set_property ("duration", $2);
+
+ $$ = skip;
+ }
+ | QUOTE STRING duration_length {
+ SCM tab = THIS->lexer_->lookup_identifier ("musicQuotes");
+ SCM evs = SCM_EOL;
+ if (scm_hash_table_p (tab) == SCM_BOOL_T)
+ {
+ SCM key = $2; // use symbol?
+ evs = scm_hash_ref (tab, key, SCM_BOOL_F);
+ }
+ Music *quote = 0;
+ if (ly_c_vector_p (evs))
+ {
+ quote = MY_MAKE_MUSIC ("QuoteMusic");
+ quote->set_property ("duration", $3);
+ quote->set_property ("quoted-events", evs);
+ } else {
+ THIS->here_input ().warning (_f ("Can\'t find music"));
+ quote = MY_MAKE_MUSIC ("Event");
+ }
+ quote->set_spot (THIS->here_input ());
+ $$ = quote;
+ }
+ | OCTAVE { THIS->push_spot (); }
+ pitch {
+ Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck");
+ $$ = m;
+ $$->set_spot (THIS->pop_spot ());
+ $$->set_property ("pitch", $3);
+ }
| E_LEFTSQUARE {
- Music *l = MY_MAKE_MUSIC("SpanEvent");
- l->set_mus_property ("span-direction", gh_int2scm (START));
- l->set_mus_property ("span-type", scm_makfrom0str ("ligature"));
- l->set_spot (THIS->here_input ());
-
- $$ = MY_MAKE_MUSIC("RequestChord");
- $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
- scm_gc_unprotect_object (l->self_scm());
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+ m->set_property ("span-direction", scm_int2num (START));
+ m->set_spot (THIS->here_input ());
+
+ $$ = MY_MAKE_MUSIC ("EventChord");
+ $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
+ scm_gc_unprotect_object (m->self_scm ());
$$->set_spot (THIS->here_input ());
}
| E_RIGHTSQUARE {
- Music *l = MY_MAKE_MUSIC("SpanEvent");
- l->set_mus_property ("span-direction", gh_int2scm (STOP));
- l->set_mus_property ("span-type", scm_makfrom0str ("ligature"));
- l->set_spot (THIS->here_input ());
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+ m->set_property ("span-direction", scm_int2num (STOP));
+ m->set_spot (THIS->here_input ());
- $$ = MY_MAKE_MUSIC("RequestChord");
- $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
+ $$ = MY_MAKE_MUSIC ("EventChord");
+ $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
$$->set_spot (THIS->here_input ());
- scm_gc_unprotect_object (l->self_scm());
-
+ scm_gc_unprotect_object (m->self_scm ());
}
| E_BACKSLASH {
- $$ = MY_MAKE_MUSIC("VoiceSeparator");
+ $$ = MY_MAKE_MUSIC ("VoiceSeparator");
$$->set_spot (THIS->here_input ());
}
| '|' {
+ SCM pipe =THIS->lexer_->lookup_identifier ("pipeSymbol");
+
+ if (Music * m = unsmob_music (pipe))
+ $$ = m->clone ();
+ else
+ $$ = MY_MAKE_MUSIC ("BarCheck");
- $$ = MY_MAKE_MUSIC("BarCheck");
$$->set_spot (THIS->here_input ());
}
+ | TRANSPOSITION pitch {
+ $$ = set_property_music (ly_symbol2scm ("instrumentTransposition"),
+ $2);
+ $$->set_spot (THIS-> here_input ());
+ $$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED,
+ $$, SCM_EOL);
+ }
| BAR STRING {
Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2);
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
-
- $$ = csm;
+ Music *csm = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
+ t, SCM_EOL);
+ $$ = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, csm, SCM_EOL);
$$->set_spot (THIS->here_input ());
-
- csm->set_mus_property ("context-type", scm_makfrom0str ("Timing"));
+ t->set_spot (THIS->here_input ());
}
| PARTIAL duration_length {
- Moment m = - unsmob_duration ($2)->length_mom ();
- Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
-
- Music * sp = MY_MAKE_MUSIC("ContextSpeccedMusic");
- sp->set_mus_property ("element", p->self_scm ());
- scm_gc_unprotect_object (p->self_scm ());
-
- $$ =sp ;
- sp-> set_mus_property ("context-type", scm_makfrom0str ("Timing"));
+ Moment m = - unsmob_duration ($2)->get_length ();
+ Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
+ p->set_spot (THIS->here_input ());
+ p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
+ p, SCM_EOL);
+ p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED,
+ p, SCM_EOL);
+ $$ = p;
}
| CLEF STRING {
- SCM func = scm_primitive_eval (ly_symbol2scm ("clef-name-to-properties"));
- SCM result = gh_call1 (func, $2);
-
- SCM l = SCM_EOL;
- for (SCM s = result ; gh_pair_p (s); s = ly_cdr (s)) {
- Music * p = MY_MAKE_MUSIC("Music");
- set_music_properties (p, ly_car (s));
- l = scm_cons (p->self_scm (), l);
- scm_gc_unprotect_object (p->self_scm ());
- }
- Music * seq = MY_MAKE_MUSIC("SequentialMusic");
- seq->set_mus_property ("elements", l);
+ SCM proc = ly_scheme_function ("make-clef-set");
- Music * sp = MY_MAKE_MUSIC("ContextSpeccedMusic");
- sp->set_mus_property ("element", seq->self_scm ());
- scm_gc_unprotect_object (seq->self_scm ());
-
- $$ =sp ;
- sp-> set_mus_property ("context-type", scm_makfrom0str ("Staff"));
+ SCM result = scm_call_1 (proc, $2);
+ scm_gc_protect_object (result);
+ $$ = unsmob_music (result);
}
| TIME_T fraction {
- Music * p1 = set_property_music (ly_symbol2scm ( "timeSignatureFraction"), $2);
-
- int l = gh_scm2int (ly_car ($2));
- int o = gh_scm2int (ly_cdr ($2));
-
- Moment one_beat = Moment (1)/Moment (o);
- Moment len = Moment (l) * one_beat;
+ SCM proc= ly_scheme_function ("make-time-signature-set");
+ SCM result = scm_apply_2 (proc, ly_car ($2), ly_cdr ($2), SCM_EOL);
+ scm_gc_protect_object (result);
+ $$ = unsmob_music (result);
+ }
+ | MARK scalar {
+ SCM proc = ly_scheme_function ("make-mark-set");
- 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;
-
- sp-> set_mus_property ("context-type", scm_makfrom0str ( "Timing"));
+ SCM result = scm_call_1 (proc, $2);
+ scm_gc_protect_object (result);
+ $$ = unsmob_music (result);
}
;
command_req:
- shorthand_command_req { $$ = $1; }
- | verbose_command_req { $$ = $1; }
- ;
-
-shorthand_command_req:
- extender_req {
- $$ = $1;
+ BREATHE {
+ $$ = MY_MAKE_MUSIC ("BreathingSignEvent");
+ }
+ | E_TILDE {
+ $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
+ }
+ | MARK DEFAULT {
+ Music *m = MY_MAKE_MUSIC ("MarkEvent");
+ $$ = m;
}
- | hyphen_req {
+ | tempo_event {
$$ = $1;
}
- | '~' {
- $$ = MY_MAKE_MUSIC("TieEvent");
+ | KEY DEFAULT {
+ Music *key= MY_MAKE_MUSIC ("KeyChangeEvent");
+ $$ = key;
}
- | '[' {
- Music *b= MY_MAKE_MUSIC("SpanEvent");
- b->set_mus_property ("span-direction", gh_int2scm (START))
-;
- b->set_mus_property ("span-type", scm_makfrom0str ("beam"));
- $$ =b;
+ | KEY NOTENAME_PITCH SCM_IDENTIFIER {
+ Music *key= MY_MAKE_MUSIC ("KeyChangeEvent");
+ if (scm_ilength ($3) > 0)
+ {
+ key->set_property ("pitch-alist", $3);
+ key->set_property ("tonic", Pitch (0,0,0).smobbed_copy ());
+ ((Music*)key)->transpose (* unsmob_pitch ($2));
+ } else {
+ THIS->parser_error (_ ("Second argument must be pitch list."));
+ }
- THIS->last_beam_start_ = b->self_scm ();
- }
- | ']' {
- Music *b= MY_MAKE_MUSIC("SpanEvent");
- b->set_mus_property ("span-direction", gh_int2scm (STOP))
-;
- b->set_mus_property ("span-type", scm_makfrom0str ("beam"));
- $$ = b;
- }
- | BREATHE {
- $$ = MY_MAKE_MUSIC("BreathingSignEvent");
- }
- | E_TILDE {
- $$ = MY_MAKE_MUSIC("PorrectusEvent");
+ $$ = key;
}
;
-verbose_command_req:
- COMMANDSPANREQUEST bare_int STRING { /*TODO: junkme */
- Music * sp = MY_MAKE_MUSIC("SpanEvent");
- sp->set_mus_property ("span-direction", gh_int2scm (Direction ($2)));
- sp->set_mus_property ("span-type",$3);
- sp->set_spot (THIS->here_input ());
- $$ = sp;
+post_events:
+ /* empty */ {
+ $$ = SCM_EOL;
}
- | MARK DEFAULT {
- Music * m = MY_MAKE_MUSIC("MarkEvent");
- $$ = m;
+ | post_events post_event {
+ $2->set_spot (THIS->here_input ());
+ $$ = scm_cons ($2->self_scm (), $$);
+ scm_gc_unprotect_object ($2->self_scm ());
}
- | MARK scalar {
- Music *m = MY_MAKE_MUSIC("MarkEvent");
- m->set_mus_property ("label", $2);
- $$ = m;
+ | post_events tagged_post_event {
+ $2 -> set_spot (THIS->here_input ());
+ $$ = scm_cons ($2->self_scm (), $$);
+ scm_gc_unprotect_object ($2->self_scm ());
}
- | PENALTY SCM_T {
- Music * b = MY_MAKE_MUSIC("BreakEvent");
- SCM s = $2;
- if (!gh_number_p (s))
- s =gh_int2scm (0);
+ ;
- b->set_mus_property ("penalty", s);
- b->set_spot (THIS->here_input ());
- $$ = b;
- }
- | SKIP duration_length {
- Music * skip = MY_MAKE_MUSIC("SkipEvent");
- skip->set_mus_property ("duration", $2);
- $$ = skip;
+tagged_post_event:
+ '-' TAG embedded_scm post_event {
+ tag_music ($4, $3, THIS->here_input ());
+ $$ = $4;
}
- | tempo_request {
+ ;
+
+post_event:
+ direction_less_event {
$$ = $1;
}
- | KEY DEFAULT {
- Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
- $$ = key;
+ | HYPHEN {
+ if (!THIS->lexer_->is_lyric_state ())
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+ $$ = MY_MAKE_MUSIC ("HyphenEvent");
}
- | KEY NOTENAME_PITCH SCM_IDENTIFIER {
- Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
-
- key->set_mus_property ("pitch-alist", $3);
- ((Music*)key)->transpose (* unsmob_pitch ($2));
- $$ = key;
+ | EXTENDER {
+ if (!THIS->lexer_->is_lyric_state ())
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+ $$ = MY_MAKE_MUSIC ("ExtenderEvent");
}
- ;
-
-post_requests:
- {
- $$ = new Link_array<Music>;
+ | script_dir direction_reqd_event {
+ if ($1)
+ $2->set_property ("direction", scm_int2num ($1));
+ $$ = $2;
}
- | post_requests post_request {
- $2->set_spot (THIS->here_input ());
- $$->push ($2);
+ | script_dir direction_less_event {
+ if ($1)
+ $2->set_property ("direction", scm_int2num ($1));
+ $$ = $2;
}
+ | string_number_event
;
-post_request:
- verbose_request
- | request_with_dir
- | close_request
- | string_request
+string_number_event:
+ E_UNSIGNED {
+ Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
+ s->set_property ("string-number", scm_int2num ($1));
+ s->set_spot (THIS->here_input ());
+ $$ = s;
+ }
;
-string_request:
- E_UNSIGNED {
- Music * s = MY_MAKE_MUSIC("StringNumberEvent");
- s->set_mus_property ("string-number", gh_int2scm($1));
- s->set_spot (THIS->here_input ());
- $$ = s;
- }
- ;
+direction_less_event:
+ '[' {
+
+
+/*
+
+TODO: should take all these defs out of the parser, adn make use
+configurable, i.e.
+
+(set-articulation '~ "trill")
-request_that_take_dir:
- gen_text_def
- | verbose_request
- | script_abbreviation {
- SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
- Music *a = MY_MAKE_MUSIC("ArticulationEvent");
- if (gh_string_p (s))
- a->set_mus_property ("articulation-type", s);
- else THIS->parser_error (_ ("Expecting string as script definition"));
- $$ = a;
+*/
+ Music *m = MY_MAKE_MUSIC ("BeamEvent");
+ m->set_spot (THIS->here_input ());
+ m->set_property ("span-direction", scm_int2num (START));
+ $$ = m;
}
- ;
-
-request_with_dir:
- script_dir request_that_take_dir {
- $2->set_mus_property ("direction", gh_int2scm ($1));
- $$ = $2;
+ | ']' {
+ Music *m = MY_MAKE_MUSIC ("BeamEvent");
+ m->set_spot (THIS->here_input ());
+ m->set_property ("span-direction", scm_int2num (STOP));
+ $$ = m;
}
- ;
-
-verbose_request:
- REQUEST_IDENTIFIER {
- $$ = unsmob_music ($1)->clone ();
- $$->set_spot (THIS->here_input ());
+ | '~' {
+ Music *m = MY_MAKE_MUSIC ("TieEvent");
+ m->set_spot (THIS->here_input ());
+ $$ = m;
}
- | DYNAMICSCRIPT embedded_scm {
- /*
- TODO: junkme, use text-type == dynamic
- */
- Music *d = MY_MAKE_MUSIC("TextScriptEvent");
- 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 {
- Music * sp = MY_MAKE_MUSIC("SpanEvent");
- sp->set_mus_property ("span-direction", gh_int2scm ( $2));
- sp->set_mus_property ("span-type", $3);
- sp->set_spot (THIS->here_input ());
- $$ = sp;
+ | close_event {
+ $$ = $1;
+ dynamic_cast<Music *> ($$)->set_property ("span-direction",
+ scm_int2num (START));
+ }
+ | open_event {
+ $$ = $1;
+ dynamic_cast<Music *> ($$)->set_property ("span-direction",
+ scm_int2num (STOP));
+ }
+ | EVENT_IDENTIFIER {
+ $$ = unsmob_music ($1);
}
| tremolo_type {
- Music * a = MY_MAKE_MUSIC("TremoloEvent");
+ Music *a = MY_MAKE_MUSIC ("TremoloEvent");
a->set_spot (THIS->here_input ());
- a->set_mus_property ("tremolo-type", gh_int2scm ($1));
+ a->set_property ("tremolo-type", scm_int2num ($1));
$$ = a;
}
- | SCRIPT STRING {
- Music * a = MY_MAKE_MUSIC("ArticulationEvent");
- a->set_mus_property ("articulation-type", $2);
- a->set_spot (THIS->here_input ());
- $$ = a;
+ ;
+
+direction_reqd_event:
+ gen_text_def {
+ $$ = $1;
}
-
- /*
- duh, junk this syntax from the parser, if possible.
- */
- | ARPEGGIO {
- Music *a = MY_MAKE_MUSIC("ArpeggioEvent");
- a->set_spot (THIS->here_input ());
+ | script_abbreviation {
+ SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
+ Music *a = MY_MAKE_MUSIC ("ArticulationEvent");
+ if (ly_c_string_p (s))
+ a->set_property ("articulation-type", s);
+ else THIS->parser_error (_ ("Expecting string as script definition"));
$$ = a;
}
- | GLISSANDO {
- Music *g = MY_MAKE_MUSIC("GlissandoEvent");
- g->set_spot /* No pun intended */ (THIS->here_input ());
- $$ = g;
- }
+ ;
+
+oct_check:
+ /**/ { $$ = SCM_EOL; }
+ | '=' { $$ = scm_int2num (0); }
+ | '=' sub_quotes { $$ = scm_int2num ($2); }
+ | '=' sup_quotes { $$ = scm_int2num ($2); }
;
sup_quotes:
$$ = 1;
}
| sub_quotes ',' {
- $$ ++ ;
+ $$++;
}
;
}
| 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 ();
-
}
;
steno_pitch {
$$ = $1;
}
- | explicit_pitch {
- $$ = $1;
- }
- ;
-
-explicit_pitch:
- PITCH embedded_scm {
- $$ = $2;
- if (!unsmob_pitch ($2)) {
- THIS->parser_error (_f ("Expecting musical-pitch value", 3));
- $$ = Pitch ().smobbed_copy ();
- }
- }
;
-verbose_duration:
- DURATION embedded_scm {
- $$ = $2;
- if (!unsmob_duration ($2))
- {
- THIS->parser_error (_ ("Must have duration object"));
- $$ = Duration ().smobbed_copy ();
- }
- }
- ;
-
-extender_req:
- EXTENDER {
- if (!THIS->lexer_->lyric_state_b ())
- THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC("ExtenderEvent");
- }
+pitch_also_in_chords:
+ pitch
+ | steno_tonic_pitch
;
-hyphen_req:
- HYPHEN {
- if (!THIS->lexer_->lyric_state_b ())
- THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC("HyphenEvent");
- }
- ;
-
-close_request:
- close_request_parens {
- $$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (START))
-;
- }
- ;
-
-close_request_parens:
+close_event:
'(' {
- Music * s= MY_MAKE_MUSIC("SpanEvent");
+ Music *s = MY_MAKE_MUSIC ("SlurEvent");
$$ = s;
- s->set_mus_property ("span-type", scm_makfrom0str ( "slur"));
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
| E_OPEN {
- Music * s= MY_MAKE_MUSIC("SpanEvent");
+ Music *s = MY_MAKE_MUSIC ("PhrasingSlurEvent");
$$ = s;
- s->set_mus_property ("span-type", scm_makfrom0str ( "phrasing-slur"));
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
| E_SMALLER {
- Music *s =MY_MAKE_MUSIC("SpanEvent");
+ Music *s = MY_MAKE_MUSIC ("CrescendoEvent");
$$ = s;
- s->set_mus_property ("span-type", scm_makfrom0str ( "crescendo"));
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
| E_BIGGER {
- Music *s =MY_MAKE_MUSIC("SpanEvent");
+ Music *s = MY_MAKE_MUSIC ("DecrescendoEvent");
$$ = s;
- s->set_mus_property ("span-type", scm_makfrom0str ("decrescendo"));
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
;
-open_request:
- open_request_parens {
- $$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP))
-;
- }
- ;
-
-open_request_parens:
+open_event:
E_EXCLAMATION {
- Music *s = MY_MAKE_MUSIC("SpanEvent");
- s->set_mus_property ("span-type", scm_makfrom0str ( "crescendo"));
- s->set_spot (THIS->here_input());
+ Music *s = MY_MAKE_MUSIC ("CrescendoEvent");
+ s->set_spot (THIS->here_input ());
$$ = s;
}
| ')' {
- Music * s= MY_MAKE_MUSIC("SpanEvent");
+ Music *s= MY_MAKE_MUSIC ("SlurEvent");
$$ = s;
- s->set_mus_property ("span-type", scm_makfrom0str ( "slur"));
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
| E_CLOSE {
- Music * s= MY_MAKE_MUSIC("SpanEvent");
+ Music *s= MY_MAKE_MUSIC ("PhrasingSlurEvent");
$$ = s;
- s->set_mus_property ("span-type", scm_makfrom0str ( "phrasing-slur"));
- s->set_spot (THIS->here_input());
+ s->set_property ("span-type",
+ scm_makfrom0str ("phrasing-slur"));
+ s->set_spot (THIS->here_input ());
}
;
gen_text_def:
- embedded_scm {
- Music *t = MY_MAKE_MUSIC("TextScriptEvent");
- t->set_mus_property ("text", $1);
+ full_markup {
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ t->set_property ("text", $1);
t->set_spot (THIS->here_input ());
- $$ = t;
+ $$ = t;
}
| string {
- Music *t = MY_MAKE_MUSIC("TextScriptEvent");
- t->set_mus_property ("text", $1);
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ t->set_property ("text",
+ make_simple_markup (THIS->lexer_->encoding (), $1));
t->set_spot (THIS->here_input ());
$$ = t;
+
}
| DIGIT {
- String ds = to_string ($1);
- Music * t = MY_MAKE_MUSIC("TextScriptEvent");
- SCM finger = ly_symbol2scm ("finger");
- t->set_mus_property ("text", scm_makfrom0str (ds.to_str0 ()));
- t->set_mus_property ("text-type" , finger);
+ Music *t = MY_MAKE_MUSIC ("FingerEvent");
+ t->set_property ("digit", scm_int2num ($1));
t->set_spot (THIS->here_input ());
$$ = t;
}
| '-' { $$ = CENTER; }
;
-pre_requests:
- {
- $$ = new Link_array<Music>;
- }
- | pre_requests open_request {
- $$->push ($2);
- }
- ;
absolute_pitch:
steno_pitch {
multiplied_duration {
$$ = $1;
}
- | verbose_duration {
- $$ = $1;
- }
;
optional_notemode_duration:
THIS->beam_check ($$);
}
- | verbose_duration {
- $$ = $1;
- THIS->default_duration_ = *unsmob_duration ($$);
- }
;
steno_duration:
bare_unsigned dots {
- int l = 0;
- if (!is_duration_b ($1))
+ int len = 0;
+ if (!is_duration ($1))
THIS->parser_error (_f ("not a duration: %d", $1));
else
- l = intlog2 ($1);
+ len = intlog2 ($1);
- $$ = Duration (l, $2).smobbed_copy ();
+ $$ = Duration (len, $2).smobbed_copy ();
}
| DURATION_IDENTIFIER dots {
- Duration *d =unsmob_duration ($1);
- Duration k (d->duration_log (),d->dot_count () + $2);
- $$ = k.smobbed_copy ();
+ Duration *d = unsmob_duration ($1);
+ Duration k (d->duration_log (), d->dot_count () + $2);
+ *d = k;
+ $$ = $1;
}
;
-
-
-
multiplied_duration:
steno_duration {
$$ = $1;
$$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy ();
}
| multiplied_duration '*' FRACTION {
- Rational m (gh_scm2int (ly_car ($3)), gh_scm2int (ly_cdr ($3)));
+ Rational m (ly_scm2int (ly_car ($3)), ly_scm2int (ly_cdr ($3)));
$$ = unsmob_duration ($$)->compressed (m).smobbed_copy ();
}
fraction:
FRACTION { $$ = $1; }
| UNSIGNED '/' UNSIGNED {
- $$ = scm_cons (gh_int2scm ($1), gh_int2scm ($3));
+ $$ = scm_cons (scm_int2num ($1), scm_int2num ($3));
}
;
}
;
-
-tremolo_type:
+tremolo_type:
':' {
- $$ =0;
+ $$ = 0;
}
| ':' bare_unsigned {
- if (!is_duration_b ($2))
+ if (!is_duration ($2))
THIS->parser_error (_f ("not a duration: %d", $2));
$$ = $2;
}
;
-
bass_number:
- DIGIT
- | UNSIGNED
+ DIGIT {
+ $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+ $$ = scm_list_2 (ly_scheme_function ("number-markup"),
+ $$);
+ }
+ | UNSIGNED {
+ $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+ $$ = scm_list_2 (ly_scheme_function ("number-markup"),
+ $$);
+ }
+ | STRING { $$ = $1; }
;
bass_mod:
- '-' { $$ = -1; }
- | '+' { $$ = 1; }
+ '-' { $$ = -2; }
+ | '+' { $$ = 2; }
| '!' { $$ = 0; }
;
bass_figure:
FIGURE_SPACE {
- Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
- $$ = bfr->self_scm();
+ Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
+ $$ = bfr->self_scm ();
scm_gc_unprotect_object ($$);
}
| bass_number {
- Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
- $$ = bfr->self_scm();
+ Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
+ $$ = bfr->self_scm ();
- bfr->set_mus_property ("figure", gh_int2scm ($1));
+ bfr->set_property ("figure", $1);
scm_gc_unprotect_object ($$);
}
| bass_figure bass_mod {
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));
+ SCM salter = m->get_property ("alteration");
+ int alter = ly_c_number_p (salter) ? ly_scm2int (salter) : 0;
+ m->set_property ("alteration",
+ scm_int2num (alter + $2));
} else {
- m->set_mus_property ("alteration", gh_int2scm (0));
+ m->set_property ("alteration", scm_int2num (0));
}
}
;
br_bass_figure:
'[' bass_figure {
$$ = $2;
- unsmob_music ($$)->set_mus_property ("bracket-start", SCM_BOOL_T);
+ unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T);
}
| bass_figure {
$$ = $1;
}
| br_bass_figure ']' {
$$ = $1;
- unsmob_music ($1)->set_mus_property ("bracket-stop", SCM_BOOL_T);
+ unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T);
}
;
$$ = SCM_EOL;
}
| figure_list br_bass_figure {
- $$ = scm_cons ($2, $1);
+ $$ = scm_cons ($2, $1);
}
;
figure_spec:
FIGURE_OPEN figure_list FIGURE_CLOSE {
- Music * m = MY_MAKE_MUSIC("RequestChord");
+ Music *m = MY_MAKE_MUSIC ("EventChord");
$2 = scm_reverse_x ($2, SCM_EOL);
- m->set_mus_property ("elements", $2);
+ m->set_property ("elements", $2);
$$ = m->self_scm ();
}
;
;
simple_element:
- pitch exclamations questions optional_notemode_duration optional_rest {
+ pitch exclamations questions oct_check optional_notemode_duration optional_rest {
Input i = THIS->pop_spot ();
- if (!THIS->lexer_->note_state_b ())
+ if (!THIS->lexer_->is_note_state ())
THIS->parser_error (_ ("Have to be in Note mode for notes"));
Music *n = 0;
- if ($5)
- n = MY_MAKE_MUSIC("RestEvent");
+ if ($6)
+ n = MY_MAKE_MUSIC ("RestEvent");
else
- n = MY_MAKE_MUSIC("NoteEvent");
+ n = MY_MAKE_MUSIC ("NoteEvent");
- n->set_mus_property ("pitch", $1);
- n->set_mus_property ("duration", $4);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration", $5);
+ if (ly_c_number_p ($4))
+ {
+ int q = ly_scm2int ($4);
+ n->set_property ("absolute-octave", scm_int2num (q-1));
+ }
if ($3 % 2)
- n->set_mus_property ("cautionary", SCM_BOOL_T);
+ n->set_property ("cautionary", SCM_BOOL_T);
if ($2 % 2 || $3 % 2)
- n->set_mus_property ("force-accidental", SCM_BOOL_T);
+ n->set_property ("force-accidental", SCM_BOOL_T);
- Music *v = MY_MAKE_MUSIC("RequestChord");
- v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED));
- scm_gc_unprotect_object (n->self_scm());
+ Music *v = MY_MAKE_MUSIC ("EventChord");
+ v->set_property ("elements", scm_list_1 (n->self_scm ()));
+ scm_gc_unprotect_object (n->self_scm ());
v->set_spot (i);
n->set_spot (i);
$$ = v;
}
+ | DRUM_PITCH optional_notemode_duration {
+ Input i = THIS->pop_spot ();
+
+ Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ n->set_property ("duration", $2);
+ n->set_property ("drum-type", $1);
+
+ Music *v = MY_MAKE_MUSIC ("EventChord");
+ v->set_property ("elements", scm_list_1 (n->self_scm ()));
+ scm_gc_unprotect_object (n->self_scm ());
+ v->set_spot (i);
+ n->set_spot (i);
+ $$ = v;
+
+ }
| figure_spec optional_notemode_duration {
- Music * m = unsmob_music ($1);
- Input i = THIS->pop_spot ();
+ 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);
- }
+ for (SCM s = m->get_property ("elements"); ly_c_pair_p (s); s = ly_cdr (s))
+ {
+ unsmob_music (ly_car (s))->set_property ("duration", $2);
+ }
$$ = m;
}
| RESTNAME optional_notemode_duration {
Input i = THIS->pop_spot ();
- SCM e = SCM_UNDEFINED;
- if (ly_scm2string ($1) =="s") {
+ Music *ev = 0;
+ if (ly_scm2string ($1) == "s") {
/* Space */
- Music * skip = MY_MAKE_MUSIC("SkipEvent");
- skip->set_mus_property ("duration" ,$2);
- skip->set_spot (i);
- e = skip->self_scm ();
+ ev = MY_MAKE_MUSIC ("SkipEvent");
}
- else {
- Music * rest_req = MY_MAKE_MUSIC("RestEvent");
- rest_req->set_mus_property ("duration", $2);
- rest_req->set_spot (i);
- e = rest_req->self_scm ();
+ else {
+ ev = MY_MAKE_MUSIC ("RestEvent");
+
}
- Music * velt = MY_MAKE_MUSIC("RequestChord");
- velt-> set_mus_property ("elements", scm_list_n (e,SCM_UNDEFINED));
+ ev->set_property ("duration", $2);
+ ev->set_spot (i);
+ Music *velt = MY_MAKE_MUSIC ("EventChord");
+ velt->set_property ("elements", scm_list_1 (ev->self_scm ()));
velt->set_spot (i);
+ scm_gc_unprotect_object (ev->self_scm ());
+
$$ = velt;
}
| MULTI_MEASURE_REST optional_notemode_duration {
THIS->pop_spot ();
- Music * sk = MY_MAKE_MUSIC("SkipEvent");
- sk->set_mus_property ("duration", $2);
- Music *sp1 = MY_MAKE_MUSIC("SpanEvent");
- Music *sp2 = MY_MAKE_MUSIC("SpanEvent");
- sp1-> set_mus_property ("span-direction", gh_int2scm (START))
-;
- sp2-> set_mus_property ("span-direction", gh_int2scm (STOP))
-;
- SCM r = scm_makfrom0str ("rest");
- sp1->set_mus_property ("span-type", r);
- sp2->set_mus_property ("span-type", r);
-
- Music *rqc1 = MY_MAKE_MUSIC("RequestChord");
- rqc1->set_mus_property ("elements", scm_list_n (sp1->self_scm (), SCM_UNDEFINED));
- Music *rqc2 = MY_MAKE_MUSIC("RequestChord");
- rqc2->set_mus_property ("elements", scm_list_n (sk->self_scm (), SCM_UNDEFINED));;
- Music *rqc3 = MY_MAKE_MUSIC("RequestChord");
- rqc3->set_mus_property ("elements", scm_list_n (sp2->self_scm (), SCM_UNDEFINED));;
-
- SCM ms = scm_list_n (rqc1->self_scm (), rqc2->self_scm (), rqc3->self_scm (), SCM_UNDEFINED);
-
- $$ = MY_MAKE_MUSIC("SequentialMusic");
- $$->set_mus_property ("elements", ms);
- }
- | STRING optional_notemode_duration {
+ SCM proc = ly_scheme_function ("make-multi-measure-rest");
+ SCM mus = scm_call_2 (proc, $2,
+ make_input (THIS->here_input ()));
+ scm_gc_protect_object (mus);
+ $$ = unsmob_music (mus);
+ }
+
+ | lyric_element optional_notemode_duration {
Input i = THIS->pop_spot ();
+ if (!THIS->lexer_->is_lyric_state ())
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- Music * lreq = MY_MAKE_MUSIC("LyricEvent");
- lreq->set_mus_property ("text", $1);
- lreq->set_mus_property ("duration",$2);
+ Music *lreq = MY_MAKE_MUSIC ("LyricEvent");
+ lreq->set_property ("text", $1);
+ lreq->set_property ("duration",$2);
lreq->set_spot (i);
- Music * velt = MY_MAKE_MUSIC("RequestChord");
- velt->set_mus_property ("elements", scm_list_n (lreq->self_scm (), SCM_UNDEFINED));
+ Music *velt = MY_MAKE_MUSIC ("EventChord");
+ velt->set_property ("elements", scm_list_1 (lreq->self_scm ()));
$$= velt;
}
- | chord {
- Input i = THIS->pop_spot ();
+ | new_chord {
+ THIS->pop_spot ();
- if (!THIS->lexer_->chord_state_b ())
- THIS->parser_error (_ ("Have to be in Chord mode for chords"));
- $$ = $1;
+ if (!THIS->lexer_->is_chord_state ())
+ THIS->parser_error (_ ("Have to be in Chord mode for chords"));
+ $$ = unsmob_music ($1);
}
;
-
-chord:
- steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion chord_bass {
- $$ = Chord::get_chord ($1, $3, $4, $5, $6, $2);
- $$->set_spot (THIS->here_input ());
- };
-
-chord_additions:
- {
- $$ = SCM_EOL;
- }
- | CHORD_COLON chord_notes {
- $$ = $2;
+lyric_element:
+ /* FIXME: lyric flavoured markup would be better */
+ full_markup {
+ }
+ | LYRICS_STRING {
}
;
-chord_notes:
- chord_step {
- $$ = $1;
+new_chord:
+ steno_tonic_pitch optional_notemode_duration {
+ $$ = make_chord ($1, $2, SCM_EOL);
}
- | chord_notes '.' chord_step {
- $$ = gh_append2 ($$, $3);
+ | steno_tonic_pitch optional_notemode_duration chord_separator chord_items {
+ SCM its = scm_reverse_x ($4, SCM_EOL);
+ $$ = make_chord ($1, $2, scm_cons ($3, its));
}
;
-chord_subtractions:
- {
- $$ = SCM_EOL;
- }
- | CHORD_CARET chord_notes {
- $$ = $2;
+chord_items:
+ /**/ {
+ $$ = SCM_EOL;
+ }
+ | chord_items chord_item {
+ $$ = scm_cons ($2, $$);
}
;
-
-chord_inversion:
- {
- $$ = SCM_EOL;
+chord_separator:
+ CHORD_COLON {
+ $$ = ly_symbol2scm ("chord-colon");
}
- | CHORD_SLASH steno_tonic_pitch {
- $$ = $2;
+ | CHORD_CARET {
+ $$ = ly_symbol2scm ("chord-caret");
}
- ;
-
-chord_bass:
- {
- $$ = SCM_EOL;
+ | CHORD_SLASH steno_tonic_pitch {
+ $$ = scm_list_2 (ly_symbol2scm ("chord-slash"), $2);
}
| CHORD_BASS steno_tonic_pitch {
- $$ = $2;
+ $$ = scm_list_2 (ly_symbol2scm ("chord-bass"), $2);
}
;
-chord_step:
- chord_note {
- $$ = scm_cons ($1, SCM_EOL);
+chord_item:
+ chord_separator {
+ $$ = $1;
}
- | CHORDMODIFIER_PITCH {
- $$ = scm_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL);
+ | step_numbers {
+ $$ = scm_reverse_x ($1, SCM_EOL);
}
- | CHORDMODIFIER_PITCH chord_note { /* Ugh. */
- $$ = scm_list_n (unsmob_pitch ($1)->smobbed_copy (),
- $2, SCM_UNDEFINED);
+ | CHORD_MODIFIER {
+ $$ = $1;
}
;
-chord_note:
- bare_unsigned {
- Pitch m;
- m.notename_ = ($1 - 1) % 7;
- m.octave_ = $1 > 7 ? 1 : 0;
- m.alteration_ = 0;
+step_numbers:
+ step_number { $$ = scm_cons ($1, SCM_EOL); }
+ | step_numbers '.' step_number {
+ $$ = scm_cons ($3, $$);
+ }
+ ;
- $$ = m.smobbed_copy ();
- }
+step_number:
+ bare_unsigned {
+ $$ = make_chord_step ($1, 0);
+ }
| bare_unsigned '+' {
- Pitch m;
- m.notename_ = ($1 - 1) % 7;
- m.octave_ = $1 > 7 ? 1 : 0;
- m.alteration_ = 1;
-
-
- $$ = m.smobbed_copy ();
+ $$ = make_chord_step ($1, SHARP);
}
| bare_unsigned CHORD_MINUS {
- Pitch m;
- m.notename_ = ($1 - 1) % 7;
- m.octave_ = $1 > 7 ? 1 : 0;
- m.alteration_ = -1;
-
- $$ = m.smobbed_copy ();
+ $$ = make_chord_step ($1, FLAT);
}
- ;
+ ;
/*
UTILITIES
+
+TODO: should deprecate in favor of Scheme?
+
*/
number_expression:
number_expression '+' number_term {
| number_expression '-' number_term {
$$ = scm_difference ($1, $3);
}
- | number_term
+ | number_term
;
number_term:
;
number_factor:
- '(' number_expression ')' {
- $$ = $2;
- }
- | '-' number_factor { /* %prec UNARY_MINUS */
+ '-' number_factor { /* %prec UNARY_MINUS */
$$ = scm_difference ($2, SCM_UNDEFINED);
}
| bare_number
bare_number:
UNSIGNED {
- $$ = gh_int2scm ($1);
+ $$ = scm_int2num ($1);
}
| REAL {
$$ = $1;
| NUMBER_IDENTIFIER {
$$ = $1;
}
- | REAL CM_T {
- $$ = gh_double2scm (gh_scm2double ($1) CM );
- }
- | REAL PT_T {
- $$ = gh_double2scm (gh_scm2double ($1) PT);
+ | REAL NUMBER_IDENTIFIER {
+ $$ = scm_make_real (ly_scm2double ($1) *ly_scm2double ($2));
}
- | REAL IN_T {
- $$ = gh_double2scm (gh_scm2double ($1) INCH);
- }
- | REAL MM_T {
- $$ = gh_double2scm (gh_scm2double ($1) MM);
- }
- | REAL CHAR_T {
- $$ = gh_double2scm (gh_scm2double ($1) CHAR);
+ | UNSIGNED NUMBER_IDENTIFIER {
+ $$ = scm_make_real ($1 *ly_scm2double ($2));
}
;
bare_number {
if (scm_integer_p ($1) == SCM_BOOL_T)
{
- int k = gh_scm2int ($1);
+ int k = ly_scm2int ($1);
$$ = k;
} else
{
}
;
+exclamations:
+ { $$ = 0; }
+ | exclamations '!' { $$ ++; }
+ ;
+
+questions:
+ { $$ = 0; }
+ | questions '?' { $$ ++; }
+ ;
-string:
- STRING {
+
+
+full_markup:
+ MARKUP_IDENTIFIER {
+ $$ = $1;
+ }
+ | MARKUP
+ { THIS->lexer_->push_markup_state (); }
+ markup
+ { $$ = $3;
+ THIS->lexer_->pop_state ();
+ }
+ ;
+
+
+/*
+This should be done more dynamically if possible.
+*/
+markup:
+ STRING {
+ $$ = make_simple_markup (THIS->lexer_->encoding (), $1);
+ }
+ | MARKUP_HEAD_EMPTY {
+ $$ = scm_list_1 ($1);
+ }
+ | MARKUP_HEAD_MARKUP0 markup {
+ $$ = scm_list_2 ($1, $2);
+ }
+ | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
+ $$ = scm_list_3 ($1, $2, $3);
+ }
+ | MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup {
+ $$ = scm_list_3 ($1, $2, $3);
+ }
+ | markup_line {
$$ = $1;
}
- | STRING_IDENTIFIER {
+ | MARKUP_HEAD_LIST0 markup_list {
+ $$ = scm_list_2 ($1,$2);
+ }
+ | MARKUP_HEAD_SCM0 embedded_scm {
+ $$ = scm_list_2 ($1, $2);
+ }
+ | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm markup {
+ $$ = scm_list_4 ($1, $2, $3, $4);
+ }
+ | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm {
+ $$ = scm_list_4 ($1, $2, $3, $4);
+ }
+ | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
+ $$ = scm_list_3 ($1, $2, $3);
+ }
+ | MARKUP_IDENTIFIER {
$$ = $1;
}
- | string '+' string {
- $$ = scm_string_append (scm_list_n ($1, $3, SCM_UNDEFINED));
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
+ | score_block {
+ /* WIP this is a bit arbitrary,
+ we should also allow \book or Composite_music.
+ However, you'd typically want to change paper
+ settings, and need a \score block anyway. */
+ Score *score = $1;
+ Book *book = new Book;
+ book->scores_.push (score);
+ extern Music_output_def* get_paper (My_lily_parser *parser);
+ Music_output_def *paper = get_paper (THIS);
+ SCM s = book->to_stencil (paper, THIS->header_);
+ scm_gc_unprotect_object (score->self_scm ());
+ scm_gc_unprotect_object (book->self_scm ());
+ $$ = scm_list_2 (ly_scheme_function ("stencil-markup"), s);
}
;
+markup_list:
+ chord_open markup_list_body chord_close { $$ = scm_reverse_x ($2, SCM_EOL); }
+ ;
-exclamations:
- { $$ = 0; }
- | exclamations '!' { $$ ++; }
+markup_line:
+ '{' markup_list_body '}' {
+ SCM line = ly_scheme_function ("line-markup");
+
+ $$ = scm_list_2 (line, scm_reverse_x ($2, SCM_EOL));
+ }
;
-questions:
- { $$ = 0; }
- | questions '?' { $$ ++; }
+markup_list_body:
+ /**/ { $$ = SCM_EOL; }
+ | markup_list_body markup {
+ $$ = scm_cons ($2, $1);
+ }
;
My_lily_parser::set_yydebug (bool )
{
#if 0
- yydebug = b;
+ yydebug = 1;
#endif
}
-extern My_lily_parser * current_parser;
-
void
My_lily_parser::do_yyparse ()
{
-
- current_parser = this;;
yyparse ((void*)this);
}
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"));
+ Music *m = unsmob_music (last_beam_start_);
+ m->origin ()->warning (_ ("Suspect duration found following this beam"));
}
last_beam_start_ = SCM_EOL;
}
+
+
+
+
+/*
+
+It is a little strange to have this function in this file, but
+otherwise, we have to import music classes into the lexer.
+
+*/
+int
+My_lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
+{
+ if (ly_c_string_p (sid)) {
+ *destination = sid;
+ return STRING_IDENTIFIER;
+ } else if (ly_c_number_p (sid)) {
+ *destination = sid;
+ return NUMBER_IDENTIFIER;
+ } else if (unsmob_context_def (sid)) {
+ *destination = unsmob_context_def (sid)->clone_scm ();
+ return CONTEXT_DEF_IDENTIFIER;
+ } else if (unsmob_score (sid)) {
+ Score *score = new Score (*unsmob_score (sid));
+ *destination = score->self_scm ();
+ return SCORE_IDENTIFIER;
+ } else if (Music *mus = unsmob_music (sid)) {
+ mus = mus->clone ();
+ *destination = mus->self_scm ();
+ unsmob_music (*destination)->
+ set_property ("origin", make_input (last_input_));
+ return dynamic_cast<Event*> (mus)
+ ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
+ } else if (unsmob_duration (sid)) {
+ *destination = unsmob_duration (sid)->smobbed_copy ();
+ return DURATION_IDENTIFIER;
+ } else if (unsmob_music_output_def (sid)) {
+ Music_output_def *p = unsmob_music_output_def (sid);
+ p = p->clone ();
+
+ *destination = p->self_scm ();
+ return MUSIC_OUTPUT_DEF_IDENTIFIER;
+ } else if (Text_item::markup_p (sid)) {
+ *destination = sid;
+ return MARKUP_IDENTIFIER;
+ }
+
+ return -1;
+}
+
+Music *
+property_op_to_music (SCM op)
+{
+ Music *m = 0;
+ SCM tag = ly_car (op);
+ SCM symbol = ly_cadr (op);
+ SCM args = ly_cddr (op);
+ SCM grob_val = SCM_UNDEFINED;
+ SCM grob_sym = SCM_UNDEFINED;
+ SCM val = SCM_UNDEFINED;
+
+ if (tag == ly_symbol2scm ("assign"))
+ {
+ m = MY_MAKE_MUSIC ("PropertySet");
+ val = ly_car (args);
+ }
+ else if (tag == ly_symbol2scm ("unset"))
+ m = MY_MAKE_MUSIC ("PropertyUnset");
+ else if (tag == ly_symbol2scm ("poppush")
+ || tag == ly_symbol2scm ("push"))
+ {
+ m = MY_MAKE_MUSIC ("OverrideProperty");
+ grob_sym = ly_car (args);
+ grob_val = ly_cadr (args);
+ }
+ else if (tag == ly_symbol2scm ("pop")) {
+ m = MY_MAKE_MUSIC ("RevertProperty");
+ grob_sym = ly_car (args);
+ }
+
+ m->set_property ("symbol", symbol);
+
+ if (val != SCM_UNDEFINED)
+ m->set_property ("value", val);
+ if (grob_val != SCM_UNDEFINED)
+ m->set_property ("grob-value", grob_val);
+
+ if (grob_sym != SCM_UNDEFINED)
+ {
+ bool itc = internal_type_checking_global_b;
+ /* UGH.
+ */
+ bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm ("autoBeamSettings"));
+ if (autobeam)
+ internal_type_checking_global_b = false;
+ m->set_property ("grob-property", grob_sym);
+ if (autobeam)
+ internal_type_checking_global_b = itc;
+ }
+
+ if (op == ly_symbol2scm ("poppush"))
+ m->set_property ("pop-first", SCM_BOOL_T);
+
+
+ return m;
+}
+
+Music*
+context_spec_music (SCM type, SCM id, Music *m, SCM ops)
+{
+ Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
+
+ csm->set_property ("element", m->self_scm ());
+ scm_gc_unprotect_object (m->self_scm ());
+
+ csm->set_property ("context-type",
+ ly_c_symbol_p (type) ? type : scm_string_to_symbol (type));
+ csm->set_property ("property-operations", ops);
+
+ if (ly_c_string_p (id))
+ csm->set_property ("context-id", id);
+ return csm;
+}
+
+SCM
+get_next_unique_context ()
+{
+ static int new_context_count;
+ char s[1024];
+ snprintf (s, 1024, "uniqueContext%d", new_context_count++);
+ return scm_makfrom0str (s);
+}
+