*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 8c0f51f2f588bca8e5e70991a5cb57d3dec426ee..913c20b2440cdfac00e088b798c29e5f9ad42420 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-28  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/*.cc: specify accepts for many engravers.
+
+       * scm/music-documentation-lib.scm: dump music expressions and
+       music subtypes.
+
+       * scm/documentation-lib.scm: complete revision.
+       Use GOOPS objects to store document tree explicitly. Cleanedup and
+       sped up doco generation a lot.
+
 2002-09-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * input/trip.ly (fugaIILeft): add arpeggio

diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc
index 8c24c57b4bc323a1f78a952615bdf1c2ec3c3980..f0bc17f137da0dfec5fd9e526a67d674abd526d3 100644 (file)
--- a/lily/a2-engraver.cc
+++ b/lily/a2-engraver.cc
@@ -211,7 +211,7 @@ up for the musicexpr called @code{one}, down for the musicexpr called
 
 ",
 /* creats*/       "TextScript",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */       "multi-measure-rest-interface
 slur-interface stem-interface tie-interface note-head-interface dynamic-interface text-interface"
 ,/* reads */       "combineParts noDirection soloADue soloText soloIIText aDueText split-interval unison solo unisilence unirhythm",

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 4549a30547e3f03cc62a4cdc83de6502c91064bf..49d0a20577182ec3c415fb0e423c63b3c11c2dea 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -484,7 +484,7 @@ events.  Due to interaction with ties (which don't come together
 with note heads), this needs to be in a context higher than Tie_engraver.",
                   
               "Accidental",
-/* accepts */     "general-music",
+/* accepts */     "",
               "rhythmic-head-interface tie-interface arpeggio-interface",
               "localKeySignature extraNatural autoAccidentals autoCautionaries",
                   "localKeySignature");

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index eda824188c15116bba0d4751cbbcdad76f3bdf84..9d5468cb924f158c9576280fd2f1c2c75449dd5a 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -197,7 +197,7 @@ Ambitus_engraver::finalize ()
 ENTER_DESCRIPTION(Ambitus_engraver,
 /* descr */       "",
 /* creats*/       "Ambitus",
-/* accepts */ "general-music",
+/* accepts */ "",
 /* acks  */     "note-head-interface",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index aff46accf17cb9ad744149d71ed7e6d9e7fb2db1..932cadc95e9aacfb2882b326e5ad3510e606da55 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -496,7 +496,7 @@ when to start and stop a beam.  Overriding beaming is done through
 stemRightBeamCount.
 ",
 /* creats*/       "Beam",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "stem-interface rest-interface beam-interface bar-line-interface",
 /* reads */       "autoBeaming autoBeamSettings beatLength subdivideBeams",
 /* write */       "");

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 841a24c656e1667fd743c14ff8993297c2661270..28752d2a775e7a77dc798fb280e4a828209b234c 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -168,7 +168,7 @@ ENTER_DESCRIPTION(Hara_kiri_engraver,
 interesting items (ie. note heads, lyric syllables and normal rests)
 ",
 /* creats*/       "HaraKiriVerticalGroup",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "grob-interface",
 /* reads */       "",
 /* write */       "");
