X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-event-classes.scm;fp=scm%2Fdefine-event-classes.scm;h=2beabeeff7e6756e1e1f2874d7b12ed069397dfb;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=c632e430a95f37a1dd184e8a8cdef5e4906ce132;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/scm/define-event-classes.scm b/scm/define-event-classes.scm
index c632e430a9..2beabeeff7 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--2011 Erik Sandberg <mandolaerik@gmail.com>
+;;;; Copyright (C) 2005--2012 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
@@ -35,7 +35,8 @@
       harmonic-event hyphen-event laissez-vibrer-event mark-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 completize-extender-event break-span-event
+      alternative-event))
 
     (layout-instruction-event . (apply-output-event))
     (script-event . (articulation-event text-script-event))
@@ -58,43 +59,31 @@
     (Announcement . (AnnounceNewContext))
     ))
 
-;; Maps event-class to a list of ancestors (inclusive)
-(define ancestor-lookup (make-hash-table 11))
+(define-public (event-class-cons class parent classlist)
+  (let ((lineage (assq parent classlist)))
+    (if (not lineage)
+	(begin
+	  (if (not (null? parent))
+	      (ly:warning (_ "unknown parent class `~a'") parent))
+	  (set! lineage '())))
+    (if (symbol? class)
+	(acons class lineage classlist)
+	(fold (lambda (elt alist)
+		(acons elt lineage alist))
+	      classlist class))))
 
 ;; Each class will be defined as
 ;; (class parent grandparent .. )
 ;; so that (eq? (cdr class) parent) holds.
-(for-each
- (lambda (rel)
-   (for-each
-    (lambda (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))
 
 (define-public (ly:in-event-class? ev cl)
   "Does event @var{ev} belong to event class @var{cl}?"
-  (memq cl (ly:make-event-class (ly:event-property ev 'class))))
+  (memq cl (ly:event-property ev 'class)))
+
+(define-public all-event-classes
+  (fold (lambda (elt classlist)
+	  (event-class-cons (cdr elt) (car elt) classlist))
+	'() event-classes))
 
 ;; does this exist in guile already?
 (define (map-tree f t)
@@ -112,13 +101,6 @@
 	(cons root (map expand-event-tree (cdr children)))
 	root)))
 
-;; All leaf event classes that no translator listens to
-;; directly.  Avoids printing a warning.
-(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
-		   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?
 (define music-event-tree (expand-event-tree 'music-event))
@@ -139,22 +121,6 @@
 ;;(use-modules (ice-9 pretty-print))
 ;;(pretty-print (cons (car music-event-tree) (sort-tree (cdr music-event-tree))))
 
-;; check that the music event tree corresponds well with the set of
-;; available translators; print warnings otherwise.
-(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)))
-	  music-event-tree)
-
-(map (lambda (sym)
-       (if (not (pair? (ly:make-event-class sym)))
-	   ;; should be programming-error
-	   (ly:error (_ "translator listens to nonexisting event class ~A") sym)))
-     (ly:get-listened-event-classes))
-
 (defmacro-public make-stream-event (expr)
   (Stream_event::undump (primitive-eval (list 'quasiquote expr))))
 
@@ -180,8 +146,7 @@
     (list 'unquote `(ly:make-duration
 		     ,(ly:duration-log e)
 		     ,(ly:duration-dot-count e)
-		     ,(car (ly:duration-factor e))
-		     ,(cdr (ly:duration-factor e)))))
+		     ,(ly:duration-scale))))
    ((ly:pitch? e)
     (list 'unquote `(ly:make-pitch
 		     ,(ly:pitch-octave e)