2006-08-24 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * scm/define-event-classes.scm (unlistened-music-event-classes): idem.
+
+ * scm/define-music-types.scm (music-descriptions): consistency:
+ Use solo-{one,two}-event iso. solo-[12]-event.
+
+ * lily/part-combine-engraver.cc (process_music):
+ Use solo-{one,two}-event iso. solo-[12]-event.
+
+ * ly/declarations-init.ly (partCombineListener): add Timing as
+ alias
+
* flower/std-string.cc (string_copy): use copy ()
* lily/source-file.cc (Source_file): use copy(). Remove contents_str0()
{
SCM what = event_->get_property ("class");
SCM text = SCM_EOL;
- if (what == ly_symbol2scm ("solo1-event"))
+ if (what == ly_symbol2scm ("solo-one-event"))
text = get_property ("soloText");
- else if (what == ly_symbol2scm ("solo2-event"))
+ else if (what == ly_symbol2scm ("solo-two-event"))
text = get_property ("soloIIText");
else if (what == ly_symbol2scm ("unisono-event"))
text = get_property ("aDueText");
\Score
skipTypesetting = ##t
ignoreBarChecks = ##t
+ \alias "Timing"
}
}
layout-instruction-event))
(layout-instruction-event . (apply-output-event))
(script-event . (articulation-event text-script-event))
- (part-combine-event . (solo1-event solo2-event unisono-event))
+ (part-combine-event . (solo-one-event solo-two-event unisono-event))
(break-event . (line-break-event page-break-event page-turn-event))
(dynamic-event . (absolute-dynamic-event))
(span-event . (span-dynamic-event beam-event ligature-event
;; directly. Avoids printing a warning.
(define unlistened-music-event-classes
'(harmonic-event line-break-event page-break-event page-turn-event
- solo1-event solo2-event skip-event unisono-event))
+ solo-one-event solo-two-event skip-event unisono-event))
;; produce neater representation of music event tree.
;; TODO: switch to this representation for the event-classes list?
. (
(description . "Print Solo.1")
(part-combine-status . solo1)
- (types . (general-music event part-combine-event solo1-event))
+ (types . (general-music event part-combine-event solo-one-event))
))
(SoloTwoEvent
. (
(description . "Print Solo.2")
(part-combine-status . solo2)
- (types . (general-music event part-combine-event solo2-event))
+ (types . (general-music event part-combine-event solo-two-event))
))
(UnisonoEvent
. ((description . "Print a2")