X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-event-classes.scm;h=c632e430a95f37a1dd184e8a8cdef5e4906ce132;hb=7b46bbecb1628b100a282d2554db5f79caba20cb;hp=4de8c5d97b37d820a586c3c9683c6a86dbfed43f;hpb=5cf3f24eb042684b985ab4b3c5f14e46dfac0082;p=lilypond.git

diff --git a/scm/define-event-classes.scm b/scm/define-event-classes.scm
index 4de8c5d97b..c632e430a9 100644
--- a/scm/define-event-classes.scm
+++ b/scm/define-event-classes.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2005--2010 Erik Sandberg <mandolaerik@gmail.com>
+;;;; Copyright (C) 2005--2011 Erik Sandberg <mandolaerik@gmail.com>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -24,18 +24,19 @@
     (StreamEvent .
 		 (RemoveContext ChangeParent Override Revert UnsetProperty
 				SetProperty music-event OldMusicEvent CreateContext Prepare
-				OneTimeStep Finish)) 
-    (music-event . (annotate-output-event
+				OneTimeStep Finish))
+    (music-event . (annotate-output-event footnote-event
 		    arpeggio-event breathing-event extender-event span-event
       rhythmic-event dynamic-event break-event label-event percent-event
-      key-change-event string-number-event stroke-finger-event tie-event part-combine-event
-      beam-forbid-event script-event
+      key-change-event string-number-event stroke-finger-event tie-event
+      part-combine-event part-combine-force-event
+      beam-forbid-event script-event tempo-change-event
       tremolo-event bend-after-event fingering-event glissando-event
       harmonic-event hyphen-event laissez-vibrer-event mark-event
-      multi-measure-text-event note-grouping-event 
+      multi-measure-text-event note-grouping-event
       pes-or-flexa-event repeat-tie-event spacing-section-event
       layout-instruction-event completize-extender-event break-span-event))
-    
+
     (layout-instruction-event . (apply-output-event))
     (script-event . (articulation-event text-script-event))
     (part-combine-event . (solo-one-event solo-two-event unisono-event))
@@ -43,14 +44,15 @@
     (dynamic-event . (absolute-dynamic-event))
     (span-event . (span-dynamic-event beam-event episema-event ligature-event
 			 pedal-event phrasing-slur-event slur-event staff-span-event
-			 text-span-event trill-span-event tremolo-span-event 
+			 text-span-event trill-span-event tremolo-span-event
 			 tuplet-span-event))
     (span-dynamic-event . (decrescendo-event crescendo-event))
     (break-span-event . (break-dynamic-span-event))
     (pedal-event . (sostenuto-event sustain-event una-corda-event))
     (rhythmic-event . (lyric-event melodic-event multi-measure-rest-event
-				   percent-event
-				   rest-event skip-event bass-figure-event))
+				   double-percent-event percent-event
+				   repeat-slash-event rest-event
+				   skip-event bass-figure-event))
     (melodic-event . (cluster-note-event note-event))
     (() . (Announcement))
     (Announcement . (AnnounceNewContext))
@@ -66,11 +68,26 @@
  (lambda (rel)
    (for-each
     (lambda (type)
-      (hashq-set! ancestor-lookup type 
+      (hashq-set! ancestor-lookup type
 		  (cons type (hashq-ref ancestor-lookup (car rel) '()))))
     (cdr rel)))
  event-classes)
 
+(define-public (define-event-class leaf heritage)
+  (cond
+   ((not (eq? leaf (car heritage)))
+    (ly:warning (_ "All classes must be the last in their matrilineal line.")))
+   ((not (equal? (cdr heritage)
+                 (list-head (hashq-ref ancestor-lookup (cadr heritage) '())
+                            (length (cdr heritage)))))
+    (ly:warning (_ "All classes must have a well-defined pedigree in the existing class hierarchy.")))
+   (else (hashq-set! ancestor-lookup
+                     leaf
+                     (cons leaf
+                           (hashq-ref ancestor-lookup
+                                      (cadr heritage)
+                                      '()))))))
+
 ;; TODO: Allow entering more complex classes, by taking unions.
 (define-public (ly:make-event-class leaf)
  (hashq-ref ancestor-lookup leaf))
@@ -100,7 +117,7 @@
 (define unlistened-music-event-classes
   '(harmonic-event line-break-event page-break-event page-turn-event label-event
 		   solo-one-event solo-two-event skip-event unisono-event
-		   break-dynamic-span-event))
+		   part-combine-force-event break-dynamic-span-event))
 
 ;; produce neater representation of music event tree.
 ;; TODO: switch to this representation for the event-classes list?
@@ -124,12 +141,12 @@
 
 ;; check that the music event tree corresponds well with the set of
 ;; available translators; print warnings otherwise.
-(map-tree (lambda (sym) 
+(map-tree (lambda (sym)
 	    (if (and (symbol? sym)
 		     (not (ly:is-listened-event-class sym))
 		     (not (assq sym event-classes))
 		     (not (memq sym unlistened-music-event-classes)))
-		(ly:programming-error (_ "event class ~A seems to be unused") sym)))	  
+		(ly:programming-error (_ "event class ~A seems to be unused") sym)))
 	  music-event-tree)
 
 (map (lambda (sym)