(context-doc): add aliases to

automated documentation.

diff --git a/ChangeLog b/ChangeLog
index ecba31d2759a45321601eb32e51de39f94032242..57e2397b79119bc9c3478c30560c09e5284a3b09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scm/document-translation.scm (context-doc): add aliases to
+       automated documentation.
+
        * make/lilypond-vars.make: remove stepmake compat glue.
 
        * make/generic-vars.make: remove cruft.

diff --git a/lily/parser.yy b/lily/parser.yy
index fdf8f5c3d9eebc8db6244259f73b33810317c404..2b8ec7198c4efc6a9d4e6c2acc92954523814d84 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -582,7 +582,7 @@ translator_spec_body:
        }
        | translator_spec_body ALIAS STRING  {
                Translator_def*td = unsmob_translator_def ($$);
-               td->type_aliases_ = scm_cons ($3, td->type_aliases_);
+               td->type_aliases_ = scm_cons (scm_string_to_symbol ($3), td->type_aliases_);
        }
        | translator_spec_body GROBDESCRIPTIONS embedded_scm {
                Translator_def*td = unsmob_translator_def($$);

diff --git a/lily/translator-def.cc b/lily/translator-def.cc
index 3e15e61b4054c6a2bef375cd4fca0beb4449818a..38457e2543d0ae6d2c93d56d38e7631daccd799d 100644 (file)
--- a/lily/translator-def.cc
+++ b/lily/translator-def.cc
@@ -327,6 +327,7 @@ Translator_def::to_alist () const
   
   l = gh_cons (gh_cons (ly_symbol2scm ("consists"),  consists_name_list_), l);
   l = gh_cons (gh_cons (ly_symbol2scm ("description"),  description_), l);
+  l = gh_cons (gh_cons (ly_symbol2scm ("aliases"),  type_aliases_), l);
   l = gh_cons (gh_cons (ly_symbol2scm ("end-consists"),
                        end_consists_name_list_), l);
   l = gh_cons (gh_cons (ly_symbol2scm ("accepts"),  accepts_name_list_), l);

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 2001c605dc9969c9ef036abb0e5459d6d3119b29..a7c1d73b26e955c9bdc1041a3a978efb4871ec06 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -521,29 +521,29 @@ ScoreContext = \translator {
        metronomeMarkFormatter = #make-metronome-markup
 
        graceSettings = #`#(
-                ("Voice" Stem direction 1)
-                ("Voice" Stem lengths ,(map (lambda (x) (* 0.8 x)) '(2.5 2.5 3.0 4.0 5.0)))
-                ("Voice" Stem stem-shorten (0.4 0))
-                ("Voice" Stem font-relative-size -1)
-                ("Voice" NoteHead font-relative-size -1)
-                ("Voice" Dots font-relative-size -1)
-                ("Voice" Stem beamed-lengths  
+                (Voice Stem direction 1)
+                (Voice Stem lengths ,(map (lambda (x) (* 0.8 x)) '(2.5 2.5 3.0 4.0 5.0)))
+                (Voice Stem stem-shorten (0.4 0))
+                (Voice Stem font-relative-size -1)
+                (Voice NoteHead font-relative-size -1)
+                (Voice Dots font-relative-size -1)
+                (Voice Stem beamed-lengths  
                  ,(map (lambda (x) (* 0.8 x)) '(3.26)))
-                ("Voice" Stem beamed-minimum-free-lengths  
+                (Voice Stem beamed-minimum-free-lengths  
                  ,(map (lambda (x) (* 0.8 x)) '(2.5 2.0 1.5)))
-                ("Voice" Stem beamed-extreme-minimum-free-lengths  
+                (Voice Stem beamed-extreme-minimum-free-lengths  
                  ,(map (lambda (x) (* 0.8 x)) '(1.83 1.5)))
 
-                ("Voice" Stem no-stem-extend #t)
-                ("Voice" Beam thickness 0.384)
-                ("Voice" Beam space-function ,(lambda (beam mult)
+                (Voice Stem no-stem-extend #t)
+                (Voice Beam thickness 0.384)
+                (Voice Beam space-function ,(lambda (beam mult)
                                                (* 0.8 (Beam::space_function
                                                        beam mult))))
-                ("Voice" Beam position-callbacks (,Beam::least_squares
+                (Voice Beam position-callbacks (,Beam::least_squares
                                                    ,Beam::check_concave
                                                    ,Beam::slope_damping))
-                ("Staff" Accidental font-relative-size -2)
-                ("Voice" Slur direction -1)
+                (Staff Accidental font-relative-size -2)
+                (Voice Slur direction -1)
        )
        
        \grobdescriptions #all-grob-descriptions

diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm
index d40e52860cc5d66943eefa03b960927553fdbac9..1f4ad95ca4c92d6ae9c360a9135e5438141ed00d 100644 (file)
--- a/scm/auto-beam.scm
+++ b/scm/auto-beam.scm
@@ -124,7 +124,7 @@ a fresh copy of the  list-head is made."
                           c 'autoBeamSettings
                           setting (ly:make-moment num den))
                          ))
-    "Voice")
+    'Voice)
   ))
 
 (define-public (revert-auto-beam-setting setting)
@@ -135,7 +135,7 @@ a fresh copy of the  list-head is made."
                           c 'autoBeamSettings
                           setting)))
     
-    "Voice")))
+    'Voice)))
   
 
 

diff --git a/scm/clef.scm b/scm/clef.scm
index 997ef4c05cfb3c3c07fcc5bcd409fcf4b9693888..a9c7ef79b34cba0be4748aabd93dfb81dad5f837 100644 (file)
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -141,11 +141,7 @@
             )
 
          (ly:set-mus-property! seq 'elements musics)
-         (ly:set-mus-property! csp 'element seq)
-         (ly:set-mus-property! csp 'context-type "Staff")
-
-         csp
-         )
+         (context-spec-music seq 'Staff))
        (begin
          (ly:warn (format "Unknown clef type `~a'
 See scm/lily.scm for supported clefs" cl))

diff --git a/scm/document-translation.scm b/scm/document-translation.scm
index 1287cb48d30dc91f0eeb30116626fc3988cebe7c..de97c6377c9eeb1de8d707602354e8e4beb35e98 100644 (file)
--- a/scm/document-translation.scm
+++ b/scm/document-translation.scm
@@ -173,6 +173,7 @@
       (
        (name-sym (cdr (assoc 'type-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)"))
@@ -185,13 +186,15 @@
                  ))
        (props (cdr (assoc 'property-ops context-desc)))
        (grobs  (context-grobs context-desc))
-       (grob-refs (map (lambda (x) (ref-ify x)) grobs))
-       )
+       (grob-refs (map (lambda (x) (ref-ify x)) grobs)) )
+
     (make <texi-node>
       #:name name
       #:text
       (string-append 
        desc
+       "\n\n This context is also known as: \n\n"
+       (human-listify aliases)
        "\n\nThis context creates the following grobs: \n\n"
        (human-listify (uniq-list (sort grob-refs string<? )))
        "."