X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdocument-translation.scm;h=a9bf143c3d2d319c1836fe3a81fb9173ae41f880;hb=1da7272f54aace50b751b7cfa5ac50e5f7f9b12b;hp=a7ce3b993442f69302ad4e675465ff13d5953fdf;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/scm/document-translation.scm b/scm/document-translation.scm
index a7ce3b9934..a9bf143c3d 100644
--- a/scm/document-translation.scm
+++ b/scm/document-translation.scm
@@ -1,8 +1,8 @@
 ;;;; document-translation.scm -- Functions for engraver documentation
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;;
+;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define (engraver-makes-grob? name-symbol grav)
@@ -19,12 +19,12 @@
        (engraver-accepts-music-types? (cdr types) grav))))
 
 (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))))
-	 (accepted  (cdr (assoc 'events-accepted (ly:translator-description engraver)))) 
+  (let* ((propsr (assoc-get 'properties-read (ly:translator-description engraver)))
+	 (propsw (assoc-get 'properties-written (ly:translator-description engraver)))
+	 (accepted  (assoc-get 'events-accepted (ly:translator-description engraver)))
 	 (name-sym  (ly:translator-name engraver))
 	 (name-str (symbol->string name-sym))
-	 (desc (cdr (assoc 'description (ly:translator-description engraver))))
+	 (desc (assoc-get 'description (ly:translator-description engraver)))
 	 (grobs (engraver-grobs engraver)))
 
     (string-append
@@ -34,31 +34,31 @@
 	 (string-append
 	  "Music types accepted:\n\n"
 	  (human-listify
-	   (map (lambda (x)
-		  (string-append
-		   "@ref{"
-		   (symbol->string x)
-		   "}")) accepted)))
+	   (map ref-ify (sort (map symbol->string accepted) ly:string-ci<?))))
 	 "")
      "\n\n"
      (if (pair? propsr)
 	 (string-append
 	  "Properties (read)"
 	  (description-list->texi
-	   (map (lambda (x) (property->texi 'translation  x '())) propsr)))
+	   (map (lambda (x) (property->texi 'translation x '()))
+	        (sort propsr ly:symbol-ci<?))
+	   #t))
 	 "")
-     
+
      (if (null? propsw)
 	 ""
 	 (string-append
-	  "Properties (write)" 
+	  "Properties (write)"
 	  (description-list->texi
-	   (map (lambda (x) (property->texi 'translation  x '())) propsw))))
+	   (map (lambda (x) (property->texi 'translation x '()))
+	        (sort propsw ly:symbol-ci<?))
+	   #t)))
      (if  (null? grobs)
 	  ""
 	  (string-append
-	   "This engraver creates the following layout objects: \n "
-	   (human-listify (map ref-ify (uniq-list (sort grobs string<? ))))
+	   "\n\nThis engraver creates the following layout object(s):\n\n"
+	   (human-listify (map ref-ify (uniq-list (sort grobs ly:string-ci<?))))
 	   "."))
 
      "\n\n"
@@ -70,22 +70,29 @@
 		 (apply append
 			(map
 			 (lambda (x)
-			   (let* ((context (cdr (assoc 'context-name x)))
+			   (let* ((context (assoc-get 'context-name x))
 				  (group (assq-ref x 'group-type))
 				  (consists (append
 					     (if group
 						 (list group)
 						 '())
-					     (cdr (assoc 'consists x)))))
+					     (assoc-get 'consists x))))
 			     (if (member name-sym consists)
 				 (list context)
 				 '())))
-			 context-description-alist))))
+			 context-description-alist)))
+		(context-list (human-listify (map ref-ify
+						  (sort
+						   (map symbol->string contexts)
+						   ly:string-ci<?)))))
 	   (string-append
-	    "@code{" name-str "} is part of contexts: "
-	    (human-listify (map ref-ify
-				(sort
-				 (map symbol->string contexts) string<?)))))
+	    "@code{" name-str "} "
+	    (if (equal? context-list "none")
+		"is not part of any context"
+		(string-append
+		 "is part of the following context(s): "
+		 context-list))
+	    "."))
 	 ""))))
 
 ;; First level Engraver description
@@ -102,12 +109,12 @@
  (ly:get-all-translators))
 
 (define (find-engraver-by-name name)
-  "NAME is a symbol." 
+  "NAME is a symbol."
   (hash-ref name->engraver-table name #f))
 
 (define (document-engraver-by-name name)
   "NAME is a symbol."
-  
+
   (let* ((eg (find-engraver-by-name name)))
 
     (cons (string-append "@code{" (ref-ify (symbol->string name)) "}")
@@ -115,76 +122,88 @@
 
 (define (document-property-operation op)
   (let ((tag (car op))
-	(body (cdr op))
-	(sym (cadr op)))
+	(context-sym (cadr op))
+	(args (cddr op))
+	)
 
     (cond
      ((equal?  tag 'push)
+      (let*
+	  ((value (car args))
+	   (path (cdr args)))
+
       (string-append
-       "@item "
-       (if (null? (cddr body))
-	   "Revert "
-	   "Set ")
-       "grob-property @code{"
-       (symbol->string (cadr body))
-       "} in @ref{" (symbol->string sym)
-       "}"
-       (if (not (null? (cddr body)))
-	   (string-append " to @code{" (scm->texi (cadr (cdr body))) "}" ))
-       "\n"))
-     ((equal? (object-property sym 'is-grob?) #t) "")
-     ((equal? (car op) 'assign)
-      (string-append
-       "@item Set translator property @code{"
-       (symbol->string (car body))
-       "} to @code{"
-       (scm->texi (cadr body))
-       "}\n")))))
+       "@item Set "
+       (format "grob-property @code{~a} "
+	       (string-join (map symbol->string path) " "))
+       (format "in @ref{~a} to ~a."
+	       context-sym (scm->texi value))
+       "\n")))
+     ((equal? (object-property context-sym 'is-grob?) #t) "")
+     ((equal? tag 'assign)
+      (format "@item Set translator property @code{~a} to ~a.\n"
+	      context-sym
+	      (scm->texi (car args))))
+     )))
+
 
 (define (context-doc context-desc)
-  (let* ((name-sym (cdr (assoc 'context-name context-desc)))
+  (let* ((name-sym (assoc-get 'context-name context-desc))
 	 (name (symbol->string name-sym))
-	 (aliases (map symbol->string (cdr (assoc 'aliases context-desc))))
-	 (desc-handle (assoc 'description context-desc))
-	 (desc (if (and  (pair? desc-handle) (string? (cdr desc-handle)))
-		   (cdr desc-handle) "(not documented)"))
-	 
-	 (accepts (cdr (assoc 'accepts context-desc)))
-	 (consists (cdr (assoc 'consists context-desc)))
-	 (props (cdr (assoc 'property-ops context-desc)))
+	 (aliases (map symbol->string (assoc-get 'aliases context-desc)))
+	 (desc (assoc-get 'description context-desc "(not documented"))
+	 (accepts (assoc-get 'accepts context-desc))
+	 (consists (assoc-get 'consists context-desc))
+	 (props (assoc-get 'property-ops context-desc))
 	 (grobs  (context-grobs context-desc))
-	 (grob-refs (map (lambda (x) (ref-ify x)) grobs)))
+	 (grob-refs (map ref-ify (sort grobs ly:string-ci<?))))
 
     (make <texi-node>
       #:name name
       #:text
-      (string-append 
+      (string-append
        desc
        (if (pair? aliases)
-	   (string-append "\n\n This context is also known as: \n\n"
-			  (human-listify aliases))
+	   (string-append
+	    "\n\nThis context also accepts commands for the following context(s):\n\n"
+	    (human-listify (sort aliases ly:string-ci<?))
+	    ".")
 	   "")
-       "\n\nThis context creates the following layout objects: \n\n"
-       (human-listify (uniq-list (sort grob-refs string<? )))
+
+       "\n\nThis context creates the following layout object(s):\n\n"
+       (human-listify (uniq-list grob-refs))
        "."
-       (if (pair? props)
-	   (string-append
-	    "\n\nThis context sets the following properties:\n"
-	    "@itemize @bullet\n"
-	    (apply string-append (map document-property-operation props))
-	    "@end itemize\n")
+
+       (if (and (pair? props) (not (null? props)))
+	   (let ((str (apply string-append
+		             (sort (map document-property-operation props)
+			           ly:string-ci<?))))
+	     (if (string-null? str)
+		 ""
+		 (string-append
+		  "\n\nThis context sets the following properties:\n\n"
+		  "@itemize @bullet\n"
+		  str
+		  "@end itemize\n")))
 	   "")
-       
+
        (if (null? accepts)
-	   "\n\nThis context is a `bottom' context; it can not contain other contexts."
+	   "\n\nThis context is a `bottom' context; it cannot contain other contexts."
 	   (string-append
 	    "\n\nContext "
-	    name " can contain \n"
-	    (human-listify (map ref-ify (map symbol->string accepts)))))
-       
-       "\n\nThis context is built from the following engravers: "
-       (description-list->texi
-	(map document-engraver-by-name consists))))))
+	    name
+	    " can contain\n"
+	    (human-listify (map ref-ify (sort (map symbol->string accepts)
+					      ly:string-ci<?)))
+	    "."))
+
+       (if (null? consists)
+	   ""
+	   (string-append
+	    "\n\nThis context is built from the following engraver(s):"
+	    (description-list->texi
+	     (map document-engraver-by-name (sort consists ly:symbol-ci<?))
+	     #t)))))))
 
 (define (engraver-grobs grav)
   (let* ((eg (if (symbol? grav)
@@ -192,7 +211,7 @@
 		 grav)))
     (if (eq? eg #f)
 	'()
-	(map symbol->string (cdr (assoc 'grobs-created (ly:translator-description eg)))))))
+	(map symbol->string (assoc-get 'grobs-created (ly:translator-description eg))))))
 
 (define (context-grobs context-desc)
   (let* ((group (assq-ref context-desc 'group-type))
@@ -200,7 +219,7 @@
 		    (if group
 			(list group)
 			'())
-		    (cdr (assoc 'consists context-desc))))
+		    (assoc-get 'consists context-desc)))
 	 (grobs  (apply append
 			(map engraver-grobs consists))))
     grobs))
@@ -208,56 +227,56 @@
 (define (all-contexts-doc)
   (let* ((layout-alist
 	  (sort (ly:output-description $defaultlayout)
-		(lambda (x y) (symbol<? (car x) (car y)))))
-	 (names (sort (map symbol->string (map car layout-alist)) string<?))
+		(lambda (x y) (ly:symbol-ci<? (car x) (car y)))))
+	 (names (sort (map symbol->string (map car layout-alist)) ly:string-ci<?))
 	 (contexts (map cdr layout-alist)))
 
     (make <texi-node>
       #:name "Contexts"
-      #:desc "Complete descriptions of all contexts"
+      #:desc "Complete descriptions of all contexts."
       #:children
       (map context-doc contexts))))
 
 (define all-engravers-list  (ly:get-all-translators))
 (set! all-engravers-list
       (sort all-engravers-list
-	    (lambda (a b) (string<? (symbol->string (ly:translator-name a))
+	    (lambda (a b) (ly:string-ci<? (symbol->string (ly:translator-name a))
 				    (symbol->string (ly:translator-name b))))))
 
 (define (all-engravers-doc)
   (make <texi-node>
-    #:name "Engravers"
-    #:desc "All separate engravers"
-    #:text "See @usermanref{Modifying context plug-ins}."
+    #:name "Engravers and Performers"
+    #:desc "All separate engravers and performers."
+    #:text "See @ruser{Modifying context plug-ins}."
     #:children
     (map engraver-doc all-engravers-list)))
 
 (define (translation-properties-doc-string lst)
-  (let* ((ps (sort (map symbol->string lst) string<?))
+  (let* ((ps (sort (map symbol->string lst) ly:string-ci<?))
 	 (sortedsyms (map string->symbol ps))
 	 (propdescs
 	  (map
 	   (lambda (x) (property->texi 'translation  x '()))
 	   sortedsyms))
-	 (texi (description-list->texi propdescs)))
+	 (texi (description-list->texi propdescs #f)))
     texi))
 
 (define (translation-doc-node)
   (make <texi-node>
     #:name "Translation"
-    #:desc "From music to layout"
+    #:desc "From music to layout."
     #:children
     (list
      (all-contexts-doc)
      (all-engravers-doc)
      (make <texi-node>
        #:name "Tunable context properties"
-       #:desc "All tunable context properties"
+       #:desc "All tunable context properties."
        #:text (translation-properties-doc-string
 	       all-user-translation-properties))
 
      (make <texi-node>
        #:name "Internal context properties"
-       #:desc "All internal context properties"
+       #:desc "All internal context properties."
        #:text (translation-properties-doc-string
 	       all-internal-translation-properties)))))