source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "music.hh"
#include "context.hh"
#include "dispatcher.hh"
#include "duration.hh"
-#include "input-smob.hh"
+#include "input.hh"
#include "international.hh"
#include "ly-smobs.icc"
#include "main.hh"
#include "music-sequence.hh"
-#include "pitch.hh"
#include "score.hh"
#include "warn.hh"
void
Music::type_check_assignment (SCM s, SCM v) const
{
- if (!::type_check_assignment (s, v, ly_symbol2scm ("music-type?")))
- abort ();
+ ::type_check_assignment (s, v, ly_symbol2scm ("music-type?"));
}
Music::Music (Music const &m)
Pitch expected_pit (scm_to_int (check),
new_pit.get_notename (),
new_pit.get_alteration ());
- origin ()->warning (_f ("octave check failed; expected \"%s\", found: %s",
+ origin ()->warning (_f ("octave check failed; expected \"%s\", found: \"%s\"",
expected_pit.to_string (),
new_pit.to_string ()));
new_pit = expected_pit;
}
/*
-TODO: make transposition non-destructive
+ This mutates alist. Hence, make sure that it is not shared
*/
-SCM
+void
transpose_mutable (SCM alist, Pitch delta)
{
- SCM retval = SCM_EOL;
-
for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
{
SCM entry = scm_car (s);
SCM prop = scm_car (entry);
SCM val = scm_cdr (entry);
-
+ SCM new_val = val;
+
if (Pitch *p = unsmob_pitch (val))
{
Pitch transposed = p->transposed (delta);
- scm_set_cdr_x (entry, transposed.smobbed_copy ());
-
- if (abs (transposed.get_alteration ()) > DOUBLE_SHARP)
+ if (transposed.get_alteration ().abs () > Rational (1,1))
{
warning (_f ("transposition by %s makes alteration larger than double",
delta.to_string ()));
}
+
+ new_val = transposed.smobbed_copy ();
}
else if (prop == ly_symbol2scm ("element"))
{
transpose_music_list (val, delta);
else if (prop == ly_symbol2scm ("pitch-alist") &&
scm_is_pair (val))
- entry = scm_cons (prop, ly_transpose_key_alist (val, delta.smobbed_copy ()));
- retval = scm_cons (entry, retval);
- }
+ new_val = ly_transpose_key_alist (val, delta.smobbed_copy ());
- return scm_reverse_x (retval, SCM_EOL);
+ if (val != new_val)
+ scm_set_cdr_x (entry , new_val);
+ }
}
void
if (to_boolean (get_property ("untransposable")))
return;
- mutable_property_alist_ = transpose_mutable (mutable_property_alist_, delta);
+ transpose_mutable (mutable_property_alist_, delta);
}
void
Stream_event *
Music::to_event () const
{
- /* UGH. Temp hack */
- SCM orig_sym = get_property ("name");
- char out[200];
- string in = ly_symbol2string (orig_sym);
- /* don't add '-' before first character */
- out[0] = tolower (in[0]);
- size_t outpos = 1;
- for (size_t inpos = 1; inpos < in.size () && outpos < 190; inpos++)
- {
- if (isupper (in[inpos]))
- out[outpos++] = '-';
- out[outpos++] = tolower (in[inpos]);
- }
- out[outpos] = 0;
- SCM class_name = ly_symbol2scm (out);
+ SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name"));
- // catch mistakes.
+ // catch programming mistakes.
if (!internal_is_music_type (class_name))
{
programming_error ("Not a music type");
if (length.to_bool ())
e->set_property ("length", length.smobbed_copy ());
+ // articulations as events.
+ SCM art_mus = e->get_property ("articulations");
+ if (scm_is_pair (art_mus))
+ {
+ SCM art_ev = SCM_EOL;
+ for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus))
+ {
+ Music *m = unsmob_music (scm_car (art_mus));
+ SCM ev = m ? m->to_event ()->unprotect () : scm_car (art_mus);
+ art_ev = scm_cons (ev, art_ev);
+ }
+ e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL));
+ }
+
/*
ES TODO: This is a temporary fix. Stream_events should not be
aware of music.
*/
e->set_property ("music-cause", self_scm ());
+
return e;
}
void
Music::send_to_context (Context *c)
{
- /*
- TODO: This is a work-in-progress solution. Send the event so it
- can be read both by old-style translators and the new ones.
- */
- send_stream_event (c, "OldMusicEvent", origin (),
- ly_symbol2scm("music"), self_scm (), 0);
-
Stream_event *ev = to_event ();
c->event_source ()->broadcast (ev);
ev->unprotect ();