(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 50a9e67ddda6453ff61dd71e5362b3d53ec02731..9a39034b379b7f8f765bc684ef3de3fb8a2fada8 100644 (file)
--- 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 dac68d8f0d766d810cf70822b2fbd50e2e3cc64a..fc10a7d84d1e1e55b97652a274d8fad90a8a9d3a 100644 (file)
--- 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 0e099f0259db50d98fe1c5e4749e9a00a86b27f6..fd2e1af489b3950aadac341c94014ca1fadfaf48 100644 (file)
--- 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 a6cd45000e414a4dd80c9cbe09e37dfe50815f44..c9a26f4ec90e9716ab3469a2d6880d5faa176669 100644 (file)
--- 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* (