From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 24 Aug 2006 14:45:10 +0000 (+0000)
Subject: * scm/define-event-classes.scm (unlistened-music-event-classes): idem.
X-Git-Tag: release/2.10.0-2~354
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=04246201be3c674f212817fafc0cd074e985929a;p=lilypond.git

* 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
---

diff --git a/ChangeLog b/ChangeLog
index 7d555541f2..ed40336860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 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()
diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index b6f091442e..d1bd10cc51 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -55,9 +55,9 @@ Part_combine_engraver::process_music ()
     {
       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");
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 4ed75b7418..d62be48370 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -110,6 +110,7 @@ partCombineListener = \layout {
 	\Score
 	skipTypesetting = ##t
 	ignoreBarChecks = ##t
+	\alias "Timing"
     }
 }
 
diff --git a/scm/define-event-classes.scm b/scm/define-event-classes.scm
index 30f48999ad..4050a388f7 100644
--- a/scm/define-event-classes.scm
+++ b/scm/define-event-classes.scm
@@ -25,7 +25,7 @@
       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
@@ -80,7 +80,7 @@
 ;; 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?
diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index cf9ea3505d..41ded2f871 100644
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -459,13 +459,13 @@ Syntax \\sequential @{..@} or simply @{..@} .")
      . (
 	(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")