%{ // -*-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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
-/*
- Four shift/reduce problems:
-
-1. foo = bar.
-
- "bar" -> String -> Lyric -> Music -> music-assignment
-
- "bar" -> String -> string-assignment
-
-
-Similar problem for
-
- * \markup identifier.
- * \markup { }
-
-
-2. \repeat
- \repeat .. \alternative
-
-
- \repeat { \repeat .. \alternative }
-
-or
-
- \repeat { \repeat } \alternative
-
-)
-
---hwn
-
- */
-
/*
TODO:
#include <stdio.h>
-#include "scm-option.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 "lilypond-input-version.hh"
+#include "ly-module.hh"
+#include "main.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 "my-lily-parser.hh"
-#include "score.hh"
-#include "input-file-results.hh"
-#include "input.hh"
-#include "lilypond-input-version.hh"
+#include "paper-book.hh"
+#include "output-def.hh"
#include "scm-hash.hh"
-#include "ly-modules.hh"
-#include "music-sequence.hh"
-#include "input-smob.hh"
-#include "event.hh"
+#include "scm-option.hh"
+#include "score.hh"
#include "text-item.hh"
-#include "music-list.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_);
+Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops_);
SCM get_next_unique_context ();
#define YYERROR_VERBOSE 1
-My_lily_parser* my_lily_parser;
#define YYPARSE_PARAM my_lily_parser
#define YYLEX_PARAM my_lily_parser
#define THIS\
- ((My_lily_parser *) my_lily_parser)
+ ((Lily_parser *) my_lily_parser)
#define yyerror THIS->parser_error
-/*
- Add symbols to the TAGS field of a music object.
-*/
+/* Add symbols to the TAGS field of a music object. */
void
-tag_music (Music*m, SCM tag, Input ip)
+tag_music (Music *m, SCM tag, Input ip)
{
- SCM tags = m->get_mus_property ("tags");
- if (gh_symbol_p (tag))
+ SCM tags = m->get_property ("tags");
+ if (ly_c_symbol_p (tag))
tags = scm_cons (tag, tags);
- else if (gh_list_p (tag))
- tags = gh_append2 (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."));
+ ip.warning (_ ("Tag must be symbol or list of symbols."));
- m->set_mus_property ("tags", tags);
+ m->set_property ("tags", tags);
}
-
-
bool
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 a)
+make_simple_markup (SCM encoding, SCM a)
{
- static SCM simple;
- if (!simple)
- simple = scm_c_eval_string ("simple-markup");
-
+ 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_is_duration (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
if (step == 7)
alter += FLAT;
- while(step < 0)
+ while (step < 0)
step += 7;
- Pitch m((step -1) / 7 , (step - 1) % 7, alter);
+ Pitch m ((step -1) / 7, (step - 1) % 7, alter);
return m.smobbed_copy ();
}
SCM
make_chord (SCM pitch, SCM dur, SCM modification_list)
{
- static SCM chord_ctor;
- if (!chord_ctor)
- chord_ctor= scm_c_eval_string ("construct-chord");
- SCM ch= scm_call_3 (chord_ctor, pitch, dur, modification_list);
+ 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;
}
-/*
- Todo: actually also use apply iso. call too ...
-*/
+/* Todo: actually also use apply iso. call too ... */
bool
ly_input_procedure_p (SCM x)
{
- return gh_procedure_p (x)
- || (gh_pair_p (x) && gh_procedure_p (gh_car (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;
+}
+
+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;
+}
+
%}
/* 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. */
+%left NEWLYRICS
%union {
- String * string;
- Music *music;
- Score *score;
- Music_output_def * outputdef;
- SCM scm;
- int i;
+ Book *book;
+ 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_;
+ Lily_parser *pars = (Lily_parser*) v;
+ Lily_lexer *lex = pars->lexer_;
lex->lexval = (void*) s;
- lex->prepare_for_next_token();
+ lex->prepare_for_next_token ();
return lex->yylex ();
}
%}
-%pure_parser
+%expect 3
+
+/*
+ Three shift/reduce problems:
+
+2. \markup identifier.
+
+ (what? --hwn)
+
+3. \markup { }
+
+ (what? --hwn)
+
+
+4. \repeat
+ \repeat .. \alternative
+
+ \repeat { \repeat .. \alternative }
+
+or
+
+ \repeat { \repeat } \alternative
+
+)
+ */
+
+
+%pure_parser
%token ACCEPTS
-%token ADDLYRICS
-%token NEWADDLYRICS
+%token ADDQUOTE
+%token LYRICSTO
%token ALIAS
%token ALTERNATIVE
-%token APPLY
-%token APPLYCONTEXT
-%token APPLYOUTPUT
-%token AUTOCHANGE
%token BAR
-%token BREATHE
+%token BOOK
+%token BOOKPAPER
%token CHANGE
-%token CHORDMODIFIERS
+%token CHORDMODIFIERS
%token CHORDS
-%token LESSLESS
-%token MOREMORE
+%token DOUBLE_ANGLE_OPEN
+%token DOUBLE_ANGLE_CLOSE
%token CLEF
%token COMMANDSPANREQUEST
%token CONSISTS
-%token CONSISTSEND
%token CONTEXT
%token DEFAULT
%token DENIES
%token EXTENDER
%token FIGURES FIGURE_OPEN FIGURE_CLOSE
%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
-%token GRACE
-%token ACCIACCATURA
-%token APPOGGIATURA
%token GROBDESCRIPTIONS
%token HEADER
%token HYPHEN
%token NOTES
%token OCTAVE
%token ONCE
-%token OVERRIDE SET REVERT
+%token OVERRIDE SET REVERT
%token PAPER
-%token PARTCOMBINE
%token PARTIAL
%token QUOTE
%token RELATIVE
%token SCM_T
%token SCORE
%token SEQUENTIAL
+%token NEWLYRICS
%token SIMULTANEOUS
%token SKIP
%token SPANREQUEST
%token TEMPO
%token TIMES
%token TIME_T
-%token TRANSLATOR
%token TRANSPOSE
+%token TRANSPOSITION
%token TYPE
%token UNSET
%token WITH
+%token MARKUP
/* 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 <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_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
%token <i> DIGIT
-%token <scm> NOTENAME_PITCH
-%token <scm> TONICNAME_PITCH
-%token <scm> CHORDMODIFIER_PITCH
-%token <scm> DURATION_IDENTIFIER
-%token <scm> FRACTION
+%token <i> UNSIGNED
+%token <i> E_UNSIGNED
%token <id> IDENTIFIER
-%token DRUMS
+%token <scm> CHORDMODIFIER_PITCH
%token <scm> DRUM_PITCH
-%token <scm> CHORD_MODIFIER
-%token <scm> SCORE_IDENTIFIER
-%token <scm> MUSIC_OUTPUT_DEF_IDENTIFIER
-%token <scm> NUMBER_IDENTIFIER
+%token <scm> DURATION_IDENTIFIER
%token <scm> EVENT_IDENTIFIER
-%token <scm> MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER
-%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
+%token <scm> MUSIC_IDENTIFIER CONTEXT_DEF_IDENTIFIER
+%token <scm> NOTENAME_PITCH
+%token <scm> NUMBER_IDENTIFIER
+%token <scm> OUTPUT_DEF_IDENTIFIER
%token <scm> RESTNAME
-%token <scm> STRING
+%token <scm> LYRICS_STRING
%token <scm> SCM_T
-%token <i> UNSIGNED
+%token <scm> SCORE_IDENTIFIER
+%token <scm> STRING
+%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
+%token <scm> TONICNAME_PITCH
+%token <scm> CHORD_MODIFIER
+%token <scm> FRACTION
%token <scm> REAL
-
-%token MARKUP
-%token <scm> MARKUP_HEAD_MARKUP0
%token <scm> MARKUP_HEAD_EMPTY
+%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_SCM2
+%token <scm> MARKUP_HEAD_SCM0_SCM1
%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
-
+%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
%token <scm> MARKUP_IDENTIFIER MARKUP_HEAD_LIST0
-%type <scm> markup markup_line markup_list markup_list_body full_markup
+%token <scm> MUSIC_FUNCTION
+%token <scm> MUSIC_FUNCTION_MUSIC
+%token <scm> MUSIC_FUNCTION_MUSIC_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM
+%token <scm> MUSIC_FUNCTION_SCM_SCM
+%token <scm> MUSIC_FUNCTION_SCM_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC
+%token DRUMS
-%type <outputdef> output_def
-%type <scm> lilypond_header lilypond_header_body
-%type <music> open_event close_event
-%type <i> sub_quotes sup_quotes
-%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 <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> 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> new_chord step_number chord_items chord_item chord_separator step_numbers
+%type <book> book_block book_body
+%type <i> bare_int bare_unsigned
+%type <i> exclamations questions dots optional_rest
+%type <i> script_dir
+%type <i> sub_quotes sup_quotes
+%type <i> tremolo_type
+%type <i> bass_mod
-%type <scm> embedded_scm scalar
-%type <music> Music Sequential_music Simultaneous_music
-%type <music> relative_music re_rhythmed_music
+%type <music> Composite_music Simple_music Prefix_composite_music Generic_prefix_music
+%type <music> Grouped_music_list
+%type <music> Music Sequential_music Simultaneous_music
+%type <music> Repeated_music
+%type <music> command_req
+%type <music> gen_text_def direction_less_event direction_reqd_event
%type <music> music_property_def context_change
-%type <scm> context_prop_spec
-%type <scm> Music_list
-%type <scm> property_operation context_mod translator_mod optional_context_mod
-%type <outputdef> music_output_def_body music_output_def_head
+%type <music> note_chord_element chord_body chord_body_element
+%type <music> open_event close_event
%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 <music> relative_music re_rhythmed_music
+%type <music> simple_element event_chord command_element
+%type <music> string_number_event
+%type <music> toplevel_music
%type <music> tempo_event
+
+%type <outputdef> output_def_body output_def_head
+%type <outputdef> output_def book_paper_block
+
+%type <scm> Music_list
+%type <scm> chord_body_elements
+%type <scm> chord_item chord_items chord_separator new_chord
+%type <scm> context_def_spec_block context_def_spec_body
+%type <scm> context_mod context_def_mod optional_context_mod
+%type <scm> context_prop_spec
+%type <scm> duration_length fraction
+%type <scm> embedded_scm scalar
+%type <scm> identifier_init
+%type <scm> lilypond_header lilypond_header_body
+%type <scm> new_lyrics
+%type <scm> post_events
+%type <scm> property_operation
%type <scm> script_abbreviation
+%type <scm> simple_string
+%type <scm> steno_pitch pitch absolute_pitch pitch_also_in_chords
+%type <scm> steno_tonic_pitch
+%type <scm> step_number step_numbers
+%type <scm> string bare_number number_expression number_term number_factor
+%type <scm> bass_number br_bass_figure bass_figure figure_list figure_spec
+%type <scm> context_mod_list
+%type <scm> octave_check
+%type <scm> steno_duration optional_notemode_duration multiplied_duration
+%type <scm> Generic_prefix_music_scm
+%type <scm> lyric_element
+%type <scm> Alternative_music
+%type <scm> markup markup_line markup_list markup_list_body full_markup
+%type <score> score_block score_body
%left '-' '+'
%%
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:
lilypond_header {
- THIS->input_file_->header_ = $1;
+ THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
}
- | score_block {
- Score * sc = $1;
-
- SCM head = ly_module_p (sc->header_) ? sc->header_ : THIS->input_file_->header_.to_SCM ();
-
- Path p = split_path (THIS->output_basename_);
- int *c = &THIS->input_file_->score_count_;
- if (*c)
- {
- p.base += "-" + to_string (*c);
- }
-
- (*c)++;
- SCM outname = scm_makfrom0str (p.to_string ().to_str0());
-
- for (int i=0; i < sc->defs_.size (); i++)
- default_rendering (sc->music_, sc->defs_[i]->self_scm(), head, outname);
-
- if (sc->defs_.is_empty ())
- {
- Music_output_def *id =
- unsmob_music_output_def (THIS->lexer_->lookup_identifier
- ("$defaultpaper"));
-
- id = id ? id->clone () : new Paper_def;
+ | add_quote {
- default_rendering (sc->music_, id->self_scm(), head, outname);
-
- scm_gc_unprotect_object (id->self_scm ());
- }
- scm_gc_unprotect_object (sc->self_scm());
+ }
+ | 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 {
+ 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))
- id = scm_makfrom0str ("$defaultpaper");
- else if (dynamic_cast<Midi_def*> ($1))
- id = scm_makfrom0str ("$defaultmidi");
- THIS->lexer_->set_identifier (id, $1->self_scm ());
- scm_gc_unprotect_object ($1->self_scm ());
+ Output_def * od = $1;
+
+ if ($1->c_variable ("is-paper") == SCM_BOOL_T)
+ id = ly_symbol2scm ("$defaultpaper");
+ else if ($1->c_variable ("is-midi") == SCM_BOOL_T)
+ id = ly_symbol2scm ("$defaultmidi");
+ else if ($1->c_variable ("is-bookpaper") == SCM_BOOL_T)
+ id = ly_symbol2scm ("$defaultbookpaper");
+
+ THIS->lexer_->set_identifier (id, od->self_scm ());
+ scm_gc_unprotect_object (od->self_scm ());
+ }
+ ;
+
+toplevel_music:
+ Composite_music {
}
;
embedded_scm:
SCM_T
- | SCM_IDENTIFIER
+ | SCM_IDENTIFIER
;
-
-
lilypond_header_body:
{
- $$ = ly_make_anonymous_module ();
+ $$ = ly_make_anonymous_module (safe_global_b);
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 ();
}
;
$$ = $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 {
scm_gc_unprotect_object ($$);
}
| number_expression {
- $$ = $1;
+ $$ = $1;
}
| string {
$$ = $1;
}
- | embedded_scm {
+ | embedded_scm {
$$ = $1;
}
+ | full_markup {
+ $$ = $1;
+ }
+ | DIGIT {
+ $$ = scm_int2num ($1);
+ }
;
-translator_spec_block:
- TRANSLATOR '{' translator_spec_body '}'
+context_def_spec_block:
+ CONTEXT '{' context_def_spec_body '}'
{
$$ = $3;
}
;
-translator_spec_body:
+context_def_spec_body:
/**/ {
$$ = Context_def::make_scm ();
unsmob_context_def ($$)->set_spot (THIS->here_input ());
}
- | TRANSLATOR_IDENTIFIER {
+ | CONTEXT_DEF_IDENTIFIER {
$$ = $1;
unsmob_context_def ($$)->set_spot (THIS->here_input ());
}
- | translator_spec_body GROBDESCRIPTIONS embedded_scm {
- Context_def*td = unsmob_context_def($$);
+ | context_def_spec_body GROBDESCRIPTIONS embedded_scm {
+ Context_def*td = unsmob_context_def ($$);
- for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p)) {
- SCM tag = gh_caar (p);
+ 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, gh_cons (ly_cdar (p), SCM_EOL)));
+ tag, scm_cons (ly_cdar (p), SCM_EOL)));
}
}
- | translator_spec_body context_mod {
+ | context_def_spec_body context_mod {
unsmob_context_def ($$)->add_context_mod ($2);
}
;
-/*
- SCORE
-*/
+
+
+book_block:
+ BOOK {
+ THIS->push_spot ();
+ }
+ /*cont*/ '{' book_body '}' {
+ THIS->pop_spot ();
+ $$ = $4;
+ }
+ ;
+
+/* FIXME:
+ * Use 'handlers' like for toplevel-* stuff?
+ * grok \paper and \midi? */
+book_body:
+ {
+ $$ = new Book;
+ $$->set_spot (THIS->here_input ());
+ $$->bookpaper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultbookpaper"))->clone ());
+ scm_gc_unprotect_object ($$->bookpaper_->self_scm ());
+ $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader");
+ }
+ | book_body book_paper_block {
+ $$->bookpaper_ = $2;
+ scm_gc_unprotect_object ($2->self_scm ());
+ }
+ | book_body score_block {
+ Score *score = $2;
+ $$->scores_.push (score);
+ scm_gc_unprotect_object (score->self_scm ());
+ }
+ | book_body Composite_music {
+ Music *music = $2;
+ Score *score
+ = unsmob_score (ly_music_scorify (music->self_scm ()));
+ $$->scores_.push (score);
+ scm_gc_unprotect_object (music->self_scm ());
+ }
+ | book_body lilypond_header {
+ $$->header_ = $2;
+ }
+ | book_body error {
+
+ }
+ ;
+
score_block:
- SCORE {
+ SCORE {
THIS->push_spot ();
}
/*cont*/ '{' score_body '}' {
THIS->pop_spot ();
$$ = $4;
-
}
;
score_body:
- Music {
+ /**/ {
$$ = new Score;
$$->set_spot (THIS->here_input ());
- SCM m = $1->self_scm ();
+ }
+ | SCORE_IDENTIFIER {
+ $$ = new Score ( *unsmob_score ($1));
+ $$->set_spot (THIS->here_input ());
+ }
+ | score_body Music {
+ SCM m = $2->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);
+ 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);
+ if (unsmob_music ($$->music_))
+ {
+ THIS->parser_error (_("Already have music in score"));
+ unsmob_music ($$->music_)->origin ()->error (_("This is the previous music"));
+ }
$$->music_ = m;
-
- }
- | SCORE_IDENTIFIER {
- $$ = new Score ( *unsmob_score ($1));
- $$->set_spot (THIS->here_input ());
}
| score_body lilypond_header {
$$->header_ = $2;
/*
- MIDI
+ OUTPUT DEF
*/
-output_def:
- music_output_def_body '}' {
+
+book_paper_block:
+ output_def {
$$ = $1;
- THIS-> lexer_-> remove_scope ();
+ if ($$->lookup_variable (ly_symbol2scm ("is-bookpaper")) != SCM_BOOL_T)
+ {
+ THIS->parser_error (_("Need \\bookpaper for bookpaper block."));
+ $$ = get_bookpaper (THIS);
+ }
}
;
-music_output_def_head:
- MIDI {
- Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi"));
+output_def:
+ output_def_body '}' {
+ $$ = $1;
+ if ($1->parent_)
+ THIS->lexer_->remove_scope ();
- Midi_def* p =0;
- if (id)
- p = dynamic_cast<Midi_def*> (id->clone ());
- else
- p = new Midi_def;
+ THIS->lexer_->remove_scope ();
+ THIS->lexer_->pop_state ();
+ }
+ ;
+output_def_head:
+ BOOKPAPER {
+ $$ = get_bookpaper (THIS);
+ $$->input_origin_ = THIS->here_input ();
+ THIS->lexer_->add_scope ($$->scope_);
+ }
+ | MIDI {
+ Output_def *p = get_midi (THIS);
$$ = p;
THIS->lexer_->add_scope (p->scope_);
}
| 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;
+ Output_def* p = get_paper (THIS);
+
+ if (p->parent_)
+ THIS->lexer_->add_scope (p->parent_->scope_);
THIS->lexer_->add_scope (p->scope_);
$$ = p;
;
-music_output_def_body:
- music_output_def_head '{' {
-
+output_def_body:
+ output_def_head '{' {
+ $$ = $1;
+ $$->input_origin_.set_spot (THIS->here_input ());
+ THIS->lexer_->push_initial_state ();
}
- | music_output_def_head '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
+ | output_def_head '{' OUTPUT_DEF_IDENTIFIER {
scm_gc_unprotect_object ($1->self_scm ());
- Music_output_def * o = unsmob_music_output_def ($3);
+ Output_def *o = unsmob_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 {
+ | output_def_body assignment {
}
- | music_output_def_body translator_spec_block {
- $$->assign_translator ($2);
+ | output_def_body context_def_spec_block {
+ assign_context_def ($$, $2);
}
- | music_output_def_body tempo_event {
+ | 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);
+ int m = ly_scm2int ($2->get_property ("metronome-count"));
+ Duration *d = unsmob_duration ($2->get_property ("tempo-unit"));
+ set_tempo ($$, d->get_length (), m);
scm_gc_unprotect_object ($2->self_scm ());
}
- | music_output_def_body error {
+ | output_def_body error {
}
;
tempo_event:
TEMPO steno_duration '=' bare_unsigned {
- $$ = MY_MAKE_MUSIC("MetronomeChangeEvent");
- $$->set_mus_property ("tempo-unit", $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));
}
;
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 */
+ 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);
}
- static SCM proc;
- if (!proc)
- proc = scm_c_eval_string ("make-repeated-music");
+ 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);
+ 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_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.
+ */
- 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.
*/
- static SCM func;
-
- if (!func)
- func = scm_primitive_eval (ly_symbol2scm ("shift-duration-log"));
+ 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);
+ Sequential_music *seq = dynamic_cast<Sequential_music*> ($4);
if (seq) {
- int list_len =scm_ilength (seq->music_list ());
+ 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)));
+ r->compress (Moment (Rational (1, list_len)));
}
- gh_call3 (func, r->self_scm (), gh_int2scm(shift),gh_int2scm(dots));
+ scm_call_3 (func, r->self_scm (), scm_int2num (shift),scm_int2num (dots));
}
r->set_spot (*$4->origin ());
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 ());
}
| simul_open Music_list simul_close {
- $$ = MY_MAKE_MUSIC("SimultaneousMusic");
- $$->set_mus_property ("elements", ly_car ($2));
- $$->set_spot(THIS->here_input());
+ $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
+ $$->set_property ("elements", ly_car ($2));
+ $$->set_spot (THIS->here_input ());
}
;
Simple_music:
event_chord { $$ = $1; }
- | APPLYOUTPUT embedded_scm {
- if (!ly_input_procedure_p ($2))
- THIS->parser_error (_ ("\\applycontext takes function argument"));
- $$ = MY_MAKE_MUSIC ("ApplyOutputEvent");
- $$->set_mus_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_mus_property ("procedure", $2);
- $$->set_spot (THIS->here_input());
- }
| MUSIC_IDENTIFIER {
$$ = unsmob_music ($1);
}
optional_context_mod:
/**/ { $$ = SCM_EOL; }
- | WITH '{' context_mod_list '}' { $$ = $3; }
- ;
-
-grace_head:
- GRACE { $$ = scm_makfrom0str ("Grace"); }
- | ACCIACCATURA { $$ = scm_makfrom0str ("Acciaccatura"); }
- | APPOGGIATURA { $$ = scm_makfrom0str ("Appoggiatura"); }
+ | WITH { THIS->lexer_->push_initial_state (); }
+ '{' context_mod_list '}'
+ {
+ THIS->lexer_->pop_state ();
+ $$ = $4;
+ }
;
context_mod_list:
/* */ { $$ = SCM_EOL; }
| context_mod_list context_mod {
- $$ = gh_cons ($2, $1);
+ $$ = scm_cons ($2, $1);
}
;
+
Composite_music:
- AUTOCHANGE Music {
- static SCM proc ;
- if (!proc)
- proc = scm_c_eval_string ("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());
- }
- | PARTCOMBINE Music Music {
- static SCM proc;
- if (!proc)
- proc = scm_c_eval_string ("make-part-combine-music");
+ Prefix_composite_music { $$ = $1; }
+ | Grouped_music_list { $$ = $1; }
+ ;
- SCM res = scm_call_1 (proc, gh_list ($2->self_scm (),
- $3->self_scm (), SCM_UNDEFINED));
+Grouped_music_list:
+ Simultaneous_music { $$ = $1; }
+ | Sequential_music { $$ = $1; }
+ ;
+
+Generic_prefix_music_scm:
+ MUSIC_FUNCTION {
+ $$ = scm_list_2 ($1, make_input (THIS->here_input ()));
+ }
+ | 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 ());
- scm_gc_unprotect_object ($2->self_scm ());
- $$ = unsmob_music (res);
- scm_gc_protect_object (res);
- $$->set_spot (THIS->here_input());
}
- | grace_head Music {
-#if 1
- /*
- The other version is for easier debugging of
- Sequential_music_iterator in combination with grace notes.
- */
-
-/*
-
-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 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_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_SCM_SCM {
+ THIS->push_spot ();
+ } embedded_scm embedded_scm {
+ $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4);
+ }
+ | 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);
+ }
+ ;
- 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
+Prefix_composite_music:
+ Generic_prefix_music {
+ $$ = $1;
}
- | CONTEXT string '=' string optional_context_mod Music {
+ | CONTEXT simple_string '=' simple_string optional_context_mod Music {
$$ = context_spec_music ($2, $4, $6, $5);
}
- | CONTEXT STRING optional_context_mod Music {
+ | CONTEXT simple_string optional_context_mod Music {
$$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
}
- | NEWCONTEXT string optional_context_mod Music {
- $$ = context_spec_music ($2, get_next_unique_context (),
- $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");
+ $$= 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_also_in_chords pitch_also_in_chords Music {
- $$ = MY_MAKE_MUSIC("TransposedMusic");
+ $$ = 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 ());
+ $$->set_property ("element", p->self_scm ());
scm_gc_unprotect_object (p->self_scm ());
}
- | APPLY embedded_scm Music {
- if (!ly_input_procedure_p ($2))
- {
- THIS->parser_error (_ ("\\apply takes function argument"));
- $$ = $3;
- }
- else
- {
- 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
{
SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
THIS->lexer_->push_note_state (alist_to_hashq (nn));
}
- Music
+ Grouped_music_list
{ $$ = $3;
THIS->lexer_->pop_state ();
}
SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
THIS->lexer_->push_note_state (alist_to_hashq (nn));
}
- Music
+ Grouped_music_list
{ $$ = $3;
THIS->lexer_->pop_state ();
}
| FIGURES
{ THIS->lexer_->push_figuredbass_state (); }
- Music
+ 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 ();
}
nn = THIS->lexer_->lookup_identifier ("pitchnames");
THIS->lexer_->push_chord_state (alist_to_hashq (nn));
- } 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 (); }
- Music
+ Grouped_music_list
{
$$ = $3;
THIS->lexer_->pop_state ();
}
| relative_music { $$ = $1; }
- | re_rhythmed_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 ());
+ 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;
+ Pitch middle_c (0, 0, 0);
+ $$ = make_music_relative (middle_c, m);
+ scm_gc_unprotect_object (m->self_scm ());
+ }
+ ;
- Pitch retpitch = p->to_relative_octave (pit);
- if (lily_1_8_relative)
- $$->set_mus_property ("last-pitch", retpitch.smobbed_copy ());
+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;
+ Grouped_music_list new_lyrics {
+
+ /* 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 context = scm_makfrom0str ("Lyrics");
+ Music *all = MY_MAKE_MUSIC ("SimultaneousMusic");
+
+ 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 ());
}
- | NEWADDLYRICS string Music {
- Music*l =MY_MAKE_MUSIC("NewLyricCombineMusic");
- l->set_mus_property ("element", $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
- $$ = l;
- l->set_mus_property ("associated-context", $2);
+ | LYRICSTO {
+ THIS->lexer_->push_lyric_state ();
+ } simple_string Music {
+ THIS->lexer_->pop_state ();
+ Music *music = $4;
+ SCM name = $3;
+ $$ = make_lyric_combine_music (name, music);
+ scm_gc_unprotect_object (music->self_scm ());
}
;
context_change:
CHANGE STRING '=' STRING {
- Music*t= MY_MAKE_MUSIC("TranslatorChange");
- t-> set_mus_property ("change-to-type", scm_string_to_symbol ($2));
- t-> set_mus_property ("change-to-id", $4);
+ 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_operation:
- STRING '=' scalar {
+ STRING '=' scalar {
$$ = scm_list_3 (ly_symbol2scm ("assign"),
scm_string_to_symbol ($1), $3);
}
- | UNSET STRING {
+ | UNSET simple_string {
$$ = scm_list_2 (ly_symbol2scm ("unset"),
scm_string_to_symbol ($2));
}
- | OVERRIDE STRING embedded_scm '=' embedded_scm {
+ | OVERRIDE simple_string embedded_scm '=' embedded_scm {
$$ = scm_list_4 (ly_symbol2scm ("push"),
scm_string_to_symbol ($2), $3, $5);
}
- | REVERT STRING embedded_scm {
+ | REVERT simple_string embedded_scm {
$$ = scm_list_3 (ly_symbol2scm ("pop"),
scm_string_to_symbol ($2), $3);
}
;
-translator_mod:
- CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); }
- | CONSISTS { $$ = ly_symbol2scm ("consists"); }
+context_def_mod:
+ CONSISTS { $$ = ly_symbol2scm ("consists"); }
| REMOVE { $$ = ly_symbol2scm ("remove"); }
| ACCEPTS { $$ = ly_symbol2scm ("accepts"); }
context_mod:
property_operation { $$ = $1; }
- | translator_mod STRING {
+ | context_def_mod STRING {
$$ = scm_list_2 ($1, $2);
}
;
context_prop_spec:
- STRING {
- $$ = scm_list_2 (ly_symbol2scm ("Bottom"), scm_string_to_symbol ($1));
+ simple_string {
+ if (!is_regular_identifier ($1))
+ {
+ THIS->here_input ().error (_("Grob name should be alphanumeric"));
+ }
+
+ $$ = scm_list_2 (ly_symbol2scm ("Bottom"),
+ scm_string_to_symbol ($1));
}
- | STRING '.' STRING {
- $$ = scm_list_2 (scm_string_to_symbol ($1), scm_string_to_symbol ($3));
+ | simple_string '.' simple_string {
+ $$ = scm_list_2 (scm_string_to_symbol ($1),
+ scm_string_to_symbol ($3));
}
;
OVERRIDE context_prop_spec embedded_scm '=' scalar {
$$ = property_op_to_music (scm_list_4 (
ly_symbol2scm ("poppush"),
- gh_cadr ($2),
+ ly_cadr ($2),
$3, $5));
- $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= 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"),
- gh_cadr ($2),
+ ly_cadr ($2),
$3));
- $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
| SET context_prop_spec '=' scalar {
$$ = property_op_to_music (scm_list_3 (
ly_symbol2scm ("assign"),
- gh_cadr ($2),
+ ly_cadr ($2),
$4));
- $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
| UNSET context_prop_spec {
$$ = property_op_to_music (scm_list_2 (
ly_symbol2scm ("unset"),
- gh_cadr ($2)));
- $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ ly_cadr ($2)));
+ $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
| ONCE music_property_def {
- SCM e = $2->get_mus_property ("element");
- unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T);
+ SCM e = $2->get_property ("element");
+ unsmob_music (e)->set_property ("once", SCM_BOOL_T);
$$ = $2;
-
+
}
;
+string:
+ STRING {
+ $$ = $1;
+ }
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
+ | string '+' string {
+ $$ = scm_string_append (scm_list_2 ($1, $3));
+ }
+ ;
-scalar:
- string { $$ = $1; }
- | bare_int { $$ = gh_int2scm ($1); }
- | embedded_scm { $$ = $1; }
- | full_markup { $$ = $1; }
- | DIGIT { $$ = gh_int2scm ($1); }
- ;
+simple_string: STRING {
+ $$ = $1;
+ }
+ | LYRICS_STRING {
+ $$ = $1;
+ }
+ ;
+
+scalar: string {
+ $$ = $1;
+ }
+ | LYRICS_STRING {
+ $$ = $1;
+ }
+ | bare_int {
+ $$ = scm_int2num ($1);
+ }
+ | embedded_scm {
+ $$ = $1;
+ }
+ | full_markup {
+ $$ = $1;
+ }
+ | DIGIT {
+ $$ = scm_int2num ($1);
+ }
+ ;
/*
-This is a trick:
+
+pre_events doesn't contain anything. It is a trick:
Adding pre_events to the simple_element
makes the choice between
a single shift/reduction conflict.
nevertheless, this is not very clean, and we should find a different
-solution.
+solution.
*/
pre_events: {
event_chord:
pre_events simple_element post_events {
- SCM elts = $2-> get_mus_property ("elements");
+ SCM elts = $2-> get_property ("elements");
- elts = gh_append2 (elts, scm_reverse_x ($3, SCM_EOL));
+ elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL));
- $2->set_mus_property ("elements", elts);
+ $2->set_property ("elements", elts);
$$ = $2;
}
| command_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 dur = unsmob_duration ($2)->smobbed_copy ();
+ SCM es = $1->get_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);
+ 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);
- $1-> set_mus_property ("elements", es);
+ $1-> set_property ("elements", es);
$$ = $1;
}
;
chord_close: '>'
;
-simul_open: LESSLESS
+simul_open: DOUBLE_ANGLE_OPEN
;
-simul_close: MOREMORE
+simul_close: DOUBLE_ANGLE_CLOSE
;
chord_body:
chord_open chord_body_elements chord_close
{
- $$ = MY_MAKE_MUSIC("EventChord");
- $$->set_mus_property ("elements",
+ $$ = 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 {
- $$ = gh_cons ($2->self_scm(), $1);
- scm_gc_unprotect_object ($2->self_scm());
+ $$ = scm_cons ($2->self_scm (), $1);
+ scm_gc_unprotect_object ($2->self_scm ());
}
;
chord_body_element:
- pitch exclamations questions post_events
+ pitch exclamations questions octave_check 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);
-
- if (gh_pair_p ($4)) {
- SCM arts = scm_reverse_x ($4, SCM_EOL);
- n->set_mus_property ("articulations", arts);
+ int q = $3;
+ int ex = $2;
+ SCM check = $4;
+ SCM post = $5;
+
+ Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ n->set_property ("pitch", $1);
+ if (q % 2)
+ n->set_property ("cautionary", SCM_BOOL_T);
+ if (ex % 2 || q % 2)
+ n->set_property ("force-accidental", SCM_BOOL_T);
+
+ if (ly_c_pair_p (post)) {
+ SCM arts = scm_reverse_x (post, SCM_EOL);
+ n->set_property ("articulations", arts);
+ }
+ if (ly_c_number_p (check))
+ {
+ int q = ly_scm2int (check);
+ n->set_property ("absolute-octave", scm_int2num (q-1));
}
+
+
$$ = n;
}
| DRUM_PITCH post_events {
- Music *n = MY_MAKE_MUSIC("NoteEvent");
- n->set_mus_property ("duration" ,$2);
- n->set_mus_property ("drum-type" , $1);
- n->set_spot (THIS->here_input());
+ Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ n->set_property ("duration", $2);
+ n->set_property ("drum-type", $1);
+ n->set_spot (THIS->here_input ());
- if (gh_pair_p ($2)) {
+ if (ly_c_pair_p ($2)) {
SCM arts = scm_reverse_x ($2, SCM_EOL);
- n->set_mus_property ("articulations", arts);
+ 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_req {
- $$ = MY_MAKE_MUSIC("EventChord");
- $$->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_mus_property ("duration", $2);
+ Music *skip = MY_MAKE_MUSIC ("SkipMusic");
+ skip->set_property ("duration", $2);
$$ = skip;
}
- | QUOTE duration_length STRING {
- Music * quote = MY_MAKE_MUSIC("QuoteMusic");
- quote->set_mus_property ("duration", $2);
- quote->set_mus_property ("quoted-name", $3);
+ | 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;
+ $$ = quote;
}
| OCTAVE { THIS->push_spot (); }
pitch {
- Music *l = MY_MAKE_MUSIC("RelativeOctaveCheck");
- $$ = l;
+ Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck");
+ $$ = m;
$$->set_spot (THIS->pop_spot ());
- $$->set_mus_property ("pitch", $3);
+ $$->set_property ("pitch", $3);
}
| E_LEFTSQUARE {
- Music *l = MY_MAKE_MUSIC("LigatureEvent");
- l->set_mus_property ("span-direction", gh_int2scm (START));
- l->set_spot (THIS->here_input ());
+ 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_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
- scm_gc_unprotect_object (l->self_scm());
+ $$ = 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("LigatureEvent");
- l->set_mus_property ("span-direction", gh_int2scm (STOP));
- 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("EventChord");
- $$->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);
}
| PARTIAL duration_length {
Moment m = - unsmob_duration ($2)->get_length ();
- Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
+ 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 ;
+ $$ = p;
}
| CLEF STRING {
- static SCM proc ;
- if (!proc)
- proc = scm_c_eval_string ("make-clef-set");
+ SCM proc = ly_scheme_function ("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 proc= ly_scheme_function ("make-time-signature-set");
- SCM result = scm_apply_2 (proc, gh_car ($2), gh_cdr ($2), SCM_EOL);
+ SCM result = scm_apply_2 (proc, ly_car ($2), ly_cdr ($2), SCM_EOL);
scm_gc_protect_object (result);
$$ = unsmob_music (result);
}
| MARK scalar {
- static SCM proc;
- if (!proc)
- proc = scm_c_eval_string ("make-mark-set");
+ SCM proc = ly_scheme_function ("make-mark-set");
SCM result = scm_call_1 (proc, $2);
scm_gc_protect_object (result);
;
command_req:
- BREATHE {
- $$ = MY_MAKE_MUSIC("BreathingSignEvent");
- }
- | E_TILDE {
- $$ = MY_MAKE_MUSIC("PesOrFlexaEvent");
+ E_TILDE {
+ $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
}
| MARK DEFAULT {
- Music * m = MY_MAKE_MUSIC("MarkEvent");
+ Music *m = MY_MAKE_MUSIC ("MarkEvent");
$$ = m;
}
| tempo_event {
$$ = $1;
}
| KEY DEFAULT {
- Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
+ Music *key= MY_MAKE_MUSIC ("KeyChangeEvent");
$$ = key;
}
| KEY NOTENAME_PITCH SCM_IDENTIFIER {
- Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
+ Music *key= MY_MAKE_MUSIC ("KeyChangeEvent");
if (scm_ilength ($3) > 0)
{
- key->set_mus_property ("pitch-alist", $3);
- key->set_mus_property ("tonic", Pitch (0,0,0).smobbed_copy());
+ 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->parser_error (_ ("Second argument must be pitch list."));
}
$$ = key;
}
| post_events post_event {
$2->set_spot (THIS->here_input ());
- $$ = gh_cons ($2->self_scm(), $$);
- scm_gc_unprotect_object ($2->self_scm());
+ $$ = scm_cons ($2->self_scm (), $$);
+ scm_gc_unprotect_object ($2->self_scm ());
}
| post_events tagged_post_event {
$2 -> set_spot (THIS->here_input ());
- $$ = scm_cons ($2->self_scm(), $$);
- scm_gc_unprotect_object ($2->self_scm());
+ $$ = scm_cons ($2->self_scm (), $$);
+ scm_gc_unprotect_object ($2->self_scm ());
}
;
| HYPHEN {
if (!THIS->lexer_->is_lyric_state ())
THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC("HyphenEvent");
+ $$ = MY_MAKE_MUSIC ("HyphenEvent");
}
| EXTENDER {
if (!THIS->lexer_->is_lyric_state ())
THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC("ExtenderEvent");
+ $$ = MY_MAKE_MUSIC ("ExtenderEvent");
}
| script_dir direction_reqd_event {
if ($1)
- $2->set_mus_property ("direction", gh_int2scm ($1));
+ $2->set_property ("direction", scm_int2num ($1));
$$ = $2;
}
| script_dir direction_less_event {
if ($1)
- $2->set_mus_property ("direction", gh_int2scm ($1));
+ $2->set_property ("direction", scm_int2num ($1));
$$ = $2;
}
| string_number_event
string_number_event:
E_UNSIGNED {
- Music * s = MY_MAKE_MUSIC("StringNumberEvent");
- s->set_mus_property ("string-number", gh_int2scm($1));
+ Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
+ s->set_property ("string-number", scm_int2num ($1));
s->set_spot (THIS->here_input ());
$$ = s;
}
(set-articulation '~ "trill")
*/
- Music * m = MY_MAKE_MUSIC ("BeamEvent");
- m->set_spot (THIS->here_input());
- m->set_mus_property ("span-direction" , gh_int2scm (START));
+ Music *m = MY_MAKE_MUSIC ("BeamEvent");
+ m->set_spot (THIS->here_input ());
+ m->set_property ("span-direction", scm_int2num (START));
$$ = m;
}
| ']' {
- Music * m = MY_MAKE_MUSIC ("BeamEvent");
- m->set_spot (THIS->here_input());
- m->set_mus_property ("span-direction" , gh_int2scm (STOP));
+ Music *m = MY_MAKE_MUSIC ("BeamEvent");
+ m->set_spot (THIS->here_input ());
+ m->set_property ("span-direction", scm_int2num (STOP));
$$ = m;
}
| '~' {
- Music * m = MY_MAKE_MUSIC ("TieEvent");
- m->set_spot (THIS->here_input());
+ Music *m = MY_MAKE_MUSIC ("TieEvent");
+ m->set_spot (THIS->here_input ());
$$ = m;
}
| close_event {
$$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction",
- gh_int2scm (START));
+ dynamic_cast<Music *> ($$)->set_property ("span-direction",
+ scm_int2num (START));
}
| open_event {
$$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction",
- gh_int2scm (STOP));
+ 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;
}
;
direction_reqd_event:
gen_text_def {
- $$ = $1;
+ $$ = $1;
}
| 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);
+ 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;
}
;
-oct_check:
+octave_check:
/**/ { $$ = SCM_EOL; }
- | '=' { $$ = gh_int2scm (0); }
- | '=' sub_quotes { $$ = gh_int2scm ($2); }
- | '=' sup_quotes { $$ = gh_int2scm ($2); }
+ | '=' { $$ = scm_int2num (0); }
+ | '=' sub_quotes { $$ = scm_int2num ($2); }
+ | '=' sup_quotes { $$ = scm_int2num ($2); }
;
sup_quotes:
$$ = 1;
}
| sub_quotes ',' {
- $$ ++ ;
+ $$++;
}
;
close_event:
'(' {
- Music * s= MY_MAKE_MUSIC("SlurEvent");
+ Music *s = MY_MAKE_MUSIC ("SlurEvent");
$$ = s;
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
| E_OPEN {
- Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent");
+ Music *s = MY_MAKE_MUSIC ("PhrasingSlurEvent");
$$ = s;
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
| E_SMALLER {
- Music *s =MY_MAKE_MUSIC("CrescendoEvent");
+ Music *s = MY_MAKE_MUSIC ("CrescendoEvent");
$$ = s;
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
| E_BIGGER {
- Music *s =MY_MAKE_MUSIC("DecrescendoEvent");
+ Music *s = MY_MAKE_MUSIC ("DecrescendoEvent");
$$ = s;
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
;
open_event:
E_EXCLAMATION {
- Music *s = MY_MAKE_MUSIC("CrescendoEvent");
- s->set_spot (THIS->here_input());
+ Music *s = MY_MAKE_MUSIC ("CrescendoEvent");
+ s->set_spot (THIS->here_input ());
$$ = s;
}
| ')' {
- Music * s= MY_MAKE_MUSIC("SlurEvent");
+ Music *s= MY_MAKE_MUSIC ("SlurEvent");
$$ = s;
- s->set_spot (THIS->here_input());
+ s->set_spot (THIS->here_input ());
}
| E_CLOSE {
- Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent");
+ 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:
full_markup {
- Music *t = MY_MAKE_MUSIC("TextScriptEvent");
- t->set_mus_property ("text", $1);
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ t->set_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));
+ 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 {
- Music * t = MY_MAKE_MUSIC("FingerEvent");
- t->set_mus_property ("digit", gh_int2scm ($1));
+ Music *t = MY_MAKE_MUSIC ("FingerEvent");
+ t->set_property ("digit", scm_int2num ($1));
t->set_spot (THIS->here_input ());
$$ = t;
}
steno_duration:
bare_unsigned dots {
- int l = 0;
- if (!is_is_duration ($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);
-
+ 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_is_duration ($2))
+ if (!is_duration ($2))
THIS->parser_error (_f ("not a duration: %d", $2));
$$ = $2;
}
;
-
-
-/*****************************************************************
- BASS FIGURES
-*****************************************************************/
bass_number:
DIGIT {
- $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10));
+ $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+ $$ = scm_list_2 (ly_scheme_function ("number-markup"),
+ $$);
}
| UNSIGNED {
- $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10));
+ $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+ $$ = scm_list_2 (ly_scheme_function ("number-markup"),
+ $$);
}
- | STRING { $$ = $1; }
+ | STRING { $$ = $1; }
;
bass_mod:
'-' { $$ = -2; }
- | '+' { $$ = 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", $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("EventChord");
+ 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 oct_check optional_notemode_duration optional_rest {
+ pitch exclamations questions octave_check optional_notemode_duration optional_rest {
Input i = THIS->pop_spot ();
if (!THIS->lexer_->is_note_state ())
Music *n = 0;
if ($6)
- n = MY_MAKE_MUSIC("RestEvent");
+ 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", $5);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration", $5);
- if (gh_number_p ($4))
+ if (ly_c_number_p ($4))
{
- int q = gh_scm2int ($4);
- n->set_mus_property ("absolute-octave", gh_int2scm (q-1));
+ 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("EventChord");
- v->set_mus_property ("elements", scm_list_1 (n->self_scm ()));
- 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);
| DRUM_PITCH optional_notemode_duration {
Input i = THIS->pop_spot ();
- Music *n = MY_MAKE_MUSIC("NoteEvent");
- n->set_mus_property ("duration" ,$2);
- n->set_mus_property ("drum-type" , $1);
+ 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_mus_property ("elements", scm_list_1 (n->self_scm ()));
- 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;
}
| 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))
+ for (SCM s = m->get_property ("elements"); ly_c_pair_p (s); s = ly_cdr (s))
{
- unsmob_music (ly_car (s))->set_mus_property ("duration", $2);
+ unsmob_music (ly_car (s))->set_property ("duration", $2);
}
$$ = m;
}
| RESTNAME optional_notemode_duration {
Input i = THIS->pop_spot ();
- Music * ev = 0;
- if (ly_scm2string ($1) =="s") {
+ Music *ev = 0;
+ if (ly_scm2string ($1) == "s") {
/* Space */
- ev = MY_MAKE_MUSIC("SkipEvent");
+ ev = MY_MAKE_MUSIC ("SkipEvent");
}
else {
- ev = MY_MAKE_MUSIC("RestEvent");
+ ev = MY_MAKE_MUSIC ("RestEvent");
}
- ev->set_mus_property ("duration" ,$2);
+ ev->set_property ("duration", $2);
ev->set_spot (i);
- Music * velt = MY_MAKE_MUSIC("EventChord");
- velt->set_mus_property ("elements", scm_list_1 (ev->self_scm ()));
+ 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());
+ scm_gc_unprotect_object (ev->self_scm ());
$$ = velt;
}
| MULTI_MEASURE_REST optional_notemode_duration {
THIS->pop_spot ();
- static SCM proc ;
- if (!proc)
- proc = scm_c_eval_string ("make-multi-measure-rest");
-
+ SCM proc = ly_scheme_function ("make-multi-measure-rest");
SCM mus = scm_call_2 (proc, $2,
- make_input (THIS->here_input()));
+ make_input (THIS->here_input ()));
scm_gc_protect_object (mus);
$$ = unsmob_music (mus);
}
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("EventChord");
- velt->set_mus_property ("elements", scm_list_1 (lreq->self_scm ()));
+ Music *velt = MY_MAKE_MUSIC ("EventChord");
+ velt->set_property ("elements", scm_list_1 (lreq->self_scm ()));
$$= velt;
}
;
lyric_element:
- full_markup { $$ = $1; }
- | STRING { $$ = $1 ; }
+ /* FIXME: lyric flavoured markup would be better */
+ full_markup {
+ }
+ | LYRICS_STRING {
+ }
;
new_chord:
}
| steno_tonic_pitch optional_notemode_duration chord_separator chord_items {
SCM its = scm_reverse_x ($4, SCM_EOL);
- $$ = make_chord ($1, $2, gh_cons ($3, its));
+ $$ = make_chord ($1, $2, scm_cons ($3, its));
}
;
$$ = SCM_EOL;
}
| chord_items chord_item {
- $$ = gh_cons ($2, $$);
+ $$ = scm_cons ($2, $$);
}
;
$$ = ly_symbol2scm ("chord-colon");
}
| CHORD_CARET {
- $$ = ly_symbol2scm ("chord-caret");
+ $$ = ly_symbol2scm ("chord-caret");
}
| CHORD_SLASH steno_tonic_pitch {
- $$ = scm_list_2 (ly_symbol2scm ("chord-slash"), $2);
+ $$ = scm_list_2 (ly_symbol2scm ("chord-slash"), $2);
}
| CHORD_BASS steno_tonic_pitch {
- $$ = scm_list_2 (ly_symbol2scm ("chord-bass"), $2);
+ $$ = scm_list_2 (ly_symbol2scm ("chord-bass"), $2);
}
;
;
step_numbers:
- step_number { $$ = gh_cons ($1, SCM_EOL); }
+ step_number { $$ = scm_cons ($1, SCM_EOL); }
| step_numbers '.' step_number {
- $$ = gh_cons ($3, $$);
+ $$ = scm_cons ($3, $$);
}
;
step_number:
bare_unsigned {
$$ = make_chord_step ($1, 0);
- }
+ }
| bare_unsigned '+' {
$$ = make_chord_step ($1, SHARP);
}
| bare_unsigned CHORD_MINUS {
$$ = make_chord_step ($1, FLAT);
}
- ;
+ ;
/*
UTILITIES
| number_expression '-' number_term {
$$ = scm_difference ($1, $3);
}
- | number_term
+ | number_term
;
number_term:
bare_number:
UNSIGNED {
- $$ = gh_int2scm ($1);
+ $$ = scm_int2num ($1);
}
| REAL {
$$ = $1;
$$ = $1;
}
| REAL NUMBER_IDENTIFIER {
- $$ = gh_double2scm (gh_scm2double ($1) * gh_scm2double ($2));
+ $$ = scm_make_real (ly_scm2double ($1) *ly_scm2double ($2));
}
| UNSIGNED NUMBER_IDENTIFIER {
- $$ = gh_double2scm ($1 * gh_scm2double ($2));
+ $$ = 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
{
}
;
-
-string:
- STRING {
- $$ = $1;
- }
- | STRING_IDENTIFIER {
- $$ = $1;
- }
- | string '+' string {
- $$ = scm_string_append (scm_list_2 ($1, $3));
- }
- ;
-
-
exclamations:
{ $$ = 0; }
| exclamations '!' { $$ ++; }
MARKUP_IDENTIFIER {
$$ = $1;
}
- | MARKUP
+ | MARKUP
{ THIS->lexer_->push_markup_state (); }
markup
{ $$ = $3;
/*
This should be done more dynamically if possible.
-*/
+*/
markup:
STRING {
- $$ = make_simple_markup ($1);
+ $$ = make_simple_markup (THIS->lexer_->encoding (), $1);
}
| MARKUP_HEAD_EMPTY {
$$ = scm_list_1 ($1);
$$ = scm_list_3 ($1, $2, $3);
}
| MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup {
- $$ = scm_list_3 ($1, $2, $3);
+ $$ = scm_list_3 ($1, $2, $3);
}
| markup_line {
$$ = $1;
| MARKUP_IDENTIFIER {
$$ = $1;
}
-
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
+ | SCORE {
+ SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
+ THIS->lexer_->push_note_state (alist_to_hashq (nn));
+ } '{' score_body '}' {
+ Score * sc = $4;
+ $$ = scm_list_2 (ly_scheme_function ("score-markup"), sc->self_scm ());
+ scm_gc_unprotect_object (sc->self_scm ());
+ THIS->lexer_->pop_state ();
+ }
;
markup_list:
markup_line:
'{' markup_list_body '}' {
- static SCM line ;
- if (!line)
- line = scm_c_eval_string ("line-markup");
+ SCM line = ly_scheme_function ("line-markup");
$$ = scm_list_2 (line, scm_reverse_x ($2, SCM_EOL));
}
markup_list_body:
/**/ { $$ = SCM_EOL; }
| markup_list_body markup {
- $$ = gh_cons ($2, $1) ;
+ $$ = scm_cons ($2, $1);
}
;
%%
void
-My_lily_parser::set_yydebug (bool )
+Lily_parser::set_yydebug (bool )
{
#if 0
yydebug = 1;
#endif
}
-extern My_lily_parser * current_parser;
-
void
-My_lily_parser::do_yyparse ()
+Lily_parser::do_yyparse ()
{
- current_parser = this;;
yyparse ((void*)this);
}
*/
void
-My_lily_parser::beam_check (SCM dur)
+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;
}
*/
int
-My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid)
+Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
{
- if (gh_string_p (sid)) {
+ if (ly_c_string_p (sid)) {
*destination = sid;
return STRING_IDENTIFIER;
- } else if (gh_number_p (sid)) {
+ } 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 TRANSLATOR_IDENTIFIER;
+ *destination = unsmob_context_def (sid)->clone_scm ();
+ return CONTEXT_DEF_IDENTIFIER;
} else if (unsmob_score (sid)) {
- Score *sc = new Score (*unsmob_score (sid));
- *destination =sc->self_scm ();
+ Score *score = new Score (*unsmob_score (sid));
+ *destination = score->self_scm ();
return SCORE_IDENTIFIER;
- } else if (Music * mus =unsmob_music (sid)) {
- *destination = unsmob_music (sid)->clone ()->self_scm();
+ } else if (Music *mus = unsmob_music (sid)) {
+ mus = mus->clone ();
+ *destination = mus->self_scm ();
unsmob_music (*destination)->
- set_mus_property ("origin", make_input (last_input_));
+ 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();
+ *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);
+ } else if (unsmob_output_def (sid)) {
+ Output_def *p = unsmob_output_def (sid);
p = p->clone ();
- *destination = p->self_scm();
- return MUSIC_OUTPUT_DEF_IDENTIFIER;
+ *destination = p->self_scm ();
+ return OUTPUT_DEF_IDENTIFIER;
} else if (Text_item::markup_p (sid)) {
*destination = sid;
return MARKUP_IDENTIFIER;
Music *
property_op_to_music (SCM op)
{
- Music * m = 0;
- SCM tag = gh_car (op);
- SCM symbol = gh_cadr (op);
- SCM args = gh_cddr (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 = gh_car (args);
+ m = MY_MAKE_MUSIC ("PropertySet");
+ val = ly_car (args);
}
else if (tag == ly_symbol2scm ("unset"))
- m = MY_MAKE_MUSIC("PropertyUnset");
+ m = MY_MAKE_MUSIC ("PropertyUnset");
else if (tag == ly_symbol2scm ("poppush")
|| tag == ly_symbol2scm ("push"))
{
- m = MY_MAKE_MUSIC("OverrideProperty");
- grob_sym = gh_car (args);
- grob_val = gh_cadr (args);
+ 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 = gh_car (args);
+ m = MY_MAKE_MUSIC ("RevertProperty");
+ grob_sym = ly_car (args);
}
- m->set_mus_property ("symbol", symbol);
+ m->set_property ("symbol", symbol);
if (val != SCM_UNDEFINED)
- m->set_mus_property ("value", val);
+ m->set_property ("value", val);
if (grob_val != SCM_UNDEFINED)
- m->set_mus_property ("grob-value", grob_val);
+ m->set_property ("grob-value", grob_val);
if (grob_sym != SCM_UNDEFINED)
{
bool itc = internal_type_checking_global_b;
/* UGH.
*/
- bool autobeam = gh_equal_p (symbol, ly_symbol2scm ("autoBeamSettings"));
+ bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm ("autoBeamSettings"));
if (autobeam)
internal_type_checking_global_b = false;
- m->set_mus_property ("grob-property", grob_sym);
+ m->set_property ("grob-property", grob_sym);
if (autobeam)
internal_type_checking_global_b = itc;
}
- if (op == ly_symbol2scm ("poppush"))
- m->set_mus_property ("pop-first", SCM_BOOL_T);
+ if (tag == 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)
+context_spec_music (SCM type, SCM id, Music *m, SCM ops)
{
- Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+ Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
- csm->set_mus_property ("element", m->self_scm ());
+ csm->set_property ("element", m->self_scm ());
scm_gc_unprotect_object (m->self_scm ());
- csm->set_mus_property ("context-type",
- gh_symbol_p (type) ? type : scm_string_to_symbol (type));
- csm->set_mus_property ("property-operations", ops);
+ csm->set_property ("context-type",
+ ly_c_symbol_p (type) ? type : scm_string_to_symbol (type));
+ csm->set_property ("property-operations", ops);
- if (gh_string_p (id))
- csm->set_mus_property ("context-id", id);
+ 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 ++);
-
+ snprintf (s, 1024, "uniqueContext%d", new_context_count++);
return scm_makfrom0str (s);
}