*/
#include <ctype.h>
-#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include "text-item.hh"
#include "music-list.hh"
-
#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
-
+Music *property_op_to_music (SCM op);
+Music *context_spec_music (SCM type, SCM id, Music * m, SCM ops_);
+SCM get_next_unique_context ();
#define YYERROR_VERBOSE 1
make_chord_step (int step, int alter)
{
if (step == 7)
- alter--;
+ alter += FLAT;
- /* ugh: fucks up above 13 */
- Pitch m(step > 7 ? 1 : 0,(step - 1) % 7, alter);
+ while(step < 0)
+ step += 7;
+ Pitch m((step -1) / 7 , (step - 1) % 7, alter);
return m.smobbed_copy ();
}
%token AUTOCHANGE
%token BAR
%token BREATHE
+%token CHANGE
%token CHORDMODIFIERS
%token CHORDS
%token LESSLESS
%token TRANSPOSE
%token TYPE
%token UNSET
-
+%token WITH
/* escaped */
%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE
%type <i> exclamations questions dots optional_rest
%type <i> bass_mod
%type <scm> grace_head
+%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> FRACTION
%token <id> IDENTIFIER
%token <scm> CHORDNAMES
-
-%token <scm> CHORD_MODIFIER
-
+%token <scm> CHORD_MODIFIER
%token <scm> SCORE_IDENTIFIER
%token <scm> MUSIC_OUTPUT_DEF_IDENTIFIER
%token <scm> NUMBER_IDENTIFIER
%type <scm> embedded_scm scalar
%type <music> Music Sequential_music Simultaneous_music
%type <music> relative_music re_rhythmed_music part_combined_music
-%type <music> property_def translator_change simple_property_def
+%type <music> music_property_def context_change
%type <scm> Music_list
+%type <scm> property_operation context_mod translator_mod optional_context_mod
%type <outputdef> music_output_def_body
%type <music> shorthand_command_req
%type <music> post_event tagged_post_event
%type <music> command_req verbose_command_req
-%type <music> extender_req
%type <music> hyphen_req
%type <music> string_number_event
%type <scm> string bare_number number_expression number_term number_factor
THIS->input_file_->header_ = $1;
}
| score_block {
- THIS->input_file_->scores_.push ($1);
+ 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_.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());
}
| output_def {
if (dynamic_cast<Paper_def*> ($1))
;
translator_spec_body:
- TRANSLATOR_IDENTIFIER {
- $$ = $1;
- unsmob_translator_def ($$)-> set_spot (THIS->here_input ());
- }
- | TYPE STRING {
- $$ = Translator_def::make_scm ();
- Translator_def*td = unsmob_translator_def ($$);
- td->translator_group_type_ = $2;
- td->set_spot (THIS->here_input ());
- }
- | translator_spec_body DESCRIPTION string {
- unsmob_translator_def ($$)->description_ = $3;
- }
- | translator_spec_body STRING '=' embedded_scm {
- unsmob_translator_def ($$)->add_property_assign ($2, $4);
- }
- | translator_spec_body STRING OVERRIDE embedded_scm '=' embedded_scm {
- unsmob_translator_def ($$)
- ->add_push_property (scm_string_to_symbol ($2), $4, $6);
- }
- | translator_spec_body STRING SET embedded_scm '=' embedded_scm {
- unsmob_translator_def ($$)
- ->add_push_property (scm_string_to_symbol ($2), $4, $6);
- }
- | translator_spec_body STRING REVERT embedded_scm {
- unsmob_translator_def ($$)->add_pop_property (
- scm_string_to_symbol ($2), $4);
- }
- | translator_spec_body NAME STRING {
- unsmob_translator_def ($$)->type_name_ = scm_string_to_symbol ($3);
- }
- | translator_spec_body CONSISTS STRING {
- unsmob_translator_def ($$)->add_element ($3);
+ /**/ {
+ $$ = Context_def::make_scm ();
+ unsmob_context_def ($$)->set_spot (THIS->here_input ());
}
- | translator_spec_body ALIAS STRING {
- Translator_def*td = unsmob_translator_def ($$);
- td->type_aliases_ = scm_cons (scm_string_to_symbol ($3), td->type_aliases_);
+ | TRANSLATOR_IDENTIFIER {
+ $$ = $1;
+ unsmob_context_def ($$)->set_spot (THIS->here_input ());
}
| translator_spec_body GROBDESCRIPTIONS embedded_scm {
- Translator_def*td = unsmob_translator_def($$);
- // td->add_property_assign (ly_symbol2scm ("allGrobDescriptions"), $3);
- for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p))
- td->add_property_assign (scm_symbol_to_string (ly_caar (p)), ly_cdar (p));
- }
- | translator_spec_body CONSISTSEND STRING {
- unsmob_translator_def ($$)->add_last_element ( $3);
- }
- | translator_spec_body ACCEPTS STRING {
- unsmob_translator_def ($$)->set_acceptor (scm_string_to_symbol ($3), true);
- }
- | translator_spec_body DENIES STRING {
- unsmob_translator_def ($$)->set_acceptor (scm_string_to_symbol ($3), false);
+ Context_def*td = unsmob_context_def($$);
+
+ for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p)) {
+ SCM tag = gh_caar (p);
+ td->add_context_mod (scm_list_n (ly_symbol2scm ("assign"),
+ tag, ly_cdar (p), SCM_UNDEFINED));
+ }
}
- | translator_spec_body REMOVE STRING {
- unsmob_translator_def ($$)->remove_element ($3);
+ | translator_spec_body context_mod {
+ unsmob_context_def ($$)->add_context_mod ($2);
}
;
/*cont*/ '{' score_body '}' {
THIS->pop_spot ();
$$ = $4;
- if (!$$->defs_.size ())
- {
- Music_output_def *id =
- unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"));
- $$->add_output (id ? id->clone () : new Paper_def );
- }
+
}
;
$$->header_ = $2;
}
| score_body output_def {
- $$->add_output ($2);
+ $$->defs_.push ($2);
}
| score_body error {
}
| music_output_def_body translator_spec_block {
$$->assign_translator ($2);
+
}
| music_output_def_body tempo_event {
/*
| MUSIC_IDENTIFIER {
$$ = unsmob_music ($1);
}
- | property_def
- | translator_change
+ | music_property_def
+ | context_change
;
+optional_context_mod:
+ /**/ { $$ = SCM_EOL; }
+ | WITH '{' context_mod_list '}' { $$ = $3; }
+ ;
+
grace_head:
GRACE { $$ = scm_makfrom0str ("Grace"); }
| ACCIACCATURA { $$ = scm_makfrom0str ("Acciaccatura"); }
| APPOGGIATURA { $$ = scm_makfrom0str ("Appoggiatura"); }
;
-
-Composite_music:
- CONTEXT STRING Music {
- Music*csm =MY_MAKE_MUSIC("ContextSpeccedMusic");
-
- csm->set_mus_property ("element", $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
-
- csm->set_mus_property ("context-type", scm_string_to_symbol ($2));
- csm->set_mus_property ("context-id", scm_makfrom0str (""));
-
- $$ = csm;
+context_mod_list:
+ /* */ { $$ = SCM_EOL; }
+ | context_mod_list context_mod {
+ $$ = gh_cons ($2, $1);
}
- | AUTOCHANGE STRING Music {
- Music*chm = MY_MAKE_MUSIC("AutoChangeMusic");
+ ;
+
+Composite_music:
+ AUTOCHANGE STRING Music {
+ Music*chm = MY_MAKE_MUSIC("AutoChangeMusic");
chm->set_mus_property ("element", $3->self_scm ());
chm->set_mus_property ("iterator-ctor", Auto_change_iterator::constructor_proc);
scm_gc_unprotect_object ($2->self_scm ());
#endif
}
- | CONTEXT string '=' string Music {
- Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+ | CONTEXT string '=' string optional_context_mod Music {
+ $$ = context_spec_music ($2, $4, $6, $5);
- csm->set_mus_property ("element", $5->self_scm ());
- scm_gc_unprotect_object ($5->self_scm ());
-
- csm->set_mus_property ("context-type", scm_string_to_symbol ($2));
- csm->set_mus_property ("context-id", $4);
-
- $$ = csm;
}
- | NEWCONTEXT string Music {
- static int new_context_count;
-
- Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
-
- csm->set_mus_property ("element", $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
-
- csm->set_mus_property ("context-type", scm_string_to_symbol ($2));
-
- char s[1024];
- snprintf (s, 1024, "uniqueContext%d", new_context_count ++);
-
- SCM new_id = scm_makfrom0str (s);
- csm->set_mus_property ("context-id", new_id);
- $$ = csm;
+ | CONTEXT 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);
}
+
| TIMES {
THIS->push_spot ();
}
}
;
-translator_change:
- TRANSLATOR STRING '=' STRING {
+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);
}
;
-property_def:
- simple_property_def
- | ONCE simple_property_def {
- $$ = $2;
- SCM e = $2->get_mus_property ("element");
- unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T);
+property_operation:
+ STRING '=' scalar {
+ $$ = scm_list_n (ly_symbol2scm ("assign"),
+ scm_string_to_symbol ($1), $3, SCM_UNDEFINED);
}
- ;
-
-simple_property_def:
- PROPERTY STRING '.' STRING '=' scalar {
- Music *t = set_property_music (scm_string_to_symbol ($4), $6);
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
-
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
-
- $$ = csm;
- $$->set_spot (THIS->here_input ());
-
- csm-> set_mus_property ("context-type", scm_string_to_symbol ($2));
+ | STRING UNSET {
+ $$ = scm_list_n (ly_symbol2scm ("unset"),
+ scm_string_to_symbol ($1), SCM_UNDEFINED);
}
- | PROPERTY STRING '.' STRING UNSET {
-
- Music *t = MY_MAKE_MUSIC("PropertyUnset");
- t->set_mus_property ("symbol", scm_string_to_symbol ($4));
-
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
-
- $$ = csm;
- $$->set_spot (THIS->here_input ());
-
- csm-> set_mus_property ("context-type", scm_string_to_symbol ($2));
+ | STRING SET embedded_scm '=' embedded_scm {
+ $$ = scm_list_n (ly_symbol2scm ("poppush"),
+ scm_string_to_symbol ($1), $3, $5, SCM_UNDEFINED);
}
- | PROPERTY STRING '.' STRING SET embedded_scm '=' embedded_scm {
- bool autobeam
- = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
- bool itc = internal_type_checking_global_b;
- Music *t = MY_MAKE_MUSIC("OverrideProperty");
- t->set_mus_property ("symbol", scm_string_to_symbol ($4));
- t->set_mus_property ("pop-first", SCM_BOOL_T);
- if (autobeam)
- internal_type_checking_global_b = false;
- t->set_mus_property ("grob-property", $6);
- if (autobeam)
- internal_type_checking_global_b = itc;
- t->set_mus_property ("grob-value", $8);
-
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
- $$ = csm;
- $$->set_spot (THIS->here_input ());
-
- csm-> set_mus_property ("context-type", scm_string_to_symbol ($2));
+ | STRING OVERRIDE embedded_scm '=' embedded_scm {
+ $$ = scm_list_n (ly_symbol2scm ("push"),
+ scm_string_to_symbol ($1), $3, $5, SCM_UNDEFINED);
}
- | PROPERTY STRING '.' STRING OVERRIDE
- embedded_scm '=' embedded_scm
- {
- /*
- UGH UGH UGH UGH.
- */
- bool autobeam
- = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
- bool itc = internal_type_checking_global_b;
-
- Music *t = MY_MAKE_MUSIC("OverrideProperty");
- t->set_mus_property ("symbol", scm_string_to_symbol ($4));
- if (autobeam)
- internal_type_checking_global_b = false;
- t->set_mus_property ("grob-property", $6);
- t->set_mus_property ("grob-value", $8);
- if (autobeam)
- internal_type_checking_global_b = itc;
+ | STRING REVERT embedded_scm {
+ $$ = scm_list_n (ly_symbol2scm ("pop"),
+ scm_string_to_symbol ($1), $3, SCM_UNDEFINED);
+ }
+ ;
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
+translator_mod:
+ CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); }
+ | CONSISTS { $$ = ly_symbol2scm ("consists"); }
+ | REMOVE { $$ = ly_symbol2scm ("remove"); }
- $$ = csm;
- $$->set_spot (THIS->here_input ());
+ | ACCEPTS { $$ = ly_symbol2scm ("accepts"); }
+ | DENIES { $$ = ly_symbol2scm ("denies"); }
- csm-> set_mus_property ("context-type", scm_string_to_symbol ($2));
+ | ALIAS { $$ = ly_symbol2scm ("alias"); }
+ | TYPE { $$ = ly_symbol2scm ("translator-type"); }
+ | DESCRIPTION { $$ = ly_symbol2scm ("description"); }
+ | NAME { $$ = ly_symbol2scm ("context-name"); }
+ ;
+context_mod:
+ property_operation { $$ = $1; }
+ | translator_mod STRING {
+ $$ = scm_list_n ($1, $2, SCM_UNDEFINED);
}
- | PROPERTY STRING '.' STRING REVERT embedded_scm {
- Music *t = MY_MAKE_MUSIC("RevertProperty");
- bool autobeam
- = gh_equal_p ($4, scm_makfrom0str ("autoBeamSettings"));
- bool itc = internal_type_checking_global_b;
+ ;
- t->set_mus_property ("symbol", scm_string_to_symbol ($4));
- if (autobeam)
- internal_type_checking_global_b = false;
- t->set_mus_property ("grob-property", $6);
- if (autobeam)
- internal_type_checking_global_b = itc;
-
+music_property_def:
+ PROPERTY STRING '.' property_operation {
+ Music * t = property_op_to_music ($4);
Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+
csm->set_mus_property ("element", t->self_scm ());
scm_gc_unprotect_object (t->self_scm ());
csm-> set_mus_property ("context-type", scm_string_to_symbol ($2));
}
+ | ONCE music_property_def {
+ $$ = $2;
+ SCM e = $2->get_mus_property ("element");
+ unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T);
+ }
;
| DIGIT { $$ = gh_int2scm ($1); }
;
-
-
/*
This is a trick:
;
shorthand_command_req:
- extender_req {
- $$ = $1;
- }
- | hyphen_req {
+ hyphen_req {
$$ = $1;
}
| BREATHE {
direction_less_event {
$$ = $1;
}
+ | EXTENDER {
+ if (!THIS->lexer_->lyric_state_b ())
+ THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+ $$ = MY_MAKE_MUSIC("ExtenderEvent");
+ }
| script_dir direction_reqd_event {
if ($1)
$2->set_mus_property ("direction", gh_int2scm ($1));
}
| close_event {
$$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (START));
+ dynamic_cast<Music *> ($$)->set_mus_property ("span-direction",
+ gh_int2scm (START));
}
| open_event {
$$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP));
+ dynamic_cast<Music *> ($$)->set_mus_property ("span-direction",
+ gh_int2scm (STOP));
}
| EVENT_IDENTIFIER {
$$ = unsmob_music ($1);
| steno_tonic_pitch
;
-
-
-
-
-extender_req:
- EXTENDER {
- if (!THIS->lexer_->lyric_state_b ())
- THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC("ExtenderEvent");
- }
- ;
-
hyphen_req:
HYPHEN {
if (!THIS->lexer_->lyric_state_b ())
$$ = make_chord_step ($1, 0);
}
| bare_unsigned '+' {
- $$ = make_chord_step ($1, 1);
+ $$ = make_chord_step ($1, SHARP);
}
| bare_unsigned CHORD_MINUS {
- $$ = make_chord_step ($1,-1);
+ $$ = make_chord_step ($1, FLAT);
}
;
} else if (gh_number_p (sid)) {
*destination = sid;
return NUMBER_IDENTIFIER;
- } else if (unsmob_translator_def (sid)) {
- *destination = unsmob_translator_def (sid)->clone_scm();
+ } else if (unsmob_context_def (sid)) {
+ *destination = unsmob_context_def (sid)->clone_scm();
return TRANSLATOR_IDENTIFIER;
} else if (unsmob_score (sid)) {
Score *sc = new Score (*unsmob_score (sid));
return -1;
}
+
+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);
+ 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);
+ }
+ else if (tag == ly_symbol2scm ("unset"))
+ m = MY_MAKE_MUSIC("PropertyUnset");
+ else if (tag == ly_symbol2scm ("poppush")
+ || tag == ly_symbol2scm ("push"))
+ {
+ m = MY_MAKE_MUSIC("OverrideProperty");
+ grob_sym = gh_car (args);
+ grob_val = gh_cadr (args);
+ }
+ else if (tag == ly_symbol2scm ("pop")) {
+ m = MY_MAKE_MUSIC("RevertProperty");
+ grob_sym = gh_car (args);
+ }
+
+ m->set_mus_property ("symbol", symbol);
+
+ if (val != SCM_UNDEFINED)
+ m->set_mus_property ("value", val);
+ if (grob_val != SCM_UNDEFINED)
+ m->set_mus_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"));
+ if (autobeam)
+ internal_type_checking_global_b = false;
+ m->set_mus_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);
+
+
+ return m;
+}
+
+Music*
+context_spec_music (SCM type, SCM id, Music * m, SCM ops)
+{
+ Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+
+ csm->set_mus_property ("element", m->self_scm ());
+ scm_gc_unprotect_object (m->self_scm ());
+
+ csm->set_mus_property ("context-type", scm_string_to_symbol (type));
+ csm->set_mus_property ("property-operations", ops);
+
+ if (gh_string_p (id))
+ csm->set_mus_property ("context-id", id);
+ return csm;
+}
+
+
+SCM
+get_next_unique_context ()
+{
+ static int new_context_count;
+
+ char s[1024];
+ snprintf (s, 1024, "uniqueContext%d", new_context_count ++);
+
+ return scm_makfrom0str (s);
+}
projects / lilypond.git / blobdiff