#include "book.hh"
+
#include "context-def.hh"
#include "dimensions.hh"
#include "event.hh"
#include "lilypond-input-version.hh"
#include "ly-module.hh"
#include "main.hh"
-#include "midi-def.hh"
#include "misc.hh"
#include "music-list.hh"
#include "music-sequence.hh"
-#include "my-lily-lexer.hh"
-#include "my-lily-parser.hh"
+#include "lily-lexer.hh"
+#include "lily-parser.hh"
#include "paper-book.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "scm-hash.hh"
#include "scm-option.hh"
#include "score.hh"
#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
Music *property_op_to_music (SCM op);
-Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops_);
-SCM get_next_unique_context ();
+Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops);
+SCM get_next_unique_context_id ();
+SCM get_next_unique_lyrics_context_id ();
#define YYERROR_VERBOSE 1
#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
tag_music (Music *m, SCM tag, Input ip)
{
SCM tags = m->get_property ("tags");
- if (ly_c_symbol_p (tag))
+ if (scm_is_symbol (tag))
tags = scm_cons (tag, tags);
else if (ly_c_list_p (tag))
tags = ly_append2 (tag, tags);
m->set_property ("tags", tags);
}
-
-
bool
is_regular_identifier (SCM id)
{
return v;
}
+
+SCM
+get_first_context_id (SCM type, Music *m)
+{
+ SCM id = m->get_property ("context-id");
+ if (SCM_BOOL_T == scm_equal_p (m->get_property ("context-type"), type)
+ && scm_is_string (m->get_property ("context-id"))
+ && scm_c_string_length (id) > 0)
+ {
+ return id;
+ }
+ return SCM_EOL;
+}
+
SCM
make_simple_markup (SCM encoding, SCM a)
{
- SCM simple = ly_scheme_function ("simple-markup");
- if (ly_c_symbol_p (encoding))
- return scm_list_3 (ly_scheme_function ("encoded-simple-markup"),
+ SCM simple = ly_lily_module_constant ("simple-markup");
+ if (scm_is_symbol (encoding))
+ return scm_list_3 (ly_lily_module_constant ("encoded-simple-markup"),
encoding, a);
return scm_list_2 (simple, a);
}
void
set_music_properties (Music *p, SCM a)
{
- for (SCM k = a; ly_c_pair_p (k); k = ly_cdr (k))
- p->internal_set_property (ly_caar (k), ly_cdar (k));
+ for (SCM k = a; scm_is_pair (k); k = scm_cdr (k))
+ p->internal_set_property (scm_caar (k), scm_cdar (k));
}
SCM
SCM
make_chord (SCM pitch, SCM dur, SCM modification_list)
{
- SCM chord_ctor = ly_scheme_function ("construct-chord");
+ SCM chord_ctor = ly_lily_module_constant ("construct-chord");
SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list);
scm_gc_protect_object (ch);
return ch;
ly_input_procedure_p (SCM x)
{
return ly_c_procedure_p (x)
- || (ly_c_pair_p (x) && ly_c_procedure_p (ly_car (x)));
+ || (scm_is_pair (x) && ly_c_procedure_p (scm_car (x)));
}
Music*
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 ADDLYRICS
%union {
Book *book;
- Music_output_def *outputdef;
+ Output_def *outputdef;
SCM scm;
String *string;
Music *music;
int
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 ();
%}
-%expect 4
+%expect 3
/*
- Four shift/reduce problems:
-
-1. foo = bar.
+ Three shift/reduce problems:
- "bar" -> String -> Lyric -> Music -> music-assignment
+2. \markup identifier.
- "bar" -> String -> string-assignment
+ (what? --hwn)
+3. \markup { }
-Similar problem for
+ (what? --hwn)
-2. \markup identifier.
-
-3. \markup { }
4. \repeat
\repeat .. \alternative
\repeat { \repeat } \alternative
)
-
---hwn
-
*/
%pure_parser
%token ACCEPTS
-%token ADDLYRICS
%token ADDQUOTE
-%token NEWADDLYRICS
+%token LYRICSTO
%token ALIAS
%token ALTERNATIVE
-%token APPLY
-%token APPLYCONTEXT
-%token APPLYOUTPUT
-%token AUTOCHANGE
%token BAR
%token BOOK
-%token BREATHE
%token CHANGE
%token CHORDMODIFIERS
%token CHORDS
-%token LESSLESS
-%token MOREMORE
+%token CHORDMODE
+%token DOUBLE_ANGLE_OPEN
+%token DOUBLE_ANGLE_CLOSE
%token CLEF
%token COMMANDSPANREQUEST
%token CONSISTS
-%token CONSISTSEND
%token CONTEXT
%token DEFAULT
%token DENIES
%token DESCRIPTION
%token EXTENDER
-%token FIGURES FIGURE_OPEN FIGURE_CLOSE
+%token FIGURES
+%token FIGUREMODE
+%token FIGURE_OPEN FIGURE_CLOSE
%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
-%token GRACE
-%token ACCIACCATURA
-%token APPOGGIATURA
%token GROBDESCRIPTIONS
%token HEADER
%token HYPHEN
%token INVALID
%token KEY
+%token LAYOUT
%token LYRICS
+%token LYRICMODE
%token MARK
%token MIDI
%token MULTI_MEASURE_REST
%token NAME
%token NEWCONTEXT
-%token NOTES
+%token NOTEMODE
+%token OBJECTID
%token OCTAVE
%token ONCE
%token OVERRIDE SET REVERT
%token PAPER
-%token PARTCOMBINE
%token PARTIAL
%token QUOTE
%token RELATIVE
%token SCM_T
%token SCORE
%token SEQUENTIAL
+%token ADDLYRICS
%token SIMULTANEOUS
%token SKIP
%token SPANREQUEST
%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 <book> book_block book_body
-%type <i> exclamations questions dots optional_rest
-%type <i> bass_mod
-%type <scm> grace_head
-%type <scm> oct_check
-%type <scm> context_mod_list
-%type <scm> lyric_element
-%type <scm> bass_number br_bass_figure bass_figure figure_list figure_spec
%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 CONTEXT_DEF_IDENTIFIER
-%token <scm> STRING_IDENTIFIER SCM_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_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 <scm> MUSIC_FUNCTION_MARKUP
+%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP
+%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC
+%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC
+%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC
-%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
+%token DRUMS
+%token DRUMMODE
-%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> Composite_music Simple_music Prefix_composite_music Generic_prefix_music
+%type <music> Grouped_music_list
%type <music> Music Sequential_music Simultaneous_music
-%type <music> relative_music re_rhythmed_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 context_def_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> 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 <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 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 <music> tempo_event
+%type <scm> context_mod context_def_mod optional_context_mod
+%type <scm> context_prop_spec
+%type <scm> direction_less_char
+%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> full_markup markup_list markup_composed_list markup_braced_list markup_braced_list_body
+%type <scm> markup_head_1_item markup_head_1_list markup simple_markup markup_top
+%type <scm> mode_changing_head
+%type <scm> mode_changing_head_with_context
+%type <scm> object_id_setting
+%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;
}
}
;
+
+object_id_setting:
+ OBJECTID STRING { $$ = $2; }
+ ;
+
toplevel_expression:
lilypond_header {
- THIS->header_ = $1;
+ THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
}
| add_quote {
+
}
| book_block {
Book *book = $1;
- SCM header = THIS->header_;
- Path outname = split_path (THIS->output_basename_);
- int *c = &THIS->book_count_;
- if (*c)
- outname.base += "-" + to_string (*c);
- (*c)++;
- Music_output_def *dp = unsmob_music_output_def
- (THIS->lexer_->lookup_identifier ("$defaultpaper"));
- book->process (outname.to_string (),
- dp ? dp->clone () : new Paper_def, header);
+ 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 *sc = $1;
- SCM head = is_module (sc->header_) ? sc->header_
- : THIS->header_.to_SCM ();
-
- Path p = split_path (THIS->output_basename_);
- int *c = &THIS->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;
- default_rendering (sc->music_, id->self_scm (), head,
- outname);
- scm_gc_unprotect_object (id->self_scm ());
- }
- scm_gc_unprotect_object (sc->self_scm ());
+ 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-layout") == SCM_BOOL_T)
+ id = ly_symbol2scm ("$defaultlayout");
+
+ THIS->lexer_->set_identifier (id, od->self_scm ());
+ scm_gc_unprotect_object (od->self_scm ());
}
;
+toplevel_music:
+ Composite_music {
+ }
+ ;
embedded_scm:
SCM_T
;
-
-
lilypond_header_body:
{
- $$ = ly_make_anonymous_module ();
+ $$ = ly_make_anonymous_module (safe_global_b);
THIS->lexer_->add_scope ($$);
}
| lilypond_header_body assignment {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | full_markup {
- $$ = $1;
- }
| output_def {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
scm_gc_unprotect_object ($$);
}
| number_expression {
- $$ = $1;
+ $$ = $1;
}
| string {
$$ = $1;
}
- | embedded_scm {
+ | embedded_scm {
$$ = $1;
}
+ | full_markup {
+ $$ = $1;
+ }
+ | DIGIT {
+ $$ = scm_int2num ($1);
+ }
;
context_def_spec_block:
$$ = Context_def::make_scm ();
unsmob_context_def ($$)->set_spot (THIS->here_input ());
}
- | CONTEXT_DEF_IDENTIFIER {
+ | CONTEXT_DEF_IDENTIFIER {
$$ = $1;
unsmob_context_def ($$)->set_spot (THIS->here_input ());
}
| context_def_spec_body GROBDESCRIPTIONS embedded_scm {
Context_def*td = unsmob_context_def ($$);
- for (SCM p = $3; ly_c_pair_p (p); p = ly_cdr (p)) {
- SCM tag = ly_caar (p);
+ for (SCM p = $3; scm_is_pair (p); p = scm_cdr (p)) {
+ SCM tag = scm_caar (p);
/* TODO: should make new tag "grob-definition" ? */
td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"),
- tag, scm_cons (ly_cdar (p), SCM_EOL)));
+ tag, scm_cons (scm_cdar (p), SCM_EOL)));
}
}
| context_def_spec_body context_mod {
}
;
+
+
book_block:
BOOK {
THIS->push_spot ();
}
;
+/* FIXME:
+ * Use 'handlers' like for toplevel-* stuff?
+ * grok \layout and \midi? */
book_body:
{
$$ = new Book;
$$->set_spot (THIS->here_input ());
+ $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
+ scm_gc_unprotect_object ($$->paper_->self_scm ());
+ $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader");
}
- | book_body score_block {
- $$->scores_.push ($2);
+ | book_body paper_block {
+ $$->paper_ = $2;
scm_gc_unprotect_object ($2->self_scm ());
}
+ | book_body score_block {
+ Score *score = $2;
+ $$->add_score (score);
+ }
+ | book_body lilypond_header {
+ $$->header_ = $2;
+ }
| book_body error {
+ $$->paper_ = 0;
+ $$->scores_.clear();
+ }
+ | book_body object_id_setting {
+ $$->user_key_ = ly_scm2string ($2);
}
;
;
score_body:
- Music {
+ /**/ {
$$ = new Score;
$$->set_spot (THIS->here_input ());
- SCM m = $1->self_scm ();
- scm_gc_unprotect_object (m);
-
- /*
- guh.
- */
- SCM check_funcs = ly_scheme_function ("toplevel-music-functions");
- for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs))
- m = scm_call_1 (ly_car (check_funcs), m);
- $$->music_ = m;
-
}
| SCORE_IDENTIFIER {
$$ = new Score ( *unsmob_score ($1));
$$->set_spot (THIS->here_input ());
}
+ | score_body object_id_setting {
+ $$->user_key_ = ly_scm2string ($2);
+ }
+ | score_body Music {
+ SCM m = $2->self_scm ();
+ scm_gc_unprotect_object (m);
+ $$->set_music (m, THIS->self_scm ());
+ }
| score_body lilypond_header {
$$->header_ = $2;
}
| score_body output_def {
- $$->defs_.push ($2);
+ if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
+ {
+ THIS->parser_error (_("\\paper cannot be in \\score. Use \\layout instead"));
+
+ }
+ else
+ {
+ $$->defs_.push ($2);
+ }
scm_gc_unprotect_object ($2->self_scm ());
}
| score_body error {
-
+ $$->error_found_ = true;
}
;
/*
- MIDI
+ OUTPUT DEF
*/
-output_def:
- music_output_def_body '}' {
+
+paper_block:
+ output_def {
$$ = $1;
- THIS-> lexer_-> remove_scope ();
+ if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
+ {
+ THIS->parser_error (_("Need \\paper for paper block."));
+ $$ = get_paper (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;
- 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:
+ PAPER {
+ $$ = get_paper (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;
+ | LAYOUT {
+ Output_def *p = get_layout (THIS);
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 ());
-
+ $$->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 context_def_spec_block {
- $$->assign_context_def ($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 = ly_scm2int ( $2->get_property ("metronome-count"));
+ int m = scm_to_int ($2->get_property ("metronome-count"));
Duration *d = unsmob_duration ($2->get_property ("tempo-unit"));
- Midi_def *md = dynamic_cast<Midi_def*> ($$);
- if (md)
- md->set_tempo (d->get_length (), m);
+ set_tempo ($$, d->get_length (), m);
scm_gc_unprotect_object ($2->self_scm ());
}
- | music_output_def_body error {
+ | output_def_body error {
}
;
(LIST . LAST-CONS)
- to have efficient append.
-*/
+ to have efficient append. */
+
Music_list:
/* empty */ {
$$ = scm_cons (SCM_EOL, SCM_EOL);
SCM s = $$;
SCM c = scm_cons ($2->self_scm (), SCM_EOL);
scm_gc_unprotect_object ($2->self_scm ()); /* UGH */
- if (ly_c_pair_p (ly_cdr (s)))
- scm_set_cdr_x (ly_cdr (s), c); /* append */
+
+ if (scm_is_pair (scm_cdr (s)))
+ scm_set_cdr_x (scm_cdr (s), c); /* append */
else
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 {
+ Music * m = MY_MAKE_MUSIC("Music");
+ // ugh. code dup
+ m->set_property ("error-found", SCM_BOOL_T);
+ SCM s = $$;
+ SCM c = scm_cons (m->self_scm (), SCM_EOL);
+ scm_gc_unprotect_object (m->self_scm ()); /* UGH */
+
+ if (scm_is_pair (scm_cdr (s)))
+ scm_set_cdr_x (scm_cdr (s), c); /* append */
+ else
+ scm_set_car_x (s, c); /* set first cons */
+ scm_set_cdr_x (s, c); /* remember last cell */
}
;
-
Music:
Simple_music
| Composite_music
}
;
+
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 = ly_c_pair_p ($5) ? ly_car ($5) : SCM_EOL;
+ SCM alts = scm_is_pair ($5) ? scm_car ($5) : SCM_EOL;
if (times < scm_ilength (alts)) {
- unsmob_music (ly_car (alts))
+ unsmob_music (scm_car (alts))
->origin ()->warning (
_ ("More alternatives than repeats. Junking excess alternatives."));
alts = ly_truncate_list (times, alts);
}
- SCM proc = ly_scheme_function ("make-repeated-music");
+ SCM proc = ly_lily_module_constant ("make-repeated-music");
SCM mus = scm_call_1 (proc, $2);
scm_gc_protect_object (mus); // UGH.
we can not get durations and other stuff correct down the line, so we have to
add to the duration log here.
*/
- SCM func = ly_scheme_function ("shift-duration-log");
+ SCM func = ly_lily_module_constant ("shift-duration-log");
int dots = ($3 % 3) ? 0 : 1;
int shift = -intlog2 ((dots) ? ($3*2/3) : $3);
Sequential_music:
SEQUENTIAL '{' Music_list '}' {
$$ = MY_MAKE_MUSIC ("SequentialMusic");
- $$->set_property ("elements", ly_car ($3));
+ $$->set_property ("elements", scm_car ($3));
$$->set_spot (THIS->here_input ());
}
| '{' Music_list '}' {
$$ = MY_MAKE_MUSIC ("SequentialMusic");
- $$->set_property ("elements", ly_car ($2));
+ $$->set_property ("elements", scm_car ($2));
$$->set_spot (THIS->here_input ());
}
;
Simultaneous_music:
SIMULTANEOUS '{' Music_list '}'{
$$ = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$->set_property ("elements", ly_car ($3));
+ $$->set_property ("elements", scm_car ($3));
$$->set_spot (THIS->here_input ());
}
| simul_open Music_list simul_close {
$$ = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$->set_property ("elements", ly_car ($2));
+ $$->set_property ("elements", scm_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_property ("procedure", $2);
- $$->set_spot (THIS->here_input ());
- }
- | APPLYCONTEXT embedded_scm {
- if (!ly_input_procedure_p ($2))
- THIS->parser_error (_ ("\\applycontext takes function argument"));
- $$ = MY_MAKE_MUSIC ("ApplyContext");
- $$->set_property ("procedure", $2);
- $$->set_spot (THIS->here_input ());
- }
| MUSIC_IDENTIFIER {
$$ = unsmob_music ($1);
}
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:
}
;
+
Composite_music:
- AUTOCHANGE Music {
- SCM proc = ly_scheme_function ("make-autochange-music");
-
- SCM res = scm_call_1 (proc, $2->self_scm ());
- scm_gc_unprotect_object ($2->self_scm ());
- $$ = unsmob_music (res);
- scm_gc_protect_object (res);
- $$->set_spot (THIS->here_input ());
- }
- | PARTCOMBINE Music Music {
- SCM proc = ly_scheme_function ("make-part-combine-music");
+ Prefix_composite_music { $$ = $1; }
+ | Grouped_music_list { $$ = $1; }
+ ;
- SCM res = scm_call_1 (proc, scm_listify ($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_MARKUP {
+ THIS->push_spot ();
+ } full_markup {
+ $$ = 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.
- */
-
-/*
+ | 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_SCM_SCM_MUSIC {
+ THIS->push_spot ();
+ } embedded_scm embedded_scm Music {
+ $$ = scm_list_5 ($1, make_input (THIS->pop_spot ()), $3, $4, $5->self_scm ());
+ }
+ | MUSIC_FUNCTION_MARKUP_MUSIC {
+ THIS->push_spot ();
+ } full_markup Music {
+ $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4->self_scm ());
+ scm_gc_unprotect_object ($4->self_scm ());
+ }
+ | MUSIC_FUNCTION_MARKUP_MARKUP {
+ THIS->push_spot ();
+ } full_markup full_markup {
+ $$ = 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 ());
+ }
+ | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC {
+ THIS->push_spot ();
+ } full_markup 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 ());
+ }
+ ;
-TODO: should distinguish between both grace types in the
-basic music objects too, since the meaning is different.
+Generic_prefix_music:
+ Generic_prefix_music_scm {
+ SCM func = scm_car ($1);
+ Input *loc = unsmob_input (scm_cadr ($1));
+ SCM args = scm_cddr ($1);
+ SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
-*/
+ SCM type_check_proc = ly_lily_module_constant ("type-check-list");
+ bool ok = true;
- 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);
+ if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr ($1), sig, args)))
+ {
+ THIS->error_level_ = 1;
+ ok = false;
+ }
- Music *startm = unsmob_music (start);
- Music *stopm = unsmob_music (stop);
+ SCM m = SCM_EOL;
+ if (ok)
+ m = scm_apply_0 (func, scm_cons (THIS->self_scm(),
+ scm_cdr ($1)));
- 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 ());
- }
+ 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_property ("elements", ms);
-
- $$ = MY_MAKE_MUSIC ("GraceMusic");
- $$->set_property ("element", seq->self_scm ());
- scm_gc_unprotect_object (seq->self_scm ());
-#else
- $$ = MY_MAKE_MUSIC ("GraceMusic");
- $$->set_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_id (), $4,
+ $3);
}
| TIMES {
fraction Music
{
- int n = ly_scm2int (ly_car ($3)); int d = ly_scm2int (ly_cdr ($3));
+ int n = scm_to_int (scm_car ($3)); int d = scm_to_int (scm_cdr ($3));
Music *mp = $4;
$$= MY_MAKE_MUSIC ("TimeScaledMusic");
}
| Repeated_music { $$ = $1; }
- | Simultaneous_music { $$ = $1; }
- | Sequential_music { $$ = $1; }
| 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));
+ p->transpose (pitch_interval (from, to));
$$->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;
- }
+ | mode_changing_head Grouped_music_list {
+ if ($1 == ly_symbol2scm ("chords"))
+ {
+ Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
+ chm->set_property ("element", $2->self_scm ());
+ $$ = chm;
+ scm_gc_unprotect_object ($2->self_scm ());
+ }
else
- {
- SCM ret = scm_call_1 ($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;
- }
+ {
+ $$ = $2;
+ }
+ THIS->lexer_->pop_state ();
}
- | NOTES
+ | mode_changing_head_with_context optional_context_mod Grouped_music_list {
+ $$ = context_spec_music ($1, get_next_unique_context_id (),
+ $3, $2);
+ if ($1 == ly_symbol2scm ("ChordNames"))
{
+ Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
+ chm->set_property ("element", $$->self_scm ());
+ scm_gc_unprotect_object ($$->self_scm ());
+ $$ = chm;
+ }
+ THIS->lexer_->pop_state ();
+ }
+ | relative_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
+ | TAG embedded_scm Music {
+ tag_music ($3, $2, THIS->here_input ());
+ $$ = $3;
+ }
+ ;
+
+mode_changing_head:
+ NOTEMODE {
SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
THIS->lexer_->push_note_state (alist_to_hashq (nn));
+
+ $$ = ly_symbol2scm ("notes");
}
- Music
- { $$ = $3;
- THIS->lexer_->pop_state ();
- }
- | DRUMS
+ | DRUMMODE
{
SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
THIS->lexer_->push_note_state (alist_to_hashq (nn));
+
+ $$ = ly_symbol2scm ("drums");
}
- Music
- { $$ = $3;
- THIS->lexer_->pop_state ();
- }
- | FIGURES
- { THIS->lexer_->push_figuredbass_state (); }
- Music
- {
- Music *chm = MY_MAKE_MUSIC ("UntransposableMusic");
- chm->set_property ("element", $3->self_scm ());
- $$ = chm;
- scm_gc_unprotect_object ($3->self_scm ());
+ | FIGUREMODE {
+ THIS->lexer_->push_figuredbass_state ();
+
+ $$ = ly_symbol2scm ("figures");
+ }
+ | CHORDMODE {
+ SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
+ THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
+ nn = THIS->lexer_->lookup_identifier ("pitchnames");
+ THIS->lexer_->push_chord_state (alist_to_hashq (nn));
+ $$ = ly_symbol2scm ("chords");
+
+ }
+ | LYRICMODE
+ { THIS->lexer_->push_lyric_state ();
+ $$ = ly_symbol2scm ("lyrics");
+ }
+ ;
+
+mode_changing_head_with_context:
+ DRUMS {
+ SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
+ THIS->lexer_->push_note_state (alist_to_hashq (nn));
+
+ $$ = ly_symbol2scm ("DrumStaff");
+ }
+ | FIGURES {
+ THIS->lexer_->push_figuredbass_state ();
- THIS->lexer_->pop_state ();
+ $$ = ly_symbol2scm ("FiguredBass");
}
| CHORDS {
SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
nn = THIS->lexer_->lookup_identifier ("pitchnames");
THIS->lexer_->push_chord_state (alist_to_hashq (nn));
-
- } Music {
- 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 ();
+ $$ = ly_symbol2scm ("ChordNames");
}
| LYRICS
- { THIS->lexer_->push_lyric_state (); }
- Music
- {
- $$ = $3;
- THIS->lexer_->pop_state ();
- }
- | relative_music { $$ = $1; }
- | re_rhythmed_music { $$ = $1; }
- | TAG embedded_scm Music {
- tag_music ($3, $2, THIS->here_input ());
- $$ = $3;
+ { THIS->lexer_->push_lyric_state ();
+ $$ = ly_symbol2scm ("Lyrics");
}
;
+
relative_music:
RELATIVE absolute_pitch Music {
- Music *p = $3;
- Pitch pit = *unsmob_pitch ($2);
- $$ = MY_MAKE_MUSIC ("RelativeOctaveMusic");
+ 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;
- $$->set_property ("element", p->self_scm ());
- scm_gc_unprotect_object (p->self_scm ());
+ Pitch middle_c (0, 0, 0);
+ $$ = make_music_relative (middle_c, m);
+ scm_gc_unprotect_object (m->self_scm ());
+ }
+ ;
+new_lyrics:
+ ADDLYRICS { 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 ();
- Pitch retpitch = p->to_relative_octave (pit);
- if (lily_1_8_relative)
- $$->set_property ("last-pitch", retpitch.smobbed_copy ());
+ $$ = scm_cons ($3->self_scm (), SCM_EOL);
+ }
+ | new_lyrics ADDLYRICS {
+ 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_property ("elements", scm_listify ($2->self_scm (), $3->self_scm (), SCM_UNDEFINED));
- scm_gc_unprotect_object ($3->self_scm ());
- scm_gc_unprotect_object ($2->self_scm ());
- $$ = l;
+ Grouped_music_list new_lyrics {
+ Music * voice = $1;
+ SCM name = get_first_context_id (scm_makfrom0str ("Voice"), voice);
+ if (!scm_is_string (name))
+ {
+ name = get_next_unique_lyrics_context_id ();
+ voice = context_spec_music (scm_makfrom0str ("Voice"),
+ name,
+ voice, SCM_EOL);
+ }
+
+ SCM context = scm_makfrom0str ("Lyrics");
+ Music *all = MY_MAKE_MUSIC ("SimultaneousMusic");
+
+ SCM lst = SCM_EOL;
+ for (SCM s = $2; scm_is_pair (s); s = scm_cdr (s))
+ {
+ Music *music = unsmob_music (scm_car (s));
+ Music *com = make_lyric_combine_music (name, music);
+ Music *csm = context_spec_music (context,
+ get_next_unique_context_id (), com, SCM_EOL);
+ lst = scm_cons (csm->self_scm (), lst);
+ }
+ all->set_property ("elements", scm_cons (voice->self_scm (),
+ lst));
+ $$ = all;
+ scm_gc_unprotect_object (voice->self_scm ());
}
- | NEWADDLYRICS string Music {
- Music *l = MY_MAKE_MUSIC ("NewLyricCombineMusic");
- l->set_property ("element", $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
- $$ = l;
- l->set_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 ("ContextChange");
+ Music*t = MY_MAKE_MUSIC ("ContextChange");
t-> set_property ("change-to-type", scm_string_to_symbol ($2));
t-> set_property ("change-to-id", $4);
;
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);
}
;
context_def_mod:
- CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); }
- | CONSISTS { $$ = ly_symbol2scm ("consists"); }
+ CONSISTS { $$ = ly_symbol2scm ("consists"); }
| REMOVE { $$ = ly_symbol2scm ("remove"); }
| ACCEPTS { $$ = ly_symbol2scm ("accepts"); }
;
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"),
- ly_cadr ($2),
+ scm_cadr ($2),
$3, $5));
- $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
| REVERT context_prop_spec embedded_scm {
$$ = property_op_to_music (scm_list_3 (
ly_symbol2scm ("pop"),
- ly_cadr ($2),
+ scm_cadr ($2),
$3));
- $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
| SET context_prop_spec '=' scalar {
$$ = property_op_to_music (scm_list_3 (
ly_symbol2scm ("assign"),
- ly_cadr ($2),
+ scm_cadr ($2),
$4));
- $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
| UNSET context_prop_spec {
$$ = property_op_to_music (scm_list_2 (
ly_symbol2scm ("unset"),
- ly_cadr ($2)));
- $$= context_spec_music (ly_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ scm_cadr ($2)));
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
| ONCE music_property_def {
SCM e = $2->get_property ("element");
;
+string:
+ STRING {
+ $$ = $1;
+ }
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
+ | string '+' string {
+ $$ = scm_string_append (scm_list_2 ($1, $3));
+ }
+ ;
+
+simple_string: STRING {
+ $$ = $1;
+ }
+ | LYRICS_STRING {
+ $$ = $1;
+ }
+ ;
-scalar:
- string { $$ = $1; }
- | bare_int { $$ = scm_int2num ($1); }
- | embedded_scm { $$ = $1; }
- | full_markup { $$ = $1; }
- | DIGIT { $$ = scm_int2num ($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
SCM es = $1->get_property ("elements");
SCM postevs = scm_reverse_x ($3, SCM_EOL);
- for (SCM s = es; ly_c_pair_p (s); s = ly_cdr (s))
- unsmob_music (ly_car (s))->set_property ("duration", dur);
+ for (SCM s = es; scm_is_pair (s); s = scm_cdr (s))
+ unsmob_music (scm_car (s))->set_property ("duration", dur);
es = ly_append2 (es, postevs);
$1-> set_property ("elements", es);
chord_close: '>'
;
-simul_open: LESSLESS
+simul_open: DOUBLE_ANGLE_OPEN
;
-simul_close: MOREMORE
+simul_close: DOUBLE_ANGLE_CLOSE
;
chord_body:
;
chord_body_element:
- pitch exclamations questions post_events
+ pitch exclamations questions octave_check post_events
{
+ int q = $3;
+ int ex = $2;
+ SCM check = $4;
+ SCM post = $5;
+
Music *n = MY_MAKE_MUSIC ("NoteEvent");
n->set_property ("pitch", $1);
- if ($3 % 2)
+ if (q % 2)
n->set_property ("cautionary", SCM_BOOL_T);
- if ($2 % 2 || $3 % 2)
+ if (ex % 2 || q % 2)
n->set_property ("force-accidental", SCM_BOOL_T);
- if (ly_c_pair_p ($4)) {
- SCM arts = scm_reverse_x ($4, SCM_EOL);
+ if (scm_is_pair (post)) {
+ SCM arts = scm_reverse_x (post, SCM_EOL);
n->set_property ("articulations", arts);
}
+ if (scm_is_number (check))
+ {
+ int q = scm_to_int (check);
+ n->set_property ("absolute-octave", scm_int2num (q-1));
+ }
+
+
$$ = n;
}
| DRUM_PITCH post_events {
n->set_property ("drum-type", $1);
n->set_spot (THIS->here_input ());
- if (ly_c_pair_p ($2)) {
+ if (scm_is_pair ($2)) {
SCM arts = scm_reverse_x ($2, SCM_EOL);
n->set_property ("articulations", arts);
}
add_quote:
ADDQUOTE string Music {
- SCM adder = ly_scheme_function ("add-quotable");
+ SCM adder = ly_lily_module_constant ("add-quotable");
scm_call_2 (adder, $2, $3->self_scm ());
scm_gc_unprotect_object ($3->self_scm ());
$$ = skip;
}
- | QUOTE STRING duration_length {
- SCM tab = THIS->lexer_->lookup_identifier ("musicQuotes");
- SCM evs = SCM_EOL;
- if (scm_hash_table_p (tab) == SCM_BOOL_T)
- {
- SCM key = $2; // use symbol?
- evs = scm_hash_ref (tab, key, SCM_BOOL_F);
- }
- Music *quote = 0;
- if (ly_c_vector_p (evs))
- {
- quote = MY_MAKE_MUSIC ("QuoteMusic");
- quote->set_property ("duration", $3);
- quote->set_property ("quoted-events", evs);
- } else {
- THIS->here_input ().warning (_f ("Can\'t find music"));
- quote = MY_MAKE_MUSIC ("Event");
- }
- quote->set_spot (THIS->here_input ());
- $$ = quote;
- }
| OCTAVE { THIS->push_spot (); }
pitch {
- Music *l = MY_MAKE_MUSIC ("RelativeOctaveCheck");
- $$ = l;
+ Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck");
+ $$ = m;
$$->set_spot (THIS->pop_spot ());
$$->set_property ("pitch", $3);
}
| E_LEFTSQUARE {
- Music *l = MY_MAKE_MUSIC ("LigatureEvent");
- l->set_property ("span-direction", scm_int2num (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_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
- scm_gc_unprotect_object (l->self_scm ());
+ $$->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_property ("span-direction", scm_int2num (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_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
+ $$->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");
$$->set_spot (THIS->here_input ());
}
| '|' {
- SCM pipe =THIS->lexer_->lookup_identifier ("pipeSymbol");
+ SCM pipe = THIS->lexer_->lookup_identifier ("pipeSymbol");
if (Music * m = unsmob_music (pipe))
$$ = m->clone ();
$$->set_spot (THIS->here_input ());
}
| TRANSPOSITION pitch {
+ Pitch middle_c;
+ Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c);
$$ = set_property_music (ly_symbol2scm ("instrumentTransposition"),
- $2);
+ sounds_as_c.smobbed_copy());
$$->set_spot (THIS-> here_input ());
$$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED,
$$, SCM_EOL);
$$ = p;
}
| CLEF STRING {
- SCM proc = ly_scheme_function ("make-clef-set");
+ SCM proc = ly_lily_module_constant ("make-clef-set");
SCM result = scm_call_1 (proc, $2);
scm_gc_protect_object (result);
$$ = unsmob_music (result);
}
| TIME_T fraction {
- SCM proc= ly_scheme_function ("make-time-signature-set");
+ SCM proc = ly_lily_module_constant ("make-time-signature-set");
- SCM result = scm_apply_2 (proc, ly_car ($2), ly_cdr ($2), SCM_EOL);
+ SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
scm_gc_protect_object (result);
$$ = unsmob_music (result);
}
| MARK scalar {
- SCM proc = ly_scheme_function ("make-mark-set");
+ SCM proc = ly_lily_module_constant ("make-mark-set");
SCM result = scm_call_1 (proc, $2);
scm_gc_protect_object (result);
;
command_req:
- BREATHE {
- $$ = MY_MAKE_MUSIC ("BreathingSignEvent");
- }
- | E_TILDE {
+ E_TILDE {
$$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
}
| MARK DEFAULT {
$$ = $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_property ("pitch-alist", $3);
key->set_property ("tonic", Pitch (0,0,0).smobbed_copy ());
- ((Music*)key)->transpose (* unsmob_pitch ($2));
+ key->transpose (* unsmob_pitch ($2));
} else {
THIS->parser_error (_ ("Second argument must be pitch list."));
}
}
;
-
-direction_less_event:
+direction_less_char:
'[' {
-
-
-/*
-
-TODO: should take all these defs out of the parser, adn make use
-configurable, i.e.
-
-
-(set-articulation '~ "trill")
-
-*/
- Music *m = MY_MAKE_MUSIC ("BeamEvent");
- m->set_spot (THIS->here_input ());
- m->set_property ("span-direction", scm_int2num (START));
- $$ = m;
+ $$ = ly_symbol2scm ("bracketOpenSymbol");
}
| ']' {
- Music *m = MY_MAKE_MUSIC ("BeamEvent");
- m->set_spot (THIS->here_input ());
- m->set_property ("span-direction", scm_int2num (STOP));
- $$ = m;
+ $$ = ly_symbol2scm ("bracketCloseSymbol");
}
- | '~' {
- Music *m = MY_MAKE_MUSIC ("TieEvent");
- m->set_spot (THIS->here_input ());
- $$ = m;
+ | '~' {
+ $$ = ly_symbol2scm ("tildeSymbol");
}
- | close_event {
- $$ = $1;
- dynamic_cast<Music *> ($$)->set_property ("span-direction",
- scm_int2num (START));
+ | '(' {
+ $$ = ly_symbol2scm ("parenthesisOpenSymbol");
}
- | open_event {
- $$ = $1;
- dynamic_cast<Music *> ($$)->set_property ("span-direction",
- scm_int2num (STOP));
+ | ')' {
+ $$ = ly_symbol2scm ("parenthesisCloseSymbol");
+ }
+ | E_EXCLAMATION {
+ $$ = ly_symbol2scm ("escapedExclamationSymbol");
+ }
+ | E_OPEN {
+ $$ = ly_symbol2scm ("escapedParenthesisOpenSymbol");
+ }
+ | E_CLOSE {
+ $$ = ly_symbol2scm ("escapedParenthesisCloseSymbol");
+ }
+ | E_BIGGER {
+ $$ = ly_symbol2scm ("escapedBiggerSymbol");
+ }
+ | E_SMALLER {
+ $$ = ly_symbol2scm ("escapedSmallerSymbol");
+ }
+ ;
+
+direction_less_event:
+ direction_less_char {
+ SCM predefd = THIS->lexer_->lookup_identifier_symbol ($1);
+ Music * m = 0;
+ if (unsmob_music (predefd))
+ {
+ m = unsmob_music (predefd)->clone ();
+ }
+ else
+ {
+ m = MY_MAKE_MUSIC ("Music");
+ }
+ m->set_spot (THIS->here_input ());
+ $$ = m;
}
| EVENT_IDENTIFIER {
$$ = unsmob_music ($1);
| script_abbreviation {
SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
Music *a = MY_MAKE_MUSIC ("ArticulationEvent");
- if (ly_c_string_p (s))
+ if (scm_is_string (s))
a->set_property ("articulation-type", s);
else THIS->parser_error (_ ("Expecting string as script definition"));
$$ = a;
}
;
-oct_check:
+octave_check:
/**/ { $$ = SCM_EOL; }
| '=' { $$ = scm_int2num (0); }
| '=' sub_quotes { $$ = scm_int2num ($2); }
| steno_tonic_pitch
;
-close_event:
- '(' {
- Music *s = MY_MAKE_MUSIC ("SlurEvent");
- $$ = s;
- s->set_spot (THIS->here_input ());
- }
- | E_OPEN {
- Music *s = MY_MAKE_MUSIC ("PhrasingSlurEvent");
- $$ = s;
- s->set_spot (THIS->here_input ());
- }
- | E_SMALLER {
- Music *s = MY_MAKE_MUSIC ("CrescendoEvent");
- $$ = s;
- s->set_spot (THIS->here_input ());
- }
- | E_BIGGER {
- Music *s = MY_MAKE_MUSIC ("DecrescendoEvent");
- $$ = s;
- s->set_spot (THIS->here_input ());
- }
- ;
-
-
-open_event:
- E_EXCLAMATION {
- Music *s = MY_MAKE_MUSIC ("CrescendoEvent");
- s->set_spot (THIS->here_input ());
-
- $$ = s;
- }
- | ')' {
- Music *s= MY_MAKE_MUSIC ("SlurEvent");
- $$ = s;
- s->set_spot (THIS->here_input ());
-
- }
- | E_CLOSE {
- Music *s= MY_MAKE_MUSIC ("PhrasingSlurEvent");
- $$ = s;
- 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");
}
| string {
Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
- t->set_property ("text", make_simple_markup (THIS->lexer_->encoding (), $1));
+ t->set_property ("text",
+ make_simple_markup (THIS->lexer_->encoding (), $1));
t->set_spot (THIS->here_input ());
$$ = t;
}
;
-
-
-
multiplied_duration:
steno_duration {
$$ = $1;
$$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy ();
}
| multiplied_duration '*' FRACTION {
- Rational m (ly_scm2int (ly_car ($3)), ly_scm2int (ly_cdr ($3)));
+ Rational m (scm_to_int (scm_car ($3)), scm_to_int (scm_cdr ($3)));
$$ = unsmob_duration ($$)->compressed (m).smobbed_copy ();
}
}
;
-
tremolo_type:
':' {
$$ = 0;
}
;
-
-
-/*****************************************************************
- BASS FIGURES
-*****************************************************************/
bass_number:
DIGIT {
$$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+ $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
+ $$);
}
| UNSIGNED {
$$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+ $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
+ $$);
}
| STRING { $$ = $1; }
;
Music *m = unsmob_music ($1);
if ($2) {
SCM salter = m->get_property ("alteration");
- int alter = is_number (salter) ? ly_scm2int (salter) : 0;
+ int alter = scm_is_number (salter) ? scm_to_int (salter) : 0;
m->set_property ("alteration",
scm_int2num (alter + $2));
} else {
;
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 ())
n->set_property ("pitch", $1);
n->set_property ("duration", $5);
- if (is_number ($4))
+ if (scm_is_number ($4))
{
- int q = ly_scm2int ($4);
+ int q = scm_to_int ($4);
n->set_property ("absolute-octave", scm_int2num (q-1));
}
Music *m = unsmob_music ($1);
Input i = THIS->pop_spot ();
m->set_spot (i);
- for (SCM s = m->get_property ("elements"); ly_c_pair_p (s); s = ly_cdr (s))
+ for (SCM s = m->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
{
- unsmob_music (ly_car (s))->set_property ("duration", $2);
+ unsmob_music (scm_car (s))->set_property ("duration", $2);
}
$$ = m;
}
| MULTI_MEASURE_REST optional_notemode_duration {
THIS->pop_spot ();
- SCM proc = ly_scheme_function ("make-multi-measure-rest");
+ SCM proc = ly_lily_module_constant ("make-multi-measure-rest");
SCM mus = scm_call_2 (proc, $2,
make_input (THIS->here_input ()));
scm_gc_protect_object (mus);
;
lyric_element:
- full_markup { $$ = $1; }
- | STRING { $$ = $1; }
+ /* FIXME: lyric flavoured markup would be better */
+ full_markup {
+ $$ = $1;
+ }
+ | LYRICS_STRING {
+ $$ = make_simple_markup (THIS->lexer_->encoding (), $1);
+ }
;
new_chord:
$$ = $1;
}
| REAL NUMBER_IDENTIFIER {
- $$ = scm_make_real (ly_scm2double ($1) *ly_scm2double ($2));
+ $$ = scm_make_real (scm_to_double ($1) *scm_to_double ($2));
}
| UNSIGNED NUMBER_IDENTIFIER {
- $$ = scm_make_real ($1 *ly_scm2double ($2));
+ $$ = scm_make_real ($1 *scm_to_double ($2));
}
;
bare_number {
if (scm_integer_p ($1) == SCM_BOOL_T)
{
- int k = ly_scm2int ($1);
+ int k = scm_to_int ($1);
$$ = k;
} else
{
}
;
-
-string:
- STRING {
- $$ = $1;
- }
- | STRING_IDENTIFIER {
- $$ = $1;
- }
- | string '+' string {
- $$ = scm_string_append (scm_list_2 ($1, $3));
- }
- ;
-
-
exclamations:
{ $$ = 0; }
| exclamations '!' { $$ ++; }
| questions '?' { $$ ++; }
;
-
+/*
+This should be done more dynamically if possible.
+*/
full_markup:
MARKUP_IDENTIFIER {
$$ = $1;
- }
+ }
| MARKUP
{ THIS->lexer_->push_markup_state (); }
- markup
- { $$ = $3;
- THIS->lexer_->pop_state ();
- }
+ markup_top {
+ $$ = $3;
+ THIS->lexer_->pop_state ();
+ }
;
+markup_top:
+ markup_list {
+ $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1);
+ }
+ | markup_head_1_list simple_markup {
+ $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2)));
+ }
+ | simple_markup {
+ $$ = $1;
+ }
+ ;
-/*
-This should be done more dynamically if possible.
-*/
-markup:
- STRING {
- $$ = make_simple_markup (THIS->lexer_->encoding (), $1);
+markup_list:
+ markup_composed_list {
+ $$ = $1;
}
- | MARKUP_HEAD_EMPTY {
+ | markup_braced_list {
+ $$ = $1;
+ }
+ ;
+
+markup_composed_list:
+ markup_head_1_list markup_braced_list {
+ $$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2);
+
+ }
+ ;
+
+markup_braced_list:
+ '{' markup_braced_list_body '}' {
+ $$ = scm_reverse_x ($2, SCM_EOL);
+ }
+ ;
+
+markup_braced_list_body:
+ /* empty */ { $$ = scm_list (SCM_EOL); }
+ | markup_braced_list_body markup {
+ $$ = scm_cons ($2, $1);
+ }
+ | markup_braced_list_body markup_list {
+ $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1));
+ }
+ ;
+
+markup_head_1_item:
+ MARKUP_HEAD_MARKUP0 {
$$ = scm_list_1 ($1);
}
- | MARKUP_HEAD_MARKUP0 markup {
+ | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm {
$$ = scm_list_2 ($1, $2);
}
- | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
+ | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm {
$$ = scm_list_3 ($1, $2, $3);
}
- | MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup {
- $$ = scm_list_3 ($1, $2, $3);
+ ;
+
+markup_head_1_list:
+ markup_head_1_item {
+ $$ = scm_list_1 ($1);
+ }
+ | markup_head_1_list markup_head_1_item {
+ $$ = scm_cons ($2, $1);
+ }
+ ;
+
+simple_markup:
+ STRING {
+ $$ = make_simple_markup (THIS->lexer_->encoding (), $1);
}
- | markup_line {
+ | MARKUP_IDENTIFIER {
$$ = $1;
}
- | MARKUP_HEAD_LIST0 markup_list {
- $$ = scm_list_2 ($1,$2);
+ | 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_lily_module_constant ("score-markup"), sc->self_scm ());
+ scm_gc_unprotect_object (sc->self_scm ());
+ THIS->lexer_->pop_state ();
}
| MARKUP_HEAD_SCM0 embedded_scm {
$$ = scm_list_2 ($1, $2);
}
- | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm markup {
- $$ = scm_list_4 ($1, $2, $3, $4);
- }
| MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm {
$$ = scm_list_4 ($1, $2, $3, $4);
}
| MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
$$ = scm_list_3 ($1, $2, $3);
}
- | MARKUP_IDENTIFIER {
- $$ = $1;
+ | MARKUP_HEAD_EMPTY {
+ $$ = scm_list_1 ($1);
}
- | STRING_IDENTIFIER {
- $$ = $1;
+ | MARKUP_HEAD_LIST0 markup_list {
+ $$ = scm_list_2 ($1,$2);
+ }
+ | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
+ $$ = scm_list_3 ($1, $2, $3);
}
;
-
-markup_list:
- chord_open markup_list_body chord_close { $$ = scm_reverse_x ($2, SCM_EOL); }
- ;
-
-markup_line:
- '{' markup_list_body '}' {
- SCM line = ly_scheme_function ("line-markup");
- $$ = scm_list_2 (line, scm_reverse_x ($2, SCM_EOL));
+markup:
+ markup_head_1_list simple_markup {
+ $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2)));
}
- ;
-
-markup_list_body:
- /**/ { $$ = SCM_EOL; }
- | markup_list_body markup {
- $$ = scm_cons ($2, $1);
+ | simple_markup {
+ $$ = $1;
}
;
-
%%
void
-My_lily_parser::set_yydebug (bool )
+Lily_parser::set_yydebug (bool )
{
#if 0
yydebug = 1;
}
void
-My_lily_parser::do_yyparse ()
+Lily_parser::do_yyparse ()
{
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)
*/
int
-My_lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
+Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
{
- if (ly_c_string_p (sid)) {
+ if (scm_is_string (sid)) {
*destination = sid;
return STRING_IDENTIFIER;
- } else if (is_number (sid)) {
+ } else if (scm_is_number (sid)) {
*destination = sid;
return NUMBER_IDENTIFIER;
} else if (unsmob_context_def (sid)) {
*destination = unsmob_context_def (sid)->clone_scm ();
return CONTEXT_DEF_IDENTIFIER;
} else if (unsmob_score (sid)) {
- Score *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)) {
mus = mus->clone ();
} 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);
+ } 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;
- } else if (Text_item::markup_p (sid)) {
+ return OUTPUT_DEF_IDENTIFIER;
+ } else if (Text_interface::markup_p (sid)) {
*destination = sid;
return MARKUP_IDENTIFIER;
}
property_op_to_music (SCM op)
{
Music *m = 0;
- SCM tag = ly_car (op);
- SCM symbol = ly_cadr (op);
- SCM args = ly_cddr (op);
+ SCM tag = scm_car (op);
+ SCM symbol = scm_cadr (op);
+ SCM args = scm_cddr (op);
SCM grob_val = SCM_UNDEFINED;
SCM grob_sym = SCM_UNDEFINED;
SCM val = SCM_UNDEFINED;
if (tag == ly_symbol2scm ("assign"))
{
m = MY_MAKE_MUSIC ("PropertySet");
- val = ly_car (args);
+ val = scm_car (args);
}
else if (tag == ly_symbol2scm ("unset"))
m = MY_MAKE_MUSIC ("PropertyUnset");
|| tag == ly_symbol2scm ("push"))
{
m = MY_MAKE_MUSIC ("OverrideProperty");
- grob_sym = ly_car (args);
- grob_val = ly_cadr (args);
+ grob_sym = scm_car (args);
+ grob_val = scm_cadr (args);
}
else if (tag == ly_symbol2scm ("pop")) {
m = MY_MAKE_MUSIC ("RevertProperty");
- grob_sym = ly_car (args);
+ grob_sym = scm_car (args);
}
m->set_property ("symbol", symbol);
internal_type_checking_global_b = itc;
}
- if (op == ly_symbol2scm ("poppush"))
+ if (tag == ly_symbol2scm ("poppush"))
m->set_property ("pop-first", SCM_BOOL_T);
scm_gc_unprotect_object (m->self_scm ());
csm->set_property ("context-type",
- ly_c_symbol_p (type) ? type : scm_string_to_symbol (type));
+ scm_is_symbol (type) ? type : scm_string_to_symbol (type));
csm->set_property ("property-operations", ops);
- if (ly_c_string_p (id))
+ if (scm_is_string (id))
csm->set_property ("context-id", id);
return csm;
}
+SCM
+get_next_unique_context_id ()
+{
+ return scm_makfrom0str ("$uniqueContextId");
+}
+
SCM
-get_next_unique_context ()
+get_next_unique_lyrics_context_id ()
{
static int new_context_count;
-
- char s[1024];
- snprintf (s, 1024, "uniqueContext%d", new_context_count ++);
-
+ char s[128];
+ snprintf (s, 1024, "uniqueContext%d", new_context_count++);
return scm_makfrom0str (s);
}
-
projects / lilypond.git / blobdiff