%{ // -*-Fundamental-*-
/*
- parser.yy -- Bison/C++ parser for mudela
+ parser.yy -- Bison/C++ parser for lilypond
source file of the GNU LilyPond music typesetter
- (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include <iostream.h>
+/*
+ Two shift/reduce problems:
+
+1. foo = bar.
+
+ "bar" -> String -> Lyric -> Music -> music-assignment
+
+ "bar" -> String -> string-assignment
+
+
+2. \repeat
+ \repeat .. \alternative
+
+
+ \repeat { \repeat .. \alternative }
+
+or
+
+ \repeat { \repeat } \alternative
+
+)
+
+--hwn
+
+ */
+
+/*
+
+TODO:
+
+* The rules for who is protecting what are very shady. Uniformise
+ this.
+
+* There are too many lexical modes.
+
+
+*/
+
+#include <ctype.h>
+
+#include "translator-def.hh"
#include "lily-guile.hh"
-#include "notename-table.hh"
-#include "scalar.hh"
-#include "translation-property.hh"
-#include "lookup.hh"
#include "misc.hh"
#include "my-lily-lexer.hh"
#include "paper-def.hh"
#include "midi-def.hh"
#include "main.hh"
#include "file-path.hh"
-#include "keyword.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "dimensions.hh"
-#include "identifier.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
#include "my-lily-parser.hh"
-#include "context-specced-music.hh"
-#include "translator-group.hh"
#include "score.hh"
-#include "music-list.hh"
-#include "duration-convert.hh"
-#include "change-translator.hh"
-#include "file-results.hh"
-#include "scope.hh"
-#include "relative-music.hh"
-#include "lyric-combine-music.hh"
-#include "transposed-music.hh"
-#include "time-scaled-music.hh"
-#include "new-repeated-music.hh"
-#include "mudela-version.hh"
-#include "grace-music.hh"
+#include "input-file-results.hh"
+#include "input.hh"
+#include "lilypond-input-version.hh"
+#include "scm-hash.hh"
+#include "auto-change-iterator.hh"
+#include "chord.hh"
+#include "ly-modules.hh"
+#include "music-sequence.hh"
+#include "input-smob.hh"
+#include "event.hh"
+#include "text-item.hh"
+
+bool
+regular_identifier_b (SCM id)
+{
+ String str = ly_scm2string (id);
+ char const *s = str.to_str0 () ;
+
+ bool v = true;
+ while (*s && v)
+ {
+ v = v && isalpha (*s);
+ s++;
+ }
+ return v;
+}
+
+SCM
+make_simple_markup (SCM a)
+{
+ static SCM simple;
+ if (!simple)
+ simple = scm_c_eval_string ("simple-markup");
-// mmm
-Mudela_version oldest_version ("1.1.52");
+ return scm_list_n (simple, a, SCM_UNDEFINED);
+}
+bool
+is_duration_b (int t)
+{
+ return t && t == 1 << intlog2 (t);
+}
void
-print_mudela_versions (ostream &os)
+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));
+ }
+}
+
+
+
+#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
+
+Music*
+set_property_music (SCM sym, SCM value)
{
- os << "Oldest supported input version: " << oldest_version.str () << endl;
+ Music * p = MY_MAKE_MUSIC("PropertySet");
+ p->set_mus_property ("symbol", sym);
+ p->set_mus_property ("value", value);
+ return p;
}
-// needed for bison.simple's malloc() and free()
-#include <malloc.h>
-#ifndef NDEBUG
-#define YYDEBUG 1
-#endif
+
+// needed for bison.simple's malloc () and free ()
+
+// #include <malloc.h>
+#include <stdlib.h>
+
+
#define YYERROR_VERBOSE 1
-#define YYPARSE_PARAM my_lily_parser_l
-#define YYLEX_PARAM my_lily_parser_l
-#define THIS ((My_lily_parser *) my_lily_parser_l)
+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
-#define ARRAY_SIZE(a,s) if (a.size () != s) THIS->parser_error (_f("expecting %d arguments", s))
%}
+/* We use SCMs to do strings, because it saves us the trouble of
+deleting them. Let's hope that a stack overflow doesnt trigger a move
+of the parse stack onto the heap. */
+
%union {
- Array<Real>* realarr;
- Array<Musical_pitch> *pitch_arr;
- Link_array<Request> *reqvec;
- Array<String> * strvec;
- Array<int> *intvec;
- Notename_table *chordmodifiertab;
- Duration *duration;
- Identifier *id;
+ String * string;
Music *music;
- Music_list *music_list;
Score *score;
- Scope *scope;
- Interval *interval;
- Musical_req* musreq;
Music_output_def * outputdef;
- Musical_pitch * pitch;
- Midi_def* midi;
- Moment *moment;
- Notename_table *notenametab;
- Paper_def *paper;
- Real real;
- Request * request;
- Scalar *scalar;
-
- String *string;
- Tempo_req *tempo;
- Translator* trans;
- char c;
+ SCM scm;
int i;
- int ii[10];
}
%{
int
-yylex (YYSTYPE *s, void * v_l)
+yylex (YYSTYPE *s, void * v)
{
- My_lily_parser *pars_l = (My_lily_parser*) v_l;
- My_lily_lexer * lex_l = pars_l->lexer_p_;
+ My_lily_parser *pars = (My_lily_parser*) v;
+ My_lily_lexer * lex = pars->lexer_;
- lex_l->lexval_l = (void*) s;
- return lex_l->yylex ();
+ lex->lexval = (void*) s;
+ lex->prepare_for_next_token();
+ return lex->yylex ();
}
%pure_parser
/* tokens which are not keywords */
-
-%token TEXTSCRIPT
+%token AUTOCHANGE
+%token ALIAS
+%token APPLYCONTEXT
+%token APPLY
%token ACCEPTS
%token ALTERNATIVE
%token BAR
%token BREATHE
-%token CADENZA
%token CHORDMODIFIERS
%token CHORDS
-%token HYPHEN
%token CLEF
-%token CM_T
%token CONSISTS
-%token CONSISTSEND
%token DURATION
+%token SEQUENTIAL
+%token GROBDESCRIPTIONS
+%token SIMULTANEOUS
+%token CONSISTSEND
+%token DENIES
%token EXTENDER
-%token FONT
-%token GRACE
+%token FIGURES FIGURE_OPEN FIGURE_CLOSE
+%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
+%token GRACE
%token HEADER
-%token IN_T
+%token HYPHEN
%token INVALID
%token KEY
-%token KEYSIGNATURE
%token LYRICS
%token MARK
-%token MEASURES
+%token MULTI_MEASURE_REST
%token MIDI
-%token MM_T
-%token MUSICAL_PITCH
+%token PITCH
+%token DEFAULT
%token NAME
-%token NOTENAMES
+%token PITCHNAMES
%token NOTES
+%token ONCE
%token PAPER
%token PARTIAL
-%token PENALTY
%token PROPERTY
-%token PT_T
+%token OVERRIDE SET REVERT
%token RELATIVE
%token REMOVE
%token REPEAT
-%token REPETITIONS
%token ADDLYRICS
+%token PARTCOMBINE
%token SCM_T
-%token SCMFILE
%token SCORE
-%token SCRIPT
-%token SHAPE
%token SKIP
%token SPANREQUEST
+%token COMMANDSPANREQUEST
%token TEMPO
+%token OUTPUTPROPERTY
%token TIME_T
%token TIMES
%token TRANSLATOR
%token TRANSPOSE
%token TYPE
+%token UNSET
%token CONTEXT
-%token VERSION
+%token REST
+
+%token CHORD_OPEN
+%token CHORD_CLOSE
-/* escaped */
-%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR
-%type <i> exclamations questions
+/* escaped */
+%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE
+%token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE
+%token E_BACKSLASH
+%token <i> E_UNSIGNED
+%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 <pitch> NOTENAME_PITCH
-%token <pitch> TONICNAME_PITCH
-%token <pitch> CHORDMODIFIER_PITCH
-%token <id> DURATION_IDENTIFIER
+%token <scm> NOTENAME_PITCH
+%token <scm> TONICNAME_PITCH
+%token <scm> CHORDMODIFIER_PITCH
+%token <scm> DURATION_IDENTIFIER
+%token <scm> FRACTION
%token <id> IDENTIFIER
-%token <id> NOTENAME_TABLE_IDENTIFIER
-%token <id> MUSIC_IDENTIFIER
-%token <id> REQUEST_IDENTIFIER
-%token <id> REAL_IDENTIFIER
-%token <id> STRING_IDENTIFIER
-%token <id> TRANS_IDENTIFIER
-%token <id> INT_IDENTIFIER
-%token <id> SCORE_IDENTIFIER
-%token <id> MIDI_IDENTIFIER
-%token <id> PAPER_IDENTIFIER
-%token <real> REAL
-%token <string> DURATION RESTNAME
-%token <string> STRING
+%token <scm> CHORDNAMES CHORDNAMES_IDENTIFIER
+%type <scm> chordnames_block chordnames_list chord_scm
+
+
+%token <scm> SCORE_IDENTIFIER
+%token <scm> MUSIC_OUTPUT_DEF_IDENTIFIER
+%token <scm> NUMBER_IDENTIFIER
+%token <scm> EVENT_IDENTIFIER
+%token <scm> MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER
+%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
+%token <scm> RESTNAME
+%token <scm> STRING
+%token <scm> SCM_T
%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 <scope> mudela_header mudela_header_body
-%type <request> open_request_parens close_request_parens open_request close_request
-%type <request> request_with_dir request_that_take_dir verbose_request
+%type <scm> lilypond_header lilypond_header_body
+%type <music> open_event_parens close_event_parens open_event close_event
+%type <music> event_with_dir event_that_take_dir verbose_event
%type <i> sub_quotes sup_quotes
-%type <music> simple_element request_chord command_element Simple_music Composite_music
-%type <music> Alternative_music Repeated_music
-%type <i> abbrev_type
-%type <i> int unsigned
+%type <music> simple_element event_chord command_element Simple_music Composite_music
+%type <music> Repeated_music
+%type <scm> Alternative_music
+%type <i> tremolo_type
+%type <i> bare_int bare_unsigned
%type <i> script_dir
-%type <i> optional_modality
-%type <id> identifier_init
-%type <duration> steno_duration optional_notemode_duration
-%type <duration> entered_notemode_duration explicit_duration
-%type <intvec> int_list
-%type <reqvec> pre_requests post_requests
-%type <request> gen_text_def
-%type <pitch> explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
-%type <pitch> steno_tonic_pitch
-
-%type <pitch_arr> pitch_list
+%type <scm> identifier_init
+
+%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 <scm> verbose_duration
+
+%type <scm> pre_events post_events
+%type <music> gen_text_def
+%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
%type <music> chord
-%type <pitch_arr> chord_additions chord_subtractions chord_notes chord_step
-%type <pitch> chord_note chord_inversion
-%type <midi> midi_block midi_body
-%type <duration> duration_length
-
-%type <scalar> scalar
-%type <music> Music Sequential_music Simultaneous_music Music_sequence
-%type <music> relative_music re_rhythmed_music
-%type <music> property_def translator_change
-%type <music_list> Music_list
-%type <paper> paper_block paper_def_body
-%type <real> real real_with_dimension
-%type <request> abbrev_command_req
-%type <request> post_request
-%type <request> command_req verbose_command_req
-%type <request> extender_req
-%type <request> hyphen_req
-%type <string> string
+%type <scm> chord_note chord_inversion chord_bass
+%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_event
+%type <music> command_req verbose_command_req
+%type <music> extender_req
+%type <music> hyphen_req
+%type <music> string_event
+%type <scm> string bare_number number_expression number_term number_factor
%type <score> score_block score_body
-%type <realarr> real_array
-%type <string> script_abbreviation
-%type <trans> translator_spec_block translator_spec_body
-%type <tempo> tempo_request
-%type <notenametab> notenames_body notenames_block chordmodifiers_block
+%type <scm> translator_spec_block translator_spec_body
+%type <music> tempo_event
+%type <scm> notenames_body notenames_block chordmodifiers_block
+%type <scm> script_abbreviation
%left '-' '+'
-%left '*' '/'
+
+/* We don't assign precedence to / and *, because we might need varied
+prec levels in different prods */
+
%left UNARY_MINUS
%%
-mudela: /* empty */
- | mudela toplevel_expression {}
- | mudela assignment { }
- | mudela error
- | mudela INVALID {
- THIS->error_level_i_ =1;
+lilypond: /* empty */
+ | lilypond toplevel_expression {}
+ | lilypond assignment { }
+ | lilypond error {
+ THIS->error_level_ = 1;
+ }
+ | lilypond INVALID {
+ THIS->error_level_ = 1;
}
;
toplevel_expression:
notenames_block {
- THIS->lexer_p_->set_notename_table ($1);
+ THIS->lexer_->pitchname_tab_ = $1;
}
| chordmodifiers_block {
- THIS->lexer_p_->set_chordmodifier_table ($1);
+ THIS->lexer_->chordmodifier_tab_ = $1;
}
- | mudela_header {
- delete header_global_p;
- header_global_p = $1;
+ | lilypond_header {
+ THIS->input_file_->header_ = $1;
}
| score_block {
- score_global_array.push ($1);
+ THIS->input_file_->scores_.push ($1);
}
- | paper_block {
- Identifier * id = new
- Paper_def_identifier ($1, PAPER_IDENTIFIER);
- THIS->lexer_p_->set_identifier ("$defaultpaper", id)
- }
- | midi_block {
- Identifier * id = new
- Midi_def_identifier ($1, MIDI_IDENTIFIER);
- THIS->lexer_p_->set_identifier ("$defaultmidi", id)
- }
- | embedded_scm {
+ | output_def {
+ if (dynamic_cast<Paper_def*> ($1))
+ THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultpaper"), $1->self_scm ());
+ else if (dynamic_cast<Midi_def*> ($1))
+ THIS->lexer_->set_identifier (scm_makfrom0str ("$defaultmidi"), $1->self_scm ());
}
;
embedded_scm:
- SCMFILE STRING semicolon {
- read_lily_scm_file (*$2);
- delete $2;
- }
- | SCM_T STRING semicolon {
- if (THIS->lexer_p_->main_input_b_ && safe_global_b)
- error (_("Cannot evaluate Scheme in safe mode"));
- gh_eval_str ($2->ch_l ());
- delete $2;
- };
+ SCM_T
+ | SCM_IDENTIFIER
+ ;
chordmodifiers_block:
- CHORDMODIFIERS '{' notenames_body '}' { $$ = $3; }
+ CHORDMODIFIERS notenames_body { $$ = $2; }
;
-
notenames_block:
- NOTENAMES '{' notenames_body '}' { $$ = $3; }
+ PITCHNAMES notenames_body { $$ = $2; }
;
-
-
notenames_body:
- /**/ {
- $$ = new Notename_table;
- }
- | NOTENAME_TABLE_IDENTIFIER {
- $$ = $1-> access_content_Notename_table(true);
- }
- | notenames_body STRING '=' explicit_musical_pitch {
- (*$$)[*$2] = *$4;
+ embedded_scm {
+ int i = scm_ilength ($1);
- delete $4;
- delete $2;
+ 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;
}
;
-mudela_header_body:
+lilypond_header_body:
{
- $$ = new Scope;
- THIS->lexer_p_-> scope_l_arr_.push ($$);
+ $$ = ly_make_anonymous_module ();
+ THIS->lexer_->add_scope ($$);
}
- | mudela_header_body assignment semicolon {
-
+ | lilypond_header_body assignment {
+
}
;
-mudela_header:
- HEADER '{' mudela_header_body '}' {
- $$ = $3;
- THIS->lexer_p_-> scope_l_arr_.pop ();
+lilypond_header:
+ HEADER '{' lilypond_header_body '}' {
+ $$ = THIS->lexer_-> remove_scope();
}
;
*/
assignment:
STRING {
- THIS->remember_spot ();
+ THIS->push_spot ();
}
/* cont */ '=' identifier_init {
- THIS->lexer_p_->set_identifier (*$1, $4);
- $4->init_b_ = THIS->init_parse_b_;
- $4->set_spot (THIS->pop_spot ());
+
+ /*
+ Should find generic way of associating input with objects.
+ */
+ Input ip = THIS->pop_spot ();
+
+ if (! regular_identifier_b ($1))
+ {
+ ip.warning (_ ("Identifier should have alphabetic characters only"));
+ }
+
+ THIS->lexer_->set_identifier ($1, $4);
+
+/*
+ TODO: devise standard for protection in parser.
+
+ The parser stack lives on the C-stack, which means that
+all objects can be unprotected as soon as they're here.
+
+*/
}
+ | embedded_scm { }
;
identifier_init:
score_block {
- $$ = new Score_identifier ($1, SCORE_IDENTIFIER);
-
- }
- | chordmodifiers_block {
- $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
+ $$ = $1->self_scm ();
+ scm_gc_unprotect_object ($$);
}
- | notenames_block {
- $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER);
- }
- | paper_block {
- $$ = new Paper_def_identifier ($1, PAPER_IDENTIFIER);
+ | full_markup {
+ $$ = $1;
}
- | midi_block {
- $$ = new Midi_def_identifier ($1, MIDI_IDENTIFIER);
-
+ | output_def {
+ $$ = $1->self_scm ();
+ scm_gc_unprotect_object ($$);
}
| translator_spec_block {
- $$ = new Translator_identifier ($1, TRANS_IDENTIFIER);
+ $$ = $1;
}
| Music {
- $$ = new Music_identifier ($1, MUSIC_IDENTIFIER);
+ $$ = $1->self_scm ();
+ scm_gc_unprotect_object ($$);
}
-
- | post_request {
- $$ = new Request_identifier ($1, REQUEST_IDENTIFIER);
+ | post_event {
+ $$ = $1->self_scm ();
+ scm_gc_unprotect_object ($$);
}
- | explicit_duration {
- $$ = new Duration_identifier ($1, DURATION_IDENTIFIER);
+ | verbose_duration {
+ $$ = $1;
}
- | real {
- $$ = new Real_identifier (new Real ($1), REAL_IDENTIFIER);
+ | number_expression {
+ $$ = $1;
}
| string {
- $$ = new String_identifier ($1, STRING_IDENTIFIER);
+ $$ = $1;
}
- | int {
- $$ = new int_identifier (new int ($1), INT_IDENTIFIER);
+ | 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 '}'
{
;
translator_spec_body:
- TRANS_IDENTIFIER {
- $$ = $1->access_content_Translator (true);
- $$-> set_spot (THIS->here_input ());
+ TRANSLATOR_IDENTIFIER {
+ $$ = $1;
+ unsmob_translator_def ($$)-> set_spot (THIS->here_input ());
}
- | TYPE STRING semicolon {
- Translator* t = get_translator_l (*$2);
- Translator_group * tg = dynamic_cast<Translator_group*> (t);
-
- if (!tg)
- THIS->parser_error (_("Need a translator group for a context"));
-
- t = t->clone ();
- t->set_spot (THIS->here_input ());
- $$ = t;
- delete $2;
+ | 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 '=' identifier_init semicolon {
- Identifier* id = $4;
- String_identifier *s = dynamic_cast<String_identifier*> (id);
- Real_identifier *r= dynamic_cast<Real_identifier*>(id);
- int_identifier *i = dynamic_cast<int_identifier*> (id);
-
- String str;
- if (s) str = *s->access_content_String (false);
- if (i) str = to_str (*i->access_content_int (false));
- if (r) str = to_str (*r->access_content_Real (false));
- if (!s && !i && !r)
- THIS->parser_error (_("Wrong type for property value"));
-
- delete $4;
- /* ugh*/
- Translator_group * tr = dynamic_cast<Translator_group*>($$);
- tr->set_property (*$2, str);
+ | translator_spec_body STRING '=' embedded_scm {
+ unsmob_translator_def ($$)->add_property_assign ($2, $4);
+ }
+ | 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;
+ }
+ | translator_spec_body CONSISTS STRING {
+ unsmob_translator_def ($$)->add_element ($3);
+ }
+ | translator_spec_body ALIAS STRING {
+ Translator_def*td = unsmob_translator_def ($$);
+ td->type_aliases_ = scm_cons ($3, td->type_aliases_);
}
- | translator_spec_body NAME STRING semicolon {
- $$->type_str_ = *$3;
- delete $3;
+ | translator_spec_body GROBDESCRIPTIONS embedded_scm {
+ Translator_def*td = unsmob_translator_def($$);
+ // td->add_property_assign (ly_symbol2scm ("allGrobDescriptions"), $3);
+ for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p))
+ td->add_property_assign (scm_symbol_to_string (ly_caar (p)), ly_cdar (p));
}
- | translator_spec_body CONSISTS STRING semicolon {
- dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
- delete $3;
+ | translator_spec_body CONSISTSEND STRING {
+ unsmob_translator_def ($$)->add_last_element ( $3);
}
- | translator_spec_body CONSISTSEND STRING semicolon {
- dynamic_cast<Translator_group*> ($$)-> set_element (*$3, true);
- delete $3;
+ | translator_spec_body ACCEPTS STRING {
+ unsmob_translator_def ($$)->set_acceptor ($3,true);
}
- | translator_spec_body ACCEPTS STRING semicolon {
- dynamic_cast<Translator_group*> ($$)-> set_acceptor (*$3, true);
- delete $3;
+ | translator_spec_body DENIES STRING {
+ unsmob_translator_def ($$)->set_acceptor ($3,false);
}
- | translator_spec_body REMOVE STRING semicolon {
- dynamic_cast<Translator_group*> ($$)-> set_element (*$3, false);
- delete $3;
+ | translator_spec_body REMOVE STRING {
+ unsmob_translator_def ($$)->remove_element ($3);
}
;
*/
score_block:
SCORE {
+ THIS->push_spot ();
}
/*cont*/ '{' score_body '}' {
+ THIS->pop_spot ();
$$ = $4;
- if (!$$->def_p_arr_.size ())
- $$->add_output (THIS->default_paper_p ());
+ if (!$$->defs_.size ())
+ {
+ Music_output_def *id =
+ unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"));
+ $$->add_output (id ? id->clone () : new Paper_def );
+ }
}
;
-score_body: {
+score_body:
+ Music {
$$ = new Score;
+
$$->set_spot (THIS->here_input ());
+ SCM m = $1->self_scm ();
+ scm_gc_unprotect_object (m);
+
+ /*
+ guh.
+ */
+ SCM check_funcs = scm_c_eval_string ("toplevel-music-functions");
+ for (; gh_pair_p (check_funcs); check_funcs = gh_cdr (check_funcs))
+ m = gh_call1 (gh_car (check_funcs), m);
+ $$->music_ = m;
+
}
| SCORE_IDENTIFIER {
- $$ = $1->access_content_Score (true);
- }
- | score_body mudela_header {
- $$->header_p_ = $2;
+ $$ = unsmob_score ($1);
+ $$->set_spot (THIS->here_input ());
}
- | score_body Music {
- if ($$->music_p_)
- $2->warning (_ ("More than one music block"));
- $$->music_p_ = $2;
+ | score_body lilypond_header {
+ $$->header_ = $2;
}
| score_body output_def {
$$->add_output ($2);
}
;
+
+/*
+ MIDI
+*/
output_def:
- paper_block {
+ music_output_def_body '}' {
$$ = $1;
- }
- | midi_block {
- $$= $1;
+ THIS-> lexer_-> remove_scope ();
}
;
+music_output_def_body:
+ MIDI '{' {
+ Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi"));
-/*
- PAPER
-*/
-paper_block:
- PAPER '{' paper_def_body '}' {
- $$ = $3;
- THIS-> lexer_p_->scope_l_arr_.pop ();
- }
- ;
+ Midi_def* p =0;
+ if (id)
+ p = dynamic_cast<Midi_def*> (id->clone ());
+ else
+ p = new Midi_def;
-paper_def_body:
- /* empty */ {
- Paper_def *p = THIS->default_paper_p ();
- THIS-> lexer_p_-> scope_l_arr_.push (p->scope_p_);
- $$ = p;
- }
- | PAPER_IDENTIFIER {
- Paper_def *p = $1->access_content_Paper_def (true);
- THIS->lexer_p_->scope_l_arr_.push (p->scope_p_);
$$ = p;
+ THIS->lexer_->add_scope (p->scope_);
}
- | paper_def_body int '=' FONT STRING { // ugh, what a syntax
- Lookup * l = new Lookup;
- l->font_name_ = *$5;
- delete $5;
- $$->set_lookup ($2, l);
- }
- | paper_def_body assignment semicolon {
+ | 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_def_body translator_spec_block {
- $$->assign_translator ($2);
- }
- | paper_def_body SHAPE real_array semicolon {
- /*
- URG URG.
- */
- if ($3->size () % 2)
- warning ("Need even number of args for shape array");
+ | PAPER '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
+ Music_output_def * o = unsmob_music_output_def ($3);
+ $$ =o;
- for (int i=0; i < $3->size (); i+=2)
- {
- Real l = $3->elem (i);
- $$->shape_int_a_.push (Interval (l,
- l + $3->elem (i+1)));
- }
- delete $3;
+ THIS->lexer_->add_scope (o->scope_);
}
- | paper_def_body error {
+ | MIDI '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
+ Music_output_def * o = unsmob_music_output_def ($3);
+ $$ = o;
+ THIS->lexer_->add_scope (o->scope_);
}
- ;
-
-
+ | music_output_def_body assignment {
-real_with_dimension:
- REAL CM_T {
- $$ = $1 CM;
}
- | REAL PT_T {
- $$ = $1 PT;
- }
- | REAL IN_T {
- $$ = $1 INCH;
+ | music_output_def_body translator_spec_block {
+ $$->assign_translator ($2);
}
- | REAL MM_T {
- $$ = $1 MM;
+ | 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 ("tempo-unit"));
+ Midi_def * md = dynamic_cast<Midi_def*> ($$);
+ if (md)
+ md->set_tempo (d->get_length (), m);
}
- ;
+ | music_output_def_body error {
-real:
- REAL {
- $$ = $1;
- }
- | real_with_dimension
- | REAL_IDENTIFIER {
- $$= *$1->access_content_Real (false);
- }
- | '-' real %prec UNARY_MINUS {
- $$ = -$2;
- }
- | real '*' real {
- $$ = $1 * $3;
- }
- | real '/' real {
- $$ = $1 / $3;
- }
- | real '+' real {
- $$ = $1 + $3;
- }
- | real '-' real {
- $$ = $1 - $3;
- }
- | '(' real ')' {
- $$ = $2;
}
;
-
-real_array:
- real {
- $$ = new Array<Real>;
- $$->push ($1);
- }
- | /* empty */ {
- $$ = new Array<Real>;
- }
- | real_array ',' real {
- $$->push($3);
+tempo_event:
+ TEMPO steno_duration '=' bare_unsigned {
+ $$ = MY_MAKE_MUSIC("TempoEvent");
+ $$->set_mus_property ("tempo-unit", $2);
+ $$->set_mus_property ("metronome-count", gh_int2scm ( $4));
}
;
/*
- MIDI
-*/
-midi_block:
- MIDI
-
- '{' midi_body '}' { $$ = $3; }
- ;
-
-midi_body: /* empty */ {
- $$ = THIS->default_midi_p ();
- }
- | MIDI_IDENTIFIER {
- $$ = $1-> access_content_Midi_def (true);
- }
- | midi_body assignment semicolon {
-
- }
- | midi_body translator_spec_block {
- $$-> assign_translator ($2);
- }
- | midi_body tempo_request semicolon {
- $$->set_tempo ($2->dur_.length_mom (), $2->metronome_i_);
- delete $2;
- }
- | midi_body error {
-
- }
- ;
+The representation of a list is the
-tempo_request:
- TEMPO steno_duration '=' unsigned {
- $$ = new Tempo_req;
- $$->dur_ = *$2;
- delete $2;
- $$-> metronome_i_ = $4;
- }
- ;
+ (LIST . LAST-CONS)
-Music_list: /* empty */ {
- $$ = new Music_list;
- $$->set_spot (THIS->here_input ());
+ to have efficient append.
+*/
+Music_list:
+ /* empty */ {
+ $$ = scm_cons (SCM_EOL, SCM_EOL);
}
| Music_list Music {
- $$->add_music ($2);
+ SCM s = $$;
+ 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 */
+ else
+ gh_set_car_x (s, c); /* set first cons */
+ gh_set_cdr_x (s, c) ; /* remember last cell */
}
| Music_list error {
}
Alternative_music:
/* empty */ {
- $$ = 0;
+ $$ = SCM_EOL;
}
- | ALTERNATIVE Music_sequence {
- $$ = $2;
- $2->set_spot (THIS->here_input ());
+ | ALTERNATIVE '{' Music_list '}' {
+ $$ = $3;
}
;
+Repeated_music:
+ REPEAT string bare_unsigned Music Alternative_music
+ {
+ Music *beg = $4;
+ int times = $3;
+ SCM alts = gh_pair_p ($5) ? gh_car ($5) : SCM_EOL;
+ if (times < scm_ilength (alts)) {
+ unsmob_music (gh_car (alts))
+ ->origin ()->warning (
+ _("More alternatives than repeats. Junking excess alternatives."));
+ alts = ly_truncate_list (times, alts);
+ }
+
+ static SCM proc;
+ if (!proc)
+ proc = scm_c_eval_string ("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 ());
+ scm_gc_unprotect_object (beg->self_scm ());
+ }
+ r->set_mus_property ("repeat-count", gh_int2scm (times >? 1));
-Repeated_music:
- REPEAT STRING unsigned Music Alternative_music
- {
- Music_sequence* m = dynamic_cast <Music_sequence*> ($5);
- if (m && $3 < m->length_i ())
- $5->warning ("More alternatives than repeats. Junking excess alternatives.");
+ r-> set_mus_property ("elements",alts);
+ 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));
+ }
+ r->set_spot (*$4->origin ());
- Repeated_music * r = new Repeated_music ($4, $3 >? 1, m);
$$ = r;
- r->fold_b_ = (*$2 == "fold");
- r->semi_fold_b_ = (*$2 == "semi");
- delete $2;
- r->set_spot ($4->spot ());
}
;
-Music_sequence: '{' Music_list '}' {
- $$ = new Music_sequence ($2);
- $$->set_spot ($2->spot ());
+Sequential_music:
+ SEQUENTIAL '{' Music_list '}' {
+ $$ = MY_MAKE_MUSIC("SequentialMusic");
+ $$->set_mus_property ("elements", ly_car ($3));
+ $$->set_spot(THIS->here_input());
}
- ;
-
-Sequential_music: '{' Music_list '}' {
- $$ = new Sequential_music ($2);
- $$->set_spot ($2->spot ());
+ | '{' Music_list '}' {
+ $$ = MY_MAKE_MUSIC("SequentialMusic");
+ $$->set_mus_property ("elements", ly_car ($2));
+ $$->set_spot(THIS->here_input());
}
;
-Simultaneous_music: '<' Music_list '>' {
- $$ = new Simultaneous_music ($2);
- $$->set_spot ($2->spot ());
+Simultaneous_music:
+ SIMULTANEOUS '{' Music_list '}'{
+ $$ = MY_MAKE_MUSIC("SimultaneousMusic");
+ $$->set_mus_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());
}
;
Simple_music:
- request_chord { $$ = $1; }
- | MUSIC_IDENTIFIER { $$ = $1->access_content_Music (true); }
- | property_def
- | translator_change
- | Simple_music '*' unsigned '/' unsigned {
- /* urg */
- $$ = new Time_scaled_music ($3, $5, $1);
+ 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))
+ {
+ 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"));
+ }
+
+ 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;
}
- | Simple_music '*' unsigned {
- $$ = new Time_scaled_music ($3, 1, $1);
+ | MUSIC_IDENTIFIER {
+ $$ = unsmob_music ($1);
}
+ | property_def
+ | translator_change
;
Composite_music:
CONTEXT STRING Music {
- Context_specced_music *csm = new Context_specced_music ($3);
+ Music*csm =MY_MAKE_MUSIC("ContextSpeccedMusic");
+
+ csm->set_mus_property ("element", $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
- csm->translator_type_str_ = *$2;
- csm->translator_id_str_ = "";
- delete $2;
+ csm->set_mus_property ("context-type",$2);
+ csm->set_mus_property ("context-id", scm_makfrom0str (""));
$$ = csm;
}
+ | AUTOCHANGE STRING Music {
+ Music*chm = MY_MAKE_MUSIC("AutoChangeMusic");
+ chm->set_mus_property ("element", $3->self_scm ());
+ chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_proc);
+
+ scm_gc_unprotect_object ($3->self_scm ());
+ chm->set_mus_property ("what", $2);
+
+ $$ = chm;
+ chm->set_spot (*$3->origin ());
+ }
| GRACE Music {
- $$ = new Grace_music ($2);
+#if 1
+ /*
+ The other version is for easier debugging of
+ Sequential_music_iterator in combination with grace notes.
+ */
+
+ SCM start = THIS->lexer_->lookup_identifier ("startGraceMusic");
+ SCM stop = THIS->lexer_->lookup_identifier ("stopGraceMusic");
+ Music *startm = unsmob_music (start);
+ Music *stopm = unsmob_music (stop);
+
+ SCM ms = SCM_EOL;
+ if (stopm) {
+ stopm = stopm->clone ();
+ ms = scm_cons (stopm->self_scm (), ms);
+ scm_gc_unprotect_object (stopm->self_scm ());
+ }
+ ms = scm_cons ($2->self_scm (), ms);
+ scm_gc_unprotect_object ($2->self_scm());
+ if (startm) {
+ startm = startm->clone ();
+ 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);
+
+
+ $$ = MY_MAKE_MUSIC("GraceMusic");
+ $$->set_mus_property ("element", seq->self_scm ());
+ scm_gc_unprotect_object (seq->self_scm ());
+#else
+ $$ = MY_MAKE_MUSIC("GraceMusic");
+ $$->set_mus_property ("element", $2->self_scm ());
+ scm_gc_unprotect_object ($2->self_scm ());
+#endif
}
- | CONTEXT STRING '=' STRING Music {
- Context_specced_music *csm = new Context_specced_music ($5);
+ | CONTEXT string '=' string Music {
+ Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->translator_type_str_ = *$2;
- csm->translator_id_str_ = *$4;
- delete $2;
- delete $4;
+ csm->set_mus_property ("element", $5->self_scm ());
+ scm_gc_unprotect_object ($5->self_scm ());
+
+ csm->set_mus_property ("context-type", $2);
+ csm->set_mus_property ("context-id", $4);
$$ = csm;
}
| TIMES {
- THIS->remember_spot ();
+ THIS->push_spot ();
}
/* CONTINUED */
- unsigned '/' unsigned Music
+ fraction Music
{
- $$ = new Time_scaled_music ($3, $5, $6);
+ int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3));
+ Music *mp = $4;
+ $$= MY_MAKE_MUSIC("TimeScaledMusic");
$$->set_spot (THIS->pop_spot ());
+
+
+ $$->set_mus_property ("element", mp->self_scm ());
+ scm_gc_unprotect_object (mp->self_scm ());
+ $$->set_mus_property ("numerator", gh_int2scm (n));
+ $$->set_mus_property ("denominator", gh_int2scm (d));
+ $$->compress (Moment (Rational (n,d)));
+
}
| Repeated_music { $$ = $1; }
| Simultaneous_music { $$ = $1; }
| Sequential_music { $$ = $1; }
- | TRANSPOSE musical_pitch Music {
- $$ = new Transposed_music ($3, *$2);
- delete $2;
- }
- | TRANSPOSE steno_tonic_pitch Music {
- $$ = new Transposed_music ($3, *$2);
- delete $2;
+ | 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_mus_property ("element", p->self_scm ());
+ scm_gc_unprotect_object (p->self_scm ());
+ }
+ | APPLY embedded_scm Music {
+ SCM ret = gh_call1 ($2, $3->self_scm ());
+ Music *m = unsmob_music (ret);
+ if (!m) {
+ THIS->parser_error ("\\apply must return a Music");
+ m = MY_MAKE_MUSIC("Music");
+ }
+ $$ = m;
}
| NOTES
- { THIS->lexer_p_->push_note_state (); }
+ { THIS->lexer_->push_note_state (); }
Music
{ $$ = $3;
- THIS->lexer_p_->pop_state ();
+ THIS->lexer_->pop_state ();
}
+ | FIGURES
+ { THIS->lexer_->push_figuredbass_state (); }
+ Music
+ {
+ Music * chm = MY_MAKE_MUSIC("UntransposableMusic");
+ chm->set_mus_property ("element", $3->self_scm ());
+ $$ = chm;
+ scm_gc_unprotect_object ($3->self_scm());
+
+ THIS->lexer_->pop_state ();
+ }
| CHORDS
- { THIS->lexer_p_->push_chord_state (); }
+ { THIS->lexer_->push_chord_state (); }
Music
{
- $$ = $3;
- THIS->lexer_p_->pop_state ();
+ Music * chm = MY_MAKE_MUSIC("UnrelativableMusic");
+ chm->set_mus_property ("element", $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm());
+ $$ = chm;
+
+ THIS->lexer_->pop_state ();
}
| LYRICS
- { THIS->lexer_p_->push_lyric_state (); }
+ { THIS->lexer_->push_lyric_state (); }
Music
{
$$ = $3;
- THIS->lexer_p_->pop_state ();
+ THIS->lexer_->pop_state ();
}
| relative_music { $$ = $1; }
| re_rhythmed_music { $$ = $1; }
+ | part_combined_music { $$ = $1; }
;
relative_music:
- RELATIVE absolute_musical_pitch Music {
- $$ = new Relative_octave_music ($3, *$2);
- delete $2;
+ 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 ());
+
}
;
re_rhythmed_music:
ADDLYRICS Music Music {
- Lyric_combine_music * l = new Lyric_combine_music ($2, $3);
- $$ = l;
+ 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;
+ }
+ ;
+
+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));
+
+ scm_gc_unprotect_object ($3->self_scm ());
+ scm_gc_unprotect_object ($4->self_scm ());
+
+ $$ = p;
}
;
translator_change:
TRANSLATOR STRING '=' STRING {
- Change_translator * t = new Change_translator;
- t-> change_to_type_str_ = *$2;
- t-> change_to_id_str_ = *$4;
+ Music*t= MY_MAKE_MUSIC("TranslatorChange");
+ t-> set_mus_property ("change-to-type", $2);
+ t-> set_mus_property ("change-to-id", $4);
$$ = t;
$$->set_spot (THIS->here_input ());
- delete $2;
- delete $4;
}
;
property_def:
- PROPERTY STRING '.' STRING '=' scalar {
- Translation_property *t = new Translation_property;
+ 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);
+ }
+ ;
- t-> var_str_ = *$4;
- t-> value_ = *$6;
+simple_property_def:
+ PROPERTY STRING '.' STRING '=' scalar {
+ Music *t = set_property_music (scm_string_to_symbol ($4), $6);
+ Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+
+ csm->set_mus_property ("element", t->self_scm ());
+ scm_gc_unprotect_object (t->self_scm ());
- Context_specced_music *csm = new Context_specced_music (t);
$$ = csm;
$$->set_spot (THIS->here_input ());
- csm-> translator_type_str_ = *$2;
-
- delete $2;
- delete $4;
- delete $6;
+ csm-> set_mus_property ("context-type", $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 ());
+
+ $$ = csm;
+ $$->set_spot (THIS->here_input ());
+
+ csm-> set_mus_property ("context-type", $2);
+ }
+ | 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");
+ 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);
+ }
+ | 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;
+
+ 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;
+
+ 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);
+
+ }
+ | 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 ());
+
+ $$ = csm;
+ $$->set_spot (THIS->here_input ());
+
+ csm-> set_mus_property ("context-type", $2);
}
;
+
scalar:
- string { $$ = new Scalar (*$1); delete $1; }
- | int { $$ = new Scalar ($1); }
- ;
+ string { $$ = $1; }
+ | bare_int { $$ = gh_int2scm ($1); }
+ | embedded_scm { $$ = $1; }
+ | full_markup { $$ = $1; }
+ ;
-request_chord:
- pre_requests simple_element post_requests {
- Music_sequence *l = dynamic_cast<Music_sequence*>($2);
- for (int i=0; i < $1->size(); i++)
- l->add_music ($1->elem(i));
- for (int i=0; i < $3->size(); i++)
- l->add_music ($3->elem(i));
- $$ = $2;
-
+event_chord:
+ pre_events {
+ THIS->push_spot ();
+ } /*cont */ simple_element post_events {
+ SCM elts = $3-> get_mus_property ("elements");
+
+ elts = gh_append3 (elts, scm_reverse_x ($1, SCM_EOL),
+ scm_reverse_x ($4, SCM_EOL));
+
+ $3-> set_mus_property ("elements", elts);
+ $$ = $3;
}
| command_element
+ | note_chord_element
+ ;
+
+
+note_chord_element:
+ chord_body optional_notemode_duration post_events
+ {
+ SCM dur = unsmob_duration ($2)->smobbed_copy();
+ SCM es = $1->get_mus_property ("elements");
+ SCM postevs = scm_reverse_x ($3, SCM_EOL);
+
+ for (SCM s = es; gh_pair_p (s); s = gh_cdr (s))
+ unsmob_music (gh_car(s))->set_mus_property ("duration", dur);
+ es = gh_append2 (es, postevs);
+
+ $1-> set_mus_property ("elements", es);
+ $$ = $1;
+ }
+ ;
+
+chord_body:
+ CHORD_OPEN chord_body_elements CHORD_CLOSE
+ {
+ $$ = MY_MAKE_MUSIC("EventChord");
+ $$->set_mus_property ("elements",
+ scm_reverse_x ($2, SCM_EOL));
+ }
+ ;
+
+chord_body_elements:
+ /* empty */ { $$ = SCM_EOL; }
+ | chord_body_elements chord_body_element {
+ $$ = gh_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_mus_property ("pitch", $1);
+ if ($3 % 2)
+ n->set_mus_property ("cautionary", SCM_BOOL_T);
+ if ($2 % 2 || $3 % 2)
+ n->set_mus_property ("force-accidental", SCM_BOOL_T);
+
+ SCM arts = scm_reverse_x ($4, SCM_EOL);
+ n->set_mus_property ("articulations", arts);
+
+ $$ = n;
+ }
;
command_element:
command_req {
- $$ = new Request_chord;
+ $$ = MY_MAKE_MUSIC("EventChord");
+ $$->set_mus_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 ());
- ((Simultaneous_music*)$$) ->add_music ($1);//ugh
+ }
+ | E_LEFTSQUARE {
+ Music *l = MY_MAKE_MUSIC("LigatureEvent");
+ l->set_mus_property ("span-direction", gh_int2scm (START));
+ l->set_spot (THIS->here_input ());
+
+ $$ = MY_MAKE_MUSIC("EventChord");
+ $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
+ scm_gc_unprotect_object (l->self_scm());
+ $$->set_spot (THIS->here_input ());
+ }
+ | E_RIGHTSQUARE {
+ Music *l = MY_MAKE_MUSIC("LigatureEvent");
+ l->set_mus_property ("span-direction", gh_int2scm (STOP));
+ l->set_spot (THIS->here_input ());
+
+ $$ = 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());
+ }
+ | E_BACKSLASH {
+ $$ = MY_MAKE_MUSIC("VoiceSeparator");
+ $$->set_spot (THIS->here_input ());
+ }
+ | '|' {
+
+ $$ = MY_MAKE_MUSIC("BarCheck");
+ $$->set_spot (THIS->here_input ());
+ }
+ | 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;
+ $$->set_spot (THIS->here_input ());
+
+ csm->set_mus_property ("context-type", scm_makfrom0str ("Timing"));
+ }
+ | PARTIAL duration_length {
+ Moment m = - unsmob_duration ($2)->get_length ();
+ 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"));
+ }
+ | CLEF STRING {
+ static SCM proc ;
+ if (!proc)
+ proc = scm_c_eval_string ("make-clef-set");
+
+ SCM result = scm_call_1 (proc, $2);
+ scm_gc_protect_object (result);
+ $$ = unsmob_music (result);
+ }
+ | TIME_T fraction {
+ static SCM proc;
+ if (!proc)
+ proc = scm_c_eval_string ("make-time-signature-set");
+
+ SCM result = scm_apply_2 (proc, gh_car ($2), gh_cdr ($2), SCM_EOL);
+ scm_gc_protect_object (result);
+ $$ = unsmob_music (result);
}
;
command_req:
- abbrev_command_req
- | verbose_command_req semicolon { $$ = $1; }
+ shorthand_command_req { $$ = $1; }
+ | verbose_command_req { $$ = $1; }
;
-abbrev_command_req:
+shorthand_command_req:
extender_req {
$$ = $1;
}
| hyphen_req {
$$ = $1;
}
- | '|' {
- $$ = new Barcheck_req;
- }
| '~' {
- $$ = new Tie_req;
+ $$ = MY_MAKE_MUSIC("TieEvent");
}
| '[' {
- Span_req*b= new Span_req;
- b->span_dir_ = START;
- b->span_type_str_ = "beam";
- $$ =b;
+ Music *b= MY_MAKE_MUSIC("BeamEvent");
+ b->set_mus_property ("span-direction", gh_int2scm (START));
+ $$ = b;
+
+ THIS->last_beam_start_ = b->self_scm ();
}
| ']' {
- Span_req*b= new Span_req;
- b->span_dir_ = STOP;
- b->span_type_str_ = "beam";
+ Music *b= MY_MAKE_MUSIC("BeamEvent");
+ b->set_mus_property ("span-direction", gh_int2scm (STOP));
$$ = b;
}
| BREATHE {
- $$ = new Breathing_sign_req;
+ $$ = MY_MAKE_MUSIC("BreathingSignEvent");
+ }
+ | E_TILDE {
+ $$ = MY_MAKE_MUSIC("PorrectusEvent");
}
;
-
verbose_command_req:
- BAR STRING {
- $$ = new Bar_req (*$2);
- delete $2;
- }
- | MARK STRING {
- $$ = new Mark_req (*$2);
- delete $2;
- }
- | MARK unsigned {
- $$ = new Mark_req (to_str ($2));
- }
- | TIME_T unsigned '/' unsigned {
- Time_signature_change_req *m = new Time_signature_change_req;
- m->beats_i_ = $2;
- m->one_beat_i_=$4;
+ MARK DEFAULT {
+ Music * m = MY_MAKE_MUSIC("MarkEvent");
$$ = m;
}
- | PENALTY int {
- Break_req * b = new Break_req;
- b->penalty_i_ = $2;
- b-> set_spot (THIS->here_input ());
- $$ = b;
+ | MARK scalar {
+ Music *m = MY_MAKE_MUSIC("MarkEvent");
+ m->set_mus_property ("label", $2);
+ $$ = m;
}
| SKIP duration_length {
- Skip_req * skip_p = new Skip_req;
- skip_p->duration_ = *$2;
- delete $2;
- $$ = skip_p;
+ Music * skip = MY_MAKE_MUSIC("SkipEvent");
+ skip->set_mus_property ("duration", $2);
+
+ $$ = skip;
}
- | tempo_request {
+ | tempo_event {
$$ = $1;
}
- | CADENZA unsigned {
- $$ = new Cadenza_req ($2);
- }
- | PARTIAL duration_length {
- $$ = new Partial_measure_req ($2->length_mom ());
- delete $2;
- }
- | CLEF STRING {
- $$ = new Clef_change_req (*$2);
- delete $2;
+ | KEY DEFAULT {
+ Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
+ $$ = key;
}
- | KEY NOTENAME_PITCH optional_modality {
- Key_change_req *key_p= new Key_change_req;
- key_p->key_.pitch_arr_.push (*$2);
- key_p->key_.ordinary_key_b_ = true;
- key_p->key_.modality_i_ = $3;
- $$ = key_p;
- delete $2;
- }
- | KEYSIGNATURE pitch_list {
- Key_change_req *key_p= new Key_change_req;
- key_p->key_.pitch_arr_ = *$2;
- key_p->key_.ordinary_key_b_ = false;
- $$ = key_p;
- delete $2;
+ | 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;
}
-
;
-post_requests:
- {
- $$ = new Link_array<Request>;
+post_events:
+ /* empty */ {
+ $$ = SCM_EOL;
}
- | post_requests post_request {
+ | post_events post_event {
$2->set_spot (THIS->here_input ());
- $$->push ($2);
+ $$ = gh_cons ($2->self_scm(), $$);
+ scm_gc_unprotect_object ($2->self_scm());
}
;
-post_request:
- verbose_request
- | request_with_dir
- | close_request
+post_event:
+ verbose_event
+ | event_with_dir
+ | close_event
+ | string_event
;
-
-request_that_take_dir:
- gen_text_def
- | verbose_request
- | script_abbreviation {
- Identifier*i = THIS->lexer_p_->lookup_identifier ("dash-" + *$1);
- Articulation_req *a = new Articulation_req;
- a->articulation_str_ = *i->access_content_String (false);
- delete $1;
- $$ = a;
+string_event:
+ E_UNSIGNED {
+ Music * s = MY_MAKE_MUSIC("StringNumberEvent");
+ s->set_mus_property ("string-number", gh_int2scm($1));
+ s->set_spot (THIS->here_input ());
+ $$ = s;
}
;
-request_with_dir:
- script_dir request_that_take_dir {
- if (Script_req * gs = dynamic_cast<Script_req*> ($2))
- gs->dir_ = Direction ($1);
- else if ($1)
- $2->warning ("Can't specify direction for this request");
- $$ = $2;
+
+event_that_take_dir:
+ gen_text_def
+ | 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;
}
- ;
-
-verbose_request:
- REQUEST_IDENTIFIER {
- $$ = (Request*)$1->access_content_Request (true);
- $$->set_spot (THIS->here_input ());
+ | ']' {
+ Music * m = MY_MAKE_MUSIC ("NewBeamEvent");
+ m->set_spot (THIS->here_input());
+ m->set_mus_property ("span-direction" , gh_int2scm (STOP));
+ $$ = m;
}
- | TEXTSCRIPT STRING STRING {
- Text_script_req *ts_p = new Text_script_req;
- ts_p-> text_str_ = *$2;
- ts_p-> style_str_ = *$3;
- ts_p->set_spot (THIS->here_input ());
- delete $3;
- delete $2;
- $$ = ts_p;
- }
- | SPANREQUEST int STRING {
- Span_req * sp_p = new Span_req;
- sp_p-> span_dir_ = Direction($2);
- sp_p->span_type_str_ = *$3;
- sp_p->set_spot (THIS->here_input ());
- $$ = sp_p;
- }
- | abbrev_type {
- Tremolo_req* a = new Tremolo_req;
- a->set_spot (THIS->here_input ());
- a->type_i_ = $1;
- $$ = a;
+ | '~' {
+ Music * m = MY_MAKE_MUSIC ("NewTieEvent");
+ m->set_spot (THIS->here_input());
+ $$ = m;
}
- | SCRIPT STRING {
- Articulation_req * a = new Articulation_req;
- a->articulation_str_ = *$2;
- 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 (gh_string_p (s))
+ a->set_mus_property ("articulation-type", s);
+ else THIS->parser_error (_ ("Expecting string as script definition"));
$$ = a;
- delete $2;
}
;
-optional_modality:
- /* empty */ {
- $$ = 0;
+event_with_dir:
+ script_dir event_that_take_dir {
+ $2->set_mus_property ("direction", gh_int2scm ($1));
+ $$ = $2;
}
- | int {
- $$ = $1;
+ ;
+
+verbose_event:
+ EVENT_IDENTIFIER {
+ $$ = unsmob_music ($1);
}
+ | tremolo_type {
+ Music * a = MY_MAKE_MUSIC("TremoloEvent");
+ a->set_spot (THIS->here_input ());
+ a->set_mus_property ("tremolo-type", gh_int2scm ($1));
+ $$ = a;
+ }
;
sup_quotes:
}
;
-steno_musical_pitch:
+steno_pitch:
NOTENAME_PITCH {
$$ = $1;
}
| NOTENAME_PITCH sup_quotes {
- $$ = $1;
- $$->octave_i_ += $2;
+ Pitch p = *unsmob_pitch ($1);
+ p.octave_ += $2;
+ $$ = p.smobbed_copy ();
}
| NOTENAME_PITCH sub_quotes {
- $$ = $1;
- $$->octave_i_ += - $2;
+ Pitch p =* unsmob_pitch ($1);
+
+ p.octave_ += -$2;
+ $$ = p.smobbed_copy ();
+
}
;
+/*
+ugh. duplication
+*/
+
steno_tonic_pitch:
TONICNAME_PITCH {
$$ = $1;
}
| TONICNAME_PITCH sup_quotes {
- $$ = $1;
- $$->octave_i_ += $2;
+ Pitch p = *unsmob_pitch ($1);
+ p.octave_ += $2;
+ $$ = p.smobbed_copy ();
}
| TONICNAME_PITCH sub_quotes {
- $$ = $1;
- $$->octave_i_ += - $2;
- }
- ;
+ Pitch p =* unsmob_pitch ($1);
+
+ p.octave_ += -$2;
+ $$ = p.smobbed_copy ();
-explicit_musical_pitch:
- MUSICAL_PITCH '{' int_list '}' {/* ugh */
- Array<int> &a = *$3;
- ARRAY_SIZE(a,3);
- $$ = new Musical_pitch;
- $$->octave_i_ = a[0];
- $$->notename_i_ = a[1];
- $$->accidental_i_ = a[2];
- delete &a;
}
;
-musical_pitch:
- steno_musical_pitch {
+pitch:
+ steno_pitch {
$$ = $1;
- THIS->set_last_pitch ($1);
}
- | explicit_musical_pitch {
+ | explicit_pitch {
$$ = $1;
- THIS->set_last_pitch ($1);
}
;
-explicit_duration:
- DURATION '{' int_list '}' {
- $$ = new Duration;
- Array<int> &a = *$3;
- ARRAY_SIZE(a,2);
-
- $$-> durlog_i_ = a[0];
- $$-> dots_i_ = a[1];
+pitch_also_in_chords:
+ pitch
+ | steno_tonic_pitch
+ ;
- delete &a;
+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_p_->lyric_state_b ())
- THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
- $$ = new Extender_req;
+ if (!THIS->lexer_->lyric_state_b ())
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+ $$ = MY_MAKE_MUSIC("ExtenderEvent");
}
;
hyphen_req:
HYPHEN {
- if (!THIS->lexer_p_->lyric_state_b ())
- THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
- $$ = new Hyphen_req;
+ 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 {
+close_event:
+ close_event_parens {
$$ = $1;
- dynamic_cast<Span_req*> ($$)->span_dir_ = START;
+ dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (START))
+;
}
-
-close_request_parens:
+ ;
+
+close_event_parens:
'(' {
- Span_req* s= new Span_req;
+ Music * s= MY_MAKE_MUSIC("SlurEvent");
+ $$ = s;
+ s->set_spot (THIS->here_input());
+ }
+ | E_OPEN {
+ Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent");
$$ = s;
- s->span_type_str_ = "slur";
+ s->set_spot (THIS->here_input());
}
| E_SMALLER {
- Span_req*s =new Span_req;
+ Music *s =MY_MAKE_MUSIC("CrescendoEvent");
$$ = s;
- s->span_type_str_ = "crescendo";
+ s->set_spot (THIS->here_input());
}
| E_BIGGER {
- Span_req*s =new Span_req;
+ Music *s =MY_MAKE_MUSIC("DecrescendoEvent");
$$ = s;
- s->span_type_str_ = "decrescendo";
+ s->set_spot (THIS->here_input());
}
;
-open_request:
- open_request_parens {
+open_event:
+ open_event_parens {
$$ = $1;
- dynamic_cast<Span_req*> ($$)->span_dir_ = STOP;
+ dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP))
+;
}
;
-open_request_parens:
+open_event_parens:
E_EXCLAMATION {
- Span_req *s = new Span_req;
- s->span_type_str_ = "crescendo";
+ Music *s = MY_MAKE_MUSIC("CrescendoEvent");
+ s->set_spot (THIS->here_input());
+
$$ = s;
}
| ')' {
- Span_req* s= new Span_req;
+ Music * s= MY_MAKE_MUSIC("SlurEvent");
$$ = s;
- s->span_type_str_ = "slur";
+ s->set_spot (THIS->here_input());
+
+ }
+ | E_CLOSE {
+ Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent");
+ $$ = s;
+ s->set_mus_property ("span-type", scm_makfrom0str ( "phrasing-slur"));
+ s->set_spot (THIS->here_input());
}
;
gen_text_def:
- string {
- Text_script_req *t = new Text_script_req;
+ embedded_scm {
+ Music *t = MY_MAKE_MUSIC("TextScriptEvent");
+ t->set_mus_property ("text", $1);
+ t->set_spot (THIS->here_input ());
$$ = t;
- t->text_str_ = *$1;
- delete $1;
- $$->set_spot (THIS->here_input ());
+ }
+ | 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 {
- Text_script_req* t = new Text_script_req;
+ Music * t = MY_MAKE_MUSIC("FingerEvent");
+ t->set_mus_property ("digit", gh_int2scm ($1));
+ t->set_spot (THIS->here_input ());
$$ = t;
- t->text_str_ = to_str ($1);
- t->style_str_ = "finger";
- $$->set_spot (THIS->here_input ());
}
;
script_abbreviation:
'^' {
- $$ = new String ("hat");
+ $$ = scm_makfrom0str ("Hat");
}
| '+' {
- $$ = new String ("plus");
+ $$ = scm_makfrom0str ("Plus");
}
| '-' {
- $$ = new String ("dash");
+ $$ = scm_makfrom0str ("Dash");
}
| '|' {
- $$ = new String ("bar");
+ $$ = scm_makfrom0str ("Bar");
}
| '>' {
- $$ = new String ("larger");
+ $$ = scm_makfrom0str ("Larger");
}
| '.' {
- $$ = new String ("dot");
+ $$ = scm_makfrom0str ("Dot");
+ }
+ | '_' {
+ $$ = scm_makfrom0str ("Underscore");
}
;
-
script_dir:
'_' { $$ = DOWN; }
| '^' { $$ = UP; }
| '-' { $$ = CENTER; }
;
-pre_requests:
- {
- $$ = new Link_array<Request>;
+pre_events:
+ /* empty */ {
+ $$ = SCM_EOL;
}
- | pre_requests open_request {
- $$->push ($2);
+ | pre_events open_event {
+ $$ = gh_cons ($2->self_scm(), $$);
+ scm_gc_unprotect_object ($2->self_scm());
}
;
-absolute_musical_pitch:
- steno_musical_pitch {
+absolute_pitch:
+ steno_pitch {
$$ = $1;
}
;
duration_length:
- steno_duration {
+ multiplied_duration {
$$ = $1;
}
- | duration_length '*' unsigned {
- $$->plet_.iso_i_ *= $3;
- }
- | duration_length '/' unsigned {
- $$->plet_.type_i_ *= $3;
- }
- ;
-
-entered_notemode_duration:
- steno_duration {
- THIS->set_last_duration ($1);
- }
+ | verbose_duration {
+ $$ = $1;
+ }
;
optional_notemode_duration:
{
- $$ = new Duration (THIS->default_duration_);
+ Duration dd = THIS->default_duration_;
+ $$ = dd.smobbed_copy ();
+
+ THIS->beam_check ($$);
}
- | entered_notemode_duration {
+ | multiplied_duration {
$$ = $1;
+ THIS->default_duration_ = *unsmob_duration ($$);
+
+ THIS->beam_check ($$);
}
+ | verbose_duration {
+ $$ = $1;
+ THIS->default_duration_ = *unsmob_duration ($$);
+ }
;
steno_duration:
- unsigned {
- $$ = new Duration;
- if (!Duration::duration_type_b ($1))
+ bare_unsigned dots {
+ int l = 0;
+ if (!is_duration_b ($1))
THIS->parser_error (_f ("not a duration: %d", $1));
- else {
- $$->durlog_i_ = Duration_convert::i2_type ($1);
- }
+ else
+ l = intlog2 ($1);
+
+ $$ = Duration (l, $2).smobbed_copy ();
}
- | DURATION_IDENTIFIER {
- $$ = $1->access_content_Duration (true);
+ | DURATION_IDENTIFIER dots {
+ Duration *d =unsmob_duration ($1);
+ Duration k (d->duration_log (),d->dot_count () + $2);
+
+ *d = k;
+ $$ = $1;
}
- | steno_duration '.' {
- $$->dots_i_ ++;
+ ;
+
+
+
+
+multiplied_duration:
+ steno_duration {
+ $$ = $1;
+ }
+ | multiplied_duration '*' bare_unsigned {
+ $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy ();
+ }
+ | multiplied_duration '*' FRACTION {
+ Rational m (gh_scm2int (ly_car ($3)), gh_scm2int (ly_cdr ($3)));
+
+ $$ = unsmob_duration ($$)->compressed (m).smobbed_copy ();
+ }
+ ;
+
+fraction:
+ FRACTION { $$ = $1; }
+ | UNSIGNED '/' UNSIGNED {
+ $$ = scm_cons (gh_int2scm ($1), gh_int2scm ($3));
+ }
+ ;
+
+dots:
+ /* empty */ {
+ $$ = 0;
+ }
+ | dots '.' {
+ $$ ++;
}
;
-abbrev_type:
+tremolo_type:
':' {
$$ =0;
}
- | ':' unsigned {
- if (!Duration::duration_type_b ($2))
+ | ':' bare_unsigned {
+ if (!is_duration_b ($2))
THIS->parser_error (_f ("not a duration: %d", $2));
- else if ($2 < 8)
- THIS->parser_error (_ ("can't abbreviate"));
$$ = $2;
}
;
+
+/*****************************************************************
+ BASS FIGURES
+*****************************************************************/
+bass_number:
+ DIGIT
+ | UNSIGNED
+ ;
+
+bass_mod:
+ '-' { $$ = -1; }
+ | '+' { $$ = 1; }
+ | '!' { $$ = 0; }
+ ;
+
+bass_figure:
+ FIGURE_SPACE {
+ Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
+ $$ = bfr->self_scm();
+ scm_gc_unprotect_object ($$);
+ }
+ | bass_number {
+ Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
+ $$ = bfr->self_scm();
+
+ bfr->set_mus_property ("figure", gh_int2scm ($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));
+ } else {
+ m->set_mus_property ("alteration", gh_int2scm (0));
+ }
+ }
+ ;
+
+br_bass_figure:
+ '[' bass_figure {
+ $$ = $2;
+ unsmob_music ($$)->set_mus_property ("bracket-start", SCM_BOOL_T);
+ }
+ | bass_figure {
+ $$ = $1;
+ }
+ | br_bass_figure ']' {
+ $$ = $1;
+ unsmob_music ($1)->set_mus_property ("bracket-stop", SCM_BOOL_T);
+ }
+ ;
+
+figure_list:
+ /**/ {
+ $$ = SCM_EOL;
+ }
+ | figure_list br_bass_figure {
+ $$ = scm_cons ($2, $1);
+ }
+ ;
+
+figure_spec:
+ FIGURE_OPEN figure_list FIGURE_CLOSE {
+ Music * m = MY_MAKE_MUSIC("EventChord");
+ $2 = scm_reverse_x ($2, SCM_EOL);
+ m->set_mus_property ("elements", $2);
+ $$ = m->self_scm ();
+ }
+ ;
+
+
+optional_rest:
+ /**/ { $$ = 0; }
+ | REST { $$ = 1; }
+ ;
+
simple_element:
- musical_pitch exclamations questions optional_notemode_duration {
- if (!THIS->lexer_p_->note_state_b ())
- THIS->parser_error (_ ("have to be in Note mode for notes"));
+ pitch exclamations questions optional_notemode_duration optional_rest {
+ Input i = THIS->pop_spot ();
+ if (!THIS->lexer_->note_state_b ())
+ THIS->parser_error (_ ("Have to be in Note mode for notes"));
- Note_req *n = new Note_req;
+ Music *n = 0;
+ if ($5)
+ n = MY_MAKE_MUSIC("RestEvent");
+ else
+ n = MY_MAKE_MUSIC("NoteEvent");
- n->pitch_ = *$1;
- delete $1;
- n->duration_ = *$4;
- delete $4;
- n->cautionary_b_ = $3 % 2;
- n->forceacc_b_ = $2 % 2 || n->cautionary_b_;
+ n->set_mus_property ("pitch", $1);
+ n->set_mus_property ("duration", $4);
- Simultaneous_music*v = new Request_chord;
- v->set_spot (THIS->here_input ());
- n->set_spot (THIS->here_input ());
- v->add_music (n);
+ if ($3 % 2)
+ n->set_mus_property ("cautionary", SCM_BOOL_T);
+ if ($2 % 2 || $3 % 2)
+ n->set_mus_property ("force-accidental", SCM_BOOL_T);
+ Music *v = MY_MAKE_MUSIC("EventChord");
+ v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED));
+ scm_gc_unprotect_object (n->self_scm());
+
+ v->set_spot (i);
+ n->set_spot (i);
$$ = v;
}
- | RESTNAME optional_notemode_duration {
- $$ = THIS->get_rest_element (*$1, $2);
- delete $1; // delete notename
- }
- | MEASURES optional_notemode_duration {
- Multi_measure_rest_req* m = new Multi_measure_rest_req;
- m->duration_ = *$2;
- delete $2;
+ | figure_spec optional_notemode_duration {
+ Music * m = unsmob_music ($1);
+ Input i = THIS->pop_spot ();
+ m->set_spot (i);
+ for (SCM s = m->get_mus_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
+ {
+ unsmob_music (ly_car (s))->set_mus_property ("duration", $2);
+ }
+ $$ = m;
+ }
+ | RESTNAME optional_notemode_duration {
+
+ Input i = THIS->pop_spot ();
+ Music * ev = 0;
+ if (ly_scm2string ($1) =="s") {
+ /* Space */
+ ev = MY_MAKE_MUSIC("SkipEvent");
+ }
+ else {
+ ev = MY_MAKE_MUSIC("RestEvent");
+
+ }
+ ev->set_mus_property ("duration" ,$2);
+ ev->set_spot (i);
+ Music * velt = MY_MAKE_MUSIC("EventChord");
+ velt->set_mus_property ("elements", scm_list_n (ev->self_scm (),SCM_UNDEFINED));
+ velt->set_spot (i);
- Simultaneous_music*velt_p = new Request_chord;
- velt_p->set_spot (THIS->here_input ());
- velt_p->add_music (m);
- $$ = velt_p;
+ $$ = velt;
}
- | REPETITIONS optional_notemode_duration {
- Repetitions_req* r = new Repetitions_req;
- r->duration_ = *$2;
- delete $2;
+ | MULTI_MEASURE_REST optional_notemode_duration {
+ THIS->pop_spot ();
- Simultaneous_music*velt_p = new Request_chord;
- velt_p->set_spot (THIS->here_input ());
- velt_p->add_music (r);
- $$ = velt_p;
+ static SCM proc ;
+ if (!proc)
+ proc = scm_c_eval_string ("make-multi-measure-rest");
+
+ SCM mus = scm_call_2 (proc, $2,
+ make_input (THIS->here_input()));
+ scm_gc_protect_object (mus);
+ $$ = unsmob_music (mus);
}
| STRING optional_notemode_duration {
- if (!THIS->lexer_p_->lyric_state_b ())
- THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
- $$ = THIS->get_word_element (*$1, $2);
- delete $1;
+ Input i = THIS->pop_spot ();
+
+ Music * lreq = MY_MAKE_MUSIC("LyricEvent");
+ lreq->set_mus_property ("text", $1);
+ lreq->set_mus_property ("duration",$2);
+ lreq->set_spot (i);
+ Music * velt = MY_MAKE_MUSIC("EventChord");
+ velt->set_mus_property ("elements", scm_list_n (lreq->self_scm (), SCM_UNDEFINED));
+
+ $$= velt;
}
| chord {
- if (!THIS->lexer_p_->chord_state_b ())
- THIS->parser_error (_ ("have to be in Chord mode for chords"));
+ THIS->pop_spot ();
+
+ if (!THIS->lexer_->chord_state_b ())
+ THIS->parser_error (_ ("Have to be in Chord mode for chords"));
$$ = $1;
}
;
+
chord:
- steno_tonic_pitch optional_notemode_duration chord_additions chord_subtractions chord_inversion {
- $$ = THIS->get_chord (*$1, $3, $4, $5, *$2);
+ 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:
{
- $$ = new Array<Musical_pitch>;
+ $$ = SCM_EOL;
}
- | '-' chord_notes {
+ | CHORD_COLON chord_notes {
$$ = $2;
}
;
chord_notes:
chord_step {
- $$ = $1
+ $$ = $1;
}
| chord_notes '.' chord_step {
- $$ = $1;
- $$->concat (*$3);
+ $$ = gh_append2 ($$, $3);
}
;
chord_subtractions:
{
- $$ = new Array<Musical_pitch>;
+ $$ = SCM_EOL;
}
- | '^' chord_notes {
+ | CHORD_CARET chord_notes {
$$ = $2;
}
;
-/*
- forevery : X : optional_X sucks. Devise a solution.
-*/
-
chord_inversion:
{
- $$ = 0;
+ $$ = SCM_EOL;
+ }
+ | CHORD_SLASH steno_tonic_pitch {
+ $$ = $2;
+ }
+ ;
+
+chord_bass:
+ {
+ $$ = SCM_EOL;
}
- | '/' steno_tonic_pitch {
- $$ = $2
+ | CHORD_BASS steno_tonic_pitch {
+ $$ = $2;
}
;
chord_step:
chord_note {
- $$ = new Array<Musical_pitch>;
- $$->push (*$1);
+ $$ = scm_cons ($1, SCM_EOL);
}
| CHORDMODIFIER_PITCH {
- $$ = new Array<Musical_pitch>;
- $$->push (*$1);
+ $$ = scm_cons (unsmob_pitch ($1)->smobbed_copy (), SCM_EOL);
}
- | CHORDMODIFIER_PITCH chord_note {
- $$ = new Array<Musical_pitch>;
- $$->push (*$1);
- $$->push (*$2);
+ | CHORDMODIFIER_PITCH chord_note { /* Ugh. */
+ $$ = scm_list_n (unsmob_pitch ($1)->smobbed_copy (),
+ $2, SCM_UNDEFINED);
}
;
chord_note:
- unsigned {
- $$ = new Musical_pitch;
- $$->notename_i_ = ($1 - 1) % 7;
- $$->octave_i_ = $1 > 7 ? 1 : 0;
- $$->accidental_i_ = 0;
+ bare_unsigned {
+ Pitch m;
+ m.notename_ = ($1 - 1) % 7;
+ m.octave_ = $1 > 7 ? 1 : 0;
+ m.alteration_ = 0;
+
+ $$ = m.smobbed_copy ();
}
- | unsigned '+' {
- $$ = new Musical_pitch;
- $$->notename_i_ = ($1 - 1) % 7;
- $$->octave_i_ = $1 > 7 ? 1 : 0;
- $$->accidental_i_ = 1;
- }
- | unsigned '-' {
- $$ = new Musical_pitch;
- $$->notename_i_ = ($1 - 1) % 7;
- $$->octave_i_ = $1 > 7 ? 1 : 0;
- $$->accidental_i_ = -1;
+ | bare_unsigned '+' {
+ Pitch m;
+ m.notename_ = ($1 - 1) % 7;
+ m.octave_ = $1 > 7 ? 1 : 0;
+ m.alteration_ = 1;
+
+
+ $$ = m.smobbed_copy ();
+ }
+ | bare_unsigned CHORD_MINUS {
+ Pitch m;
+ m.notename_ = ($1 - 1) % 7;
+ m.octave_ = $1 > 7 ? 1 : 0;
+ m.alteration_ = -1;
+
+ $$ = m.smobbed_copy ();
}
;
/*
UTILITIES
*/
-pitch_list: {
- $$ = new Array<Musical_pitch>;
+number_expression:
+ number_expression '+' number_term {
+ $$ = scm_sum ($1, $3);
}
- | pitch_list musical_pitch {
- $$->push (*$2);
- delete $2;
+ | number_expression '-' number_term {
+ $$ = scm_difference ($1, $3);
}
+ | number_term
;
-
-int_list:
- /**/ {
- $$ = new Array<int>
+number_term:
+ number_factor {
+ $$ = $1;
}
- | int_list int {
- $$->push ($2);
+ | number_factor '*' number_factor {
+ $$ = scm_product ($1, $3);
+ }
+ | number_factor '/' number_factor {
+ $$ = scm_divide ($1, $3);
}
;
-unsigned:
+number_factor:
+ '-' number_factor { /* %prec UNARY_MINUS */
+ $$ = scm_difference ($2, SCM_UNDEFINED);
+ }
+ | bare_number
+ ;
+
+
+bare_number:
UNSIGNED {
+ $$ = gh_int2scm ($1);
+ }
+ | REAL {
$$ = $1;
}
- | DIGIT {
+ | NUMBER_IDENTIFIER {
$$ = $1;
}
+ | REAL NUMBER_IDENTIFIER {
+ $$ = gh_double2scm (gh_scm2double ($1) * gh_scm2double ($2));
+ }
+ | UNSIGNED NUMBER_IDENTIFIER {
+ $$ = gh_double2scm ($1 * gh_scm2double ($2));
+ }
;
-int:
- unsigned {
+
+bare_unsigned:
+ UNSIGNED {
+ $$ = $1;
+ }
+ | DIGIT {
$$ = $1;
}
- | '-' unsigned {
- $$ = -$2;
+ ;
+
+bare_int:
+ bare_number {
+ if (scm_integer_p ($1) == SCM_BOOL_T)
+ {
+ int k = gh_scm2int ($1);
+ $$ = k;
+ } else
+ {
+ THIS->parser_error (_ ("need integer number arg"));
+ $$ = 0;
+ }
}
- | INT_IDENTIFIER {
- $$ = *$1->access_content_int (false);
+ | '-' bare_int {
+ $$ = -$2;
}
;
$$ = $1;
}
| STRING_IDENTIFIER {
- $$ = $1->access_content_String (true);
+ $$ = $1;
}
| string '+' string {
- *$$ += *$3;
- delete $3;
+ $$ = scm_string_append (scm_list_n ($1, $3, SCM_UNDEFINED));
}
;
;
-semicolon:
- ';'
+
+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
-My_lily_parser::set_yydebug (bool b)
+My_lily_parser::set_yydebug (bool )
{
-#ifdef YYDEBUG
- yydebug = b;
+#if 0
+ yydebug = 1;
#endif
}
+
+extern My_lily_parser * current_parser;
+
void
My_lily_parser::do_yyparse ()
{
+ current_parser = this;;
yyparse ((void*)this);
}
+/*
+Should make this optional? It will also complain when you do
+
+ [s4]
+
+which is entirely legitimate.
+
+Or we can scrap it. Barchecks should detect wrong durations, and
+skipTypesetting speeds it up a lot.
+*/
+
+void
+My_lily_parser::beam_check (SCM dur)
+{
+ Duration *d = unsmob_duration (dur);
+ if (unsmob_music (last_beam_start_) && d->duration_log () <= 2)
+ {
+ Music * m = unsmob_music (last_beam_start_);
+ m->origin ()->warning (_("Suspect duration found following this beam"));
+ }
+ last_beam_start_ = SCM_EOL;
+}
+
+
+
+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.
+
+*/
+int
+My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid)
+{
+ if (gh_string_p (sid)) {
+ *destination = sid;
+ return STRING_IDENTIFIER;
+ } else if (gh_number_p (sid)) {
+ *destination = sid;
+ return NUMBER_IDENTIFIER;
+ } else if (unsmob_translator_def (sid)) {
+ *destination = unsmob_translator_def (sid)->clone_scm();
+ return TRANSLATOR_IDENTIFIER;
+ } else if (unsmob_score (sid)) {
+ Score *sc = new Score (*unsmob_score (sid));
+ *destination =sc->self_scm ();
+ return SCORE_IDENTIFIER;
+ } else if (Music * mus =unsmob_music (sid)) {
+ *destination = unsmob_music (sid)->clone ()->self_scm();
+ unsmob_music (*destination)->
+ set_mus_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 (new_markup_p (sid)) {
+ *destination = sid;
+ return MARKUP_IDENTIFIER;
+ }
+
+ return -1;
+}
projects / lilypond.git / blobdiff