From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 28 Sep 2002 13:02:23 +0000 (+0000)
Subject: (engraver-accepts-music-types?): add links from music to engraver,
X-Git-Tag: release/1.7.1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7767222b7b3e715ef3f0090213cc855db3394f8c;p=lilypond.git

(engraver-accepts-music-types?): add links from music to engraver,
from music-type to engraver.
---

diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc
index 50a9e67ddd..9a39034b37 100644
--- a/lily/engraver-group-engraver.cc
+++ b/lily/engraver-group-engraver.cc
@@ -180,7 +180,7 @@ Engraver_group_engraver::Engraver_group_engraver() {}
 ENTER_DESCRIPTION(Engraver_group_engraver,
 /* descr */       "A group of engravers taken together",
 /* creats*/       "",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "",
 /* reads */       "",
 /* write */       "");
diff --git a/lily/engraver.cc b/lily/engraver.cc
index dac68d8f0d..fc10a7d84d 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -73,6 +73,6 @@ Engraver::top_engraver () const
 
 ENTER_DESCRIPTION(Engraver,
 		   "", "",
-		  "general-music",
+		  "",
 		  "", "", "");
 
diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 0e099f0259..fd2e1af489 100644
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -16,7 +16,7 @@
 ENTER_DESCRIPTION(Performer_group_performer,
 /* descr */       "",
 /* creats*/       "",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "",
 /* reads */       "",
 /* write */       "");
diff --git a/scm/engraver-documentation-lib.scm b/scm/engraver-documentation-lib.scm
index a6cd45000e..c9a26f4ec9 100644
--- a/scm/engraver-documentation-lib.scm
+++ b/scm/engraver-documentation-lib.scm
@@ -24,7 +24,7 @@
        (engraver-accepts-music-types? (cdr types) grav)))
   )
 
-(define (engraver-doc-string engraver)
+(define (engraver-doc-string engraver in-which-contexts)
   (let* (
 	 (propsr (cdr (assoc 'properties-read (ly-translator-description engraver))))
 	 (propsw (cdr (assoc 'properties-written (ly-translator-description engraver))))
@@ -73,24 +73,27 @@
 
      "\n\n"
 
-     (let* ((paper-alist (My_lily_parser::paper_description))
-	    (context-description-alist (map cdr paper-alist))
-	    (contexts
-	     (apply append
-		    (map (lambda (x)
-			   (let ((context (cdr (assoc 'type-name x)))
-				 (consists (append
-					    (list (cdr (assoc 'group-type x)))
-					    (cdr (assoc 'consists x))
-					    (cdr (assoc 'end-consists x)))))
-
-			     (if (member name consists)
-				 (list context)
-				 '())))
-			 context-description-alist))))
-       (string-append
-	name " is part of contexts: "
-	(human-listify (map ref-ify (map context-name contexts))))))))
+     (if in-which-contexts
+	 (let* ((paper-alist (My_lily_parser::paper_description))
+		(context-description-alist (map cdr paper-alist))
+		(contexts
+		 (apply append
+			(map (lambda (x)
+			       (let ((context (cdr (assoc 'type-name x)))
+				     (consists (append
+						(list (cdr (assoc 'group-type x)))
+						(cdr (assoc 'consists x))
+						(cdr (assoc 'end-consists x)))))
+
+				 (if (member name consists)
+				     (list context)
+				     '())))
+			     context-description-alist))))
+	   (string-append
+	    name " is part of contexts: "
+	    (human-listify (map ref-ify (map context-name contexts)))))
+	 ""
+	 ))))
 
 
 
@@ -99,7 +102,7 @@
 (define (engraver-doc grav)
   (make <texi-node>
     #:name (ly-translator-name grav)
-    #:text (engraver-doc-string grav)
+    #:text (engraver-doc-string grav #t)
     ))
 
 ;; Second level, part of Context description
@@ -119,10 +122,10 @@
        (eg (find-engraver-by-name name ))
        )
 
-    (if (eq? eg #f)
-	(string-append "Engraver " name ", not documented.\n")
-	(engraver-doc-string eg)
- 	)
+    (cons name 
+	  (engraver-doc-string eg #f)
+	
+     )
     ))
 
 (define (document-property-operation op)
@@ -207,9 +210,9 @@
 	    (human-listify (map ref-ify (map context-name accepts)))))
        
        "\n\nThis context is built from the following engravers: "
-       (apply string-append 
-	      (map document-engraver-by-name consists)))
-       )))
+       (description-list->texi
+	      (map document-engraver-by-name consists))
+       ))))
 
 (define (engraver-grobs  grav)
   (let* (