X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocument-music.scm;h=b720b592f722a64a3bef973157b15b6371b05ef8;hb=bc106da1e5f1a29dbbd2092aaca1f8b681066d86;hp=b1ab6613c49e5933da0673e56f04df8f8775a35b;hpb=12186b6828aee7aa298076d684835d629b757f2a;p=lilypond.git

diff --git a/scm/document-music.scm b/scm/document-music.scm
index b1ab6613c4..b720b592f7 100644
--- a/scm/document-music.scm
+++ b/scm/document-music.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (music-props-doc)
@@ -10,37 +10,30 @@
     #:name "Music properties"
     #:desc "All music properties, including descriptions"
     #:text
-  (let* (
-	 (ps (sort (map symbol->string all-music-properties) string<?))
-	 (descs (map (lambda (prop)
-		       (property->texi 'music (string->symbol prop)))
-		     ps))
-	 (texi (description-list->texi descs))
-	 )
-    texi)
-  ))
+    (let* ((ps (sort (map symbol->string all-music-properties) string<?))
+	   (descs (map (lambda (prop)
+			 (property->texi 'music (string->symbol prop)))
+		       ps))
+	   (texi (description-list->texi descs)))
+      texi)))
 
 (define music-types->names (make-vector 61 '()))
-(map (lambda (entry)
-       (let*
-	   (
-	    (types (cdr (assoc 'types (cdr entry) )))
-	    )
-	 (map (lambda (type)
-		(hashq-set! music-types->names type
-			    (cons (car entry)
-				  (hashq-ref music-types->names type '())))
-			    
-		) types)
-	 
-	 ))
-  music-descriptions)
-
-
+(filter-map (lambda (entry)
+	      (let* ((class (ly:camel-case->lisp-identifier (car entry)))
+		     (classes (ly:make-event-class class)))
+		(if classes
+		    (map (lambda (cl)
+			   (hashq-set! music-types->names cl
+				       (cons (car entry)
+					     (hashq-ref music-types->names cl '()))))
+			 classes)
+		    #f)))
+	    
+	    music-descriptions)
 
 (define (strip-description x)
-    (cons (symbol->string (car x))
-	  ""))
+  (cons (symbol->string (car x))
+	""))
 
 (define (music-type-doc entry)
   (make <texi-node>
@@ -53,7 +46,7 @@
      (human-listify
       (sort
        (map (lambda (x) (ref-ify (symbol->string x)))
-	     (cdr entry)) string<?))
+	    (cdr entry)) string<?))
 
      "\n\nAccepted by: "
      (human-listify
@@ -62,8 +55,7 @@
 		(map ly:translator-name
 		     (filter
 		      (lambda (x) (engraver-accepts-music-type? (car entry) x)) all-engravers-list)))))
-     "\n\n"
-     )))
+     "\n\n")))
 
 (define (music-types-doc)
   (make <texi-node>
@@ -71,51 +63,47 @@
     #:children 
     (map music-type-doc
 	 (sort
-	  (hash-table->alist music-types->names) alist<?))
-    ))
+	  (hash-table->alist music-types->names) alist<?))))
 
 (define (music-doc-str obj)
-  (let*
-      (
-       (namesym  (car obj))
-       (props (cdr obj))
-       (types (cdr (assoc  'types props)))
-       )
-    
+  (let* ((namesym  (car obj))
+	 (props (cdr obj))
+	 (class (ly:camel-case->lisp-identifier namesym))
+	 (classes (ly:make-event-class class))
+	 (event-texi (if classes
+			 (string-append
+			  "\n\nEvent classes:\n"
+			  (human-listify (map ref-ify (map symbol->string classes)))
+			  "\n\n"
+			  "\n\nAccepted by: "
+			  (human-listify
+			   (map ref-ify
+				(map symbol->string (map ly:translator-name
+							 (filter
+							  (lambda (x) (engraver-accepts-music-types? classes x)) all-engravers-list))))))
+			 "")))
+
     (string-append
      (object-property namesym 'music-description)
-     "\n\nMusic types:\n"
-     (human-listify (map ref-ify (map symbol->string types)))
-     "\n\n"
-     "\n\nAccepted by: "
-     (human-listify
-      (map ref-ify
-	   (map symbol->string (map ly:translator-name
-		(filter
-		 (lambda (x) (engraver-accepts-music-types? types x)) all-engravers-list)))))
+     event-texi
      "\n\nProperties: \n"
      (description-list->texi
       (map
        (lambda (x) (property->texi 'music  x props))
-       (map car props)))
-     
-     )
-    ))
+       (map car props))))))
 
 (define (music-object-doc obj)
   (make <texi-node>
     #:name (symbol->string (car obj))
-    #:text (music-doc-str obj)
-    ))
+    #:text (music-doc-str obj)))
 
 (define (music-expressions-doc)
   (make <texi-node>
     #:name "Music expressions"
     #:desc "Objects that represent music."
     #:children
-     (map music-object-doc music-descriptions)
-  ))
-  
+    (map music-object-doc music-descriptions)))
+
 (define (music-doc-node)
   (make <texi-node>
     #:name "Music definitions"
@@ -124,9 +112,4 @@
     (list
      (music-expressions-doc)
      (music-types-doc)
-     (music-props-doc))
-    ))
-
-  
-  
-
+     (music-props-doc))))