@@ -176,7 +176,7 @@ interesting items (ie. note heads, lyric syllables and normal rests)
 ENTER_DESCRIPTION(Axis_group_engraver,
 /* descr */       "Group all objects created in this context in a VerticalAxisGroup spanner.",
 /* creats*/       "VerticalAxisGroup",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "grob-interface",
 /* reads */       "verticalExtent minimumVerticalExtent extraVerticalExtent",
 /* write */       "");

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 180193ec265a29a4c912aa76970f09c2cabd6161..926654e4a9f967b5d07434544df60f57a5f4b43a 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -112,7 +112,7 @@ ENTER_DESCRIPTION(Bar_engraver,
 /* descr */       "Create barlines. This engraver is controlled through the
 @code{whichBar} property. If it has no bar line to create, it will forbid a linebreak at this point",
 /* creats*/       "BarLine",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "",
 /* reads */       "whichBar",
 /* write */       "");

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 28b73fd21e0f2cf5a0ac7d0699eea050c5e7aab2..130c42b95a27979610d3938a2d6cb0469e185351 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -118,7 +118,7 @@ ENTER_DESCRIPTION(Bar_number_engraver,
 /* descr */       "A bar number is created whenever measurePosition is zero. It is
 put on top of all staves, and appears only at  left side of the staff.",
 /* creats*/       "BarNumber",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "break-aligned-interface",
 /* reads */       "currentBarNumber stavesFound" ,
 /* write */       "");

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 8a9fd777744dc0ffb13ea346b33f83df4560ff4b..bb9ac59bc3ac34ca440e6dfd1187fde603671136 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -299,7 +299,7 @@ ENTER_DESCRIPTION(Beam_engraver,
 /* descr */       "Handles Beam_requests by engraving Beams.    If omitted, then notes will be
 printed with flags instead of beams.",
 /* creats*/       "Beam",
-/* accepts */     "general-music",
+/* accepts */     "beam-event abort-event",
 /* acks  */      "stem-interface rest-interface",
 /* reads */       "beamMelismaBusy beatLength subdivideBeams",
 /* write */       "");

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index d708eb5f86aebe84b18a8518afa2069d4c941a92..864f01a5d58c0de5116ed5a2566306571fc9443c 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -148,7 +148,7 @@ Break_align_engraver::add_to_group(SCM align_name, Item*item)
 ENTER_DESCRIPTION(Break_align_engraver,
 /* descr */       "Align grobs with corresponding break-align-symbols into groups, and order the groups according to breakAlignOrder",
 /* creats*/       "BreakAlignment BreakAlignGroup LeftEdge",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */       "break-aligned-interface"
 ,/* reads */       "breakAlignOrder",
 /* write */       "");

diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index 046deec83d069dcc07d9fa6621d938ed69e4171b..9781fa377d20434a1a2040b9cff2f1dfbf76630e 100644 (file)
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -218,7 +218,7 @@ Chord_tremolo_engraver::stop_translation_timestep ()
 ENTER_DESCRIPTION(Chord_tremolo_engraver,
 /* descr */       "Generates beams for  tremolo repeats.",
 /* creats*/       "Beam",
-/* accepts */     "general-music",
+/* accepts */     "repeated-music",
 /* acks  */      "stem-interface note-head-interface",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 819ee2cedf1c8ca8568ed4277ea16c84bdfa3a28..c2e671216b678de4b3104d5bc691457b5b5a629f 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -199,7 +199,7 @@ Clef_engraver::start_translation_timestep ()
 ENTER_DESCRIPTION(Clef_engraver,
 /* descr */       "Determine and set reference point for pitches",
 /* creats*/       "Clef OctavateEight",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "bar-line-interface",
 /* reads */       "clefPosition clefGlyph centralCPosition clefOctavation explicitClefVisibility",
 /* write */       "");

diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 41399bbeca594b9ce7bd509453dedfcb19ceb24e..4371840b5bc2417fc5d884cf214c0f516d912f74 100644 (file)
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -78,7 +78,7 @@ Collision_engraver::Collision_engraver ()
 ENTER_DESCRIPTION(Collision_engraver,
 /* descr */       "",
 /* creats*/       "NoteCollision",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "note-column-interface",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index 95fa36461fda819e176a8e25f974b7b7acf69f2b..8b8257cc0b643a596134998dfeeab1b09ca4314e 100644 (file)
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -313,7 +313,7 @@ ENTER_DESCRIPTION(Completion_heads_engraver,
 @code{Note_heads_engraver}. It plays some trickery to
 break long notes and automatically tie them into the next measure.",
 /* creats*/       "NoteHead Dots",
-/* accepts */     "general-music",
+/* accepts */     "busy-playing-event note-event",
 /* acks  */      "",
 /* reads */       "centralCPosition measurePosition measureLength",
 /* write */       "");

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 6af09938e3dae92472adc174d9b48c68dd53f85c..eb70aada0ee9144ba0e8f73d7fd6fe1edc19f3b7 100644 (file)
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -148,7 +148,7 @@ Custos_engraver::finalize ()
 ENTER_DESCRIPTION(Custos_engraver,
 /* descr */       "",
 /* creats*/       "Custos",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "bar-line-interface note-head-interface",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 83953c5d54b89518e30c507281cc77db84785603..91bb6ddd8b9fb2896140554dcaaca1906b04cae6 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -84,7 +84,7 @@ ENTER_DESCRIPTION(Dot_column_engraver,
 If omitted, then dots appear on top of the notes.
 ",
 /* creats*/       "DotColumn",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "rhythmic-head-interface dot-column-interface stem-interface",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index c69267b5d904ca55988ded37c40366f6113edea5..08250660137aad944db45562edb16bd58d2d2f69 100644 (file)
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -137,7 +137,7 @@ Dynamic_performer::try_music (Music* r)
 ENTER_DESCRIPTION(Dynamic_performer,
                  /*descr*/               "",
                  /* creats*/ "",
-                 /* accepts */     "general-music",
+                 /* accepts */     "note-column-interface script-interface",
                  /* acks */ "",
                  /*reads */"dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer",
                  /*writes*/"");

diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index 1a4f310e988664c31cf69253890c319352ce619f..a2baf1831c77f9e27e9cc80c5e95c056f1360617 100644 (file)
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -80,7 +80,7 @@ Figured_bass_engraver::process_music ()
 ENTER_DESCRIPTION(Figured_bass_engraver,
 /* descr */       "Make figured bass numbers.",
 /* creats*/       "BassFigure",
-/* accepts */     "general-music",
+/* accepts */     "rest-event bass-figure-event",
 /* acks  */      "",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index d4b59e1d53eca505643d55841793d1110695e262..2610f49b8b10241cffc83adfc8daa5c94fda3971 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -39,7 +39,7 @@ protected:
 bool
 Fingering_engraver::try_music (Music *m)
 {
-  if (dynamic_cast<Text_script_req*> (m))
+  if (m->is_mus_type ("text-script-event"))
     {
       if (m->get_mus_property ("text-type") != ly_symbol2scm ("finger"))
        return false;
@@ -244,7 +244,7 @@ Fingering_engraver::Fingering_engraver()
 ENTER_DESCRIPTION(Fingering_engraver,
 /* descr */       "Create fingering-scripts",
 /* creats*/       "Fingering",
-/* accepts */     "general-music",
+/* accepts */     "text-script-event",
 /* acks  */      "rhythmic-head-interface stem-interface",
 /* reads */       "scriptHorizontal",
 /* write */       "");

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 1e337b8c2e7f33d2daa0e7876db17f23ad88acfc..1178abc4b216513f1e1e84955b3921a877987959 100644 (file)
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -47,7 +47,7 @@ Font_size_engraver::acknowledge_grob (Grob_info gi)
 ENTER_DESCRIPTION(Font_size_engraver,
 /* descr */       "Puts fontSize into font-relative-size grob property.",
 /* creats*/       "",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "font-interface",
 /* reads */       "fontSize",
 /* write */       "");

diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc
index 07472512600af3ad82227fc9bc8892603ff544d5..c908372922189d6f82733c789cd3e1945b762839 100644 (file)
--- a/lily/forbid-break-engraver.cc
+++ b/lily/forbid-break-engraver.cc
@@ -16,7 +16,7 @@ ENTER_DESCRIPTION(Forbid_line_break_engraver,
 /* descr */       "Forbid line breaks when note heads are still playing
 at some point.",
 /* creats*/       "",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "",
 /* reads */       "busyGrobs",
 /* write */       "");

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 44ab000fa2e9c809a74c07f5dcf4e387d631ea77..856650300b06b869171fff477bf9d410b53d841b 100644 (file)
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -143,7 +143,7 @@ ENTER_DESCRIPTION(Grob_pq_engraver,
 engraver is a sort-of a failure, since it doesn't handle all sorts of borderline cases very well.
 ",
 /* creats*/       "",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "grob-interface",
 /* reads */       "busyGrobs",
 /* write */       "busyGrobs");

diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index e166f48ec99e1242655a8b815fc5b06f90288bd8..e3219af37317ecf9149351ccc18901765dbdc986 100644 (file)
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -127,7 +127,7 @@ ENTER_DESCRIPTION(Instrument_name_engraver,
 at the left of the
 staff.",
 /* creats*/       "InstrumentName",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "bar-line-interface axis-group-interface",
 /* reads */       "instrument instr",
 /* write */       "");

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 66ca419f1e12dee08ba825ebda8e78a57952d09a..c04ea1a59235cf985e9da3a9353980cacf6b2c19 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -101,5 +101,5 @@ Key_performer::try_music (Music* req)
 
 ENTER_DESCRIPTION(Key_performer,
                  "","",
-                 "general-music",
+                 "key-change-event",
                  "","","");

diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 5797748366af5ab6d8633ff633dc24d826a70667..c729c232af74adb88a903fb4bf3b4504efc7d00d 100644 (file)
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -35,7 +35,7 @@ Ligature_bracket_engraver::create_ligature_spanner ()
 ENTER_DESCRIPTION(Ligature_bracket_engraver,
 /* descr */       "Handles Ligature_requests by engraving Ligature brackets.",
 /* creats*/       "LigatureBracket",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "ligature-head-interface rest-interface",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/lyric-phrasing-engraver.cc b/lily/lyric-phrasing-engraver.cc
index 0dba2673df993d90730de0e3fbc5756bd5e8c101..1621d21d03a20a8e7572352ef8b335e49f68f387 100644 (file)
--- a/lily/lyric-phrasing-engraver.cc
+++ b/lily/lyric-phrasing-engraver.cc
@@ -361,7 +361,7 @@ This engraver is switched on by default. Turn it off for faster
 processing of orchestral scores.
 ",
                  /* creats*/       "",
-                 /* accepts */     "general-music",
+                 /* accepts */     "",
 /* acks  */      "lyric-syllable-interface note-head-interface lyric-extender-interface",
                  /* reads */       "automaticPhrasing melismaEngraverBusy associatedVoice phrasingPunctuation",
                  /* write */       "");

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 4678e9bf26d22873590589bc7124d1a5c950170a..457e9532a93db335d13b5d534dc07b58a27f7824 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -567,7 +567,7 @@ Mensural_ligature_engraver::acknowledge_grob (Grob_info info)
 ENTER_DESCRIPTION (Mensural_ligature_engraver,
 /* descr */       "Handles Mensural_ligature_requests by glueing special ligature heads together.",
 /* creats*/       "MensuralLigature",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "ligature-head-interface note-head-interface rest-interface",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 5b7b384e79b53fbc878ce6c3d850a59fe9c8478e..d761129066a78f5e57b9f22198a31f8611f4aff5 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -65,7 +65,7 @@ Time_signature_engraver::stop_translation_timestep ()
 ENTER_DESCRIPTION(Time_signature_engraver,
 /* descr */       "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
 /* creats*/       "TimeSignature",
-/* accepts */     "general-music",
+/* accepts */     "",
 /* acks  */      "",
 /* reads */       "",
 /* write */       "");

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 052eda58a1e6d73a836b2697fcaab503dc5c1a3b..6f697e9251b91dde045d3c953d9c0a7975325c05 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -42,7 +42,7 @@ protected:
 bool
 Tuplet_engraver::try_music (Music *r)
 {
-  if (Time_scaled_music * c = dynamic_cast<Time_scaled_music *> (r))
+  if ( c->is_mus_type ("time-scaled-music"))
     {
       Music *el = c->element ();
       if (!dynamic_cast<Request_chord*> (el))
@@ -155,7 +155,7 @@ Tuplet_engraver::Tuplet_engraver(){}
 ENTER_DESCRIPTION(Tuplet_engraver,
 /* descr */       "Catch Time_scaled_music and generate appropriate bracket  ",
 /* creats*/       "TupletBracket",
-/* accepts */     "general-music",
+/* accepts */     "time-scaled-music",
 /* acks  */      "note-column-interface",
 /* reads */       "tupletNumberFormatFunction tupletSpannerDuration tupletInvisible",
 /* write */       "");

diff --git a/scm/engraver-documentation-lib.scm b/scm/engraver-documentation-lib.scm
index b793ae133b9925c0c2f447eeae397658d412765d..aac8ed15e21a67abfd9a84fcd9bba4fd5f938c16 100644 (file)
--- a/scm/engraver-documentation-lib.scm
+++ b/scm/engraver-documentation-lib.scm
@@ -246,14 +246,20 @@
       )
     ))
 
+
+(define all-engravers-list  (ly-get-all-translators))
+(set! all-engravers-list
+      (sort all-engravers-list
+           (lambda (a b) (string<? (ly-translator-name a)
+                                   (ly-translator-name b)))))
+
 (define (all-engravers-doc)
   (make <texi-node>
     #:name "Engravers"
     #:desc "All separate engravers"
     #:children
-    (map engraver-doc (ly-get-all-translators))))
+    (map engraver-doc all-engravers-list)))
 
-(define all-engravers-list  (ly-get-all-translators))
 (define (all-translation-properties-doc)
   
   (let*