Run `make grand-replace'.

[lilypond.git] / scm / document-markup.scm

diff --git a/scm/document-markup.scm b/scm/document-markup.scm
index 77ee9b97dce4fee30b81c818af65d53c310b1f56..e595de132033f0ba0038ae8b190a2c4405a58044 100644 (file)
--- a/scm/document-markup.scm
+++ b/scm/document-markup.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -49,8 +49,8 @@
     
     (string-append
      "\n\n@item @code{\\" c-name "} " signature-str
-     "\n@findex \\" f-name "\n"
-     
+     "\n@funindex \\" c-name "\n"
+     "\n@cindex \\" c-name "\n"    
      (if (string? doc-str)
          doc-str
          "")
@@ -66,14 +66,12 @@
  
 (define (markup-category-doc-node category)
   (let* ((category-string (symbol->string category))
-         (match (string-match "-" category-string))
-         (category-name (string-capitalize
-                         (if match
-                             (regexp-substitute #f match 'pre " " 'post)
-                             category-string)))
+         (category-name (string-capitalize (regexp-substitute/global #f
+                                        "-" category-string 'pre " " 'post)))
         (markup-functions (hashq-ref markup-functions-by-category
                                           category)))
     (make <texi-node>
+      #:appendix #t
       #:name category-name
       #:desc ""
       #:text (string-append
@@ -93,11 +91,12 @@
 
 (define (markup-doc-node)
   (make <texi-node>
+    #:appendix #t
     #:name "Text markup commands"
     #:desc ""
     #:text "The following commands can all be used inside @code{\\markup @{ @}}."
     #:children (let* (;; when a new category is defined, update `ordered-categories'
-                      (ordered-categories '(font align graphic music fret-diagram other))
+                      (ordered-categories '(font align graphic music instrument-specific-markup other))
                       (raw-categories (hash-fold (lambda (category functions categories)
                                                    (cons category categories))
                                                  (list)
@@ -110,6 +109,7 @@
 
 (define (markup-list-doc-node)
   (make <texi-node>
+    #:appendix #t
     #:name "Text markup list commands"
     #:desc ""
     #:text (string-append