From 14d74ac262744d16fc753ee41042d32860d58633 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 9 Dec 2004 00:19:35 +0000 Subject: [PATCH] (DECLARE_EVENT_SWALLOWER): ENTER_DESCRIPTION -> ADD_TRANSLATOR --- ChangeLog | 5 +++++ lily/accidental-engraver.cc | 2 +- lily/ambitus-engraver.cc | 2 +- lily/arpeggio-engraver.cc | 2 +- lily/auto-beam-engraver.cc | 2 +- lily/axis-group-engraver.cc | 4 ++-- lily/bar-engraver.cc | 2 +- lily/bar-number-engraver.cc | 2 +- lily/beam-engraver.cc | 4 ++-- lily/beam-performer.cc | 2 +- lily/break-align-engraver.cc | 2 +- lily/breathing-sign-engraver.cc | 2 +- lily/chord-name-engraver.cc | 2 +- lily/chord-tremolo-engraver.cc | 2 +- lily/clef-engraver.cc | 2 +- lily/cluster-engraver.cc | 2 +- lily/coherent-ligature-engraver.cc | 2 +- lily/collision-engraver.cc | 2 +- lily/completion-note-heads-engraver.cc | 2 +- lily/custos-engraver.cc | 2 +- lily/dot-column-engraver.cc | 2 +- lily/drum-note-engraver.cc | 2 +- lily/drum-note-performer.cc | 2 +- lily/dynamic-engraver.cc | 2 +- lily/dynamic-performer.cc | 2 +- lily/engraver-group-engraver.cc | 2 +- lily/engraver.cc | 2 +- lily/extender-engraver.cc | 2 +- lily/figured-bass-engraver.cc | 2 +- lily/fingering-engraver.cc | 2 +- lily/font-size-engraver.cc | 2 +- lily/forbid-break-engraver.cc | 2 +- lily/glissando-engraver.cc | 2 +- lily/grace-engraver.cc | 2 +- lily/gregorian-ligature-engraver.cc | 2 +- lily/grob-pq-engraver.cc | 2 +- lily/horizontal-bracket-engraver.cc | 2 +- lily/hyphen-engraver.cc | 2 +- lily/include/translator.hh | 2 +- lily/include/type-swallow-translator.hh | 2 +- lily/instrument-name-engraver.cc | 4 ++-- lily/key-engraver.cc | 2 +- lily/key-performer.cc | 2 +- lily/ledger-line-engraver.cc | 2 +- lily/ligature-bracket-engraver.cc | 2 +- lily/ligature-engraver.cc | 2 +- lily/lyric-engraver.cc | 2 +- lily/lyric-performer.cc | 2 +- lily/mark-engraver.cc | 2 +- lily/measure-grouping-engraver.cc | 2 +- lily/melisma-translator.cc | 2 +- lily/mensural-ligature-engraver.cc | 2 +- lily/metronome-engraver.cc | 2 +- lily/multi-measure-rest-engraver.cc | 2 +- lily/new-fingering-engraver.cc | 2 +- lily/note-head-line-engraver.cc | 2 +- lily/note-heads-engraver.cc | 2 +- lily/note-name-engraver.cc | 2 +- lily/note-performer.cc | 2 +- lily/ottava-engraver.cc | 2 +- lily/output-property-engraver.cc | 2 +- lily/part-combine-engraver.cc | 2 +- lily/percent-repeat-engraver.cc | 2 +- lily/performer-group-performer.cc | 2 +- lily/phrasing-slur-engraver.cc | 2 +- lily/piano-pedal-engraver.cc | 2 +- lily/piano-pedal-performer.cc | 2 +- lily/pitch-squash-engraver.cc | 2 +- lily/recording-group-engraver.cc | 2 +- lily/repeat-acknowledge-engraver.cc | 2 +- lily/rest-collision-engraver.cc | 2 +- lily/rest-engraver.cc | 2 +- lily/rhythmic-column-engraver.cc | 2 +- lily/score-engraver.cc | 2 +- lily/score-performer.cc | 2 +- lily/script-column-engraver.cc | 2 +- lily/script-engraver.cc | 2 +- lily/separating-line-group-engraver.cc | 2 +- lily/slash-repeat-engraver.cc | 2 +- lily/slur-engraver.cc | 2 +- lily/slur-performer.cc | 2 +- lily/spacing-engraver.cc | 2 +- lily/span-arpeggio-engraver.cc | 2 +- lily/span-bar-engraver.cc | 2 +- lily/span-dynamic-performer.cc | 2 +- lily/staff-collecting-engraver.cc | 2 +- lily/staff-performer.cc | 2 +- lily/staff-symbol-engraver.cc | 4 ++-- lily/stanza-number-align-engraver.cc | 2 +- lily/stanza-number-engraver.cc | 2 +- lily/stem-engraver.cc | 2 +- lily/string-number-engraver.cc | 2 +- lily/swallow-engraver.cc | 2 +- lily/swallow-perf.cc | 2 +- lily/system-start-delimiter-engraver.cc | 2 +- lily/tab-note-heads-engraver.cc | 2 +- lily/tempo-performer.cc | 6 +++--- lily/text-engraver.cc | 2 +- lily/text-spanner-engraver.cc | 2 +- lily/tie-engraver.cc | 2 +- lily/tie-performer.cc | 2 +- lily/time-signature-engraver.cc | 2 +- lily/time-signature-performer.cc | 2 +- lily/timing-engraver.cc | 2 +- lily/timing-translator.cc | 2 +- lily/trill-spanner-engraver.cc | 2 +- lily/tuplet-engraver.cc | 2 +- lily/type-swallow-translator.cc | 6 +++--- lily/vaticana-ligature-engraver.cc | 2 +- lily/vertical-align-engraver.cc | 2 +- lily/volta-engraver.cc | 2 +- 111 files changed, 123 insertions(+), 118 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5697c51252..ec133dfaf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-12-09 Han-Wen Nienhuys + * lily/include/type-swallow-translator.hh + (DECLARE_EVENT_SWALLOWER): ENTER_DESCRIPTION -> ADD_TRANSLATOR + + * lily/*.cc: cosmetics around = sign. + * lily/paper-column.cc (Paper_column): copy rank_. This fixes lyric spacing on the penultimate column. diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index a83ce1beb3..c99d201450 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -528,7 +528,7 @@ Accidental_engraver::process_music () update_local_key_signature (); } -ENTER_DESCRIPTION (Accidental_engraver, +ADD_TRANSLATOR (Accidental_engraver, "Make accidentals. " "Catch note heads, ties and notices key-change events. " "This engraver usually lives at Staff level, but " diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index c83f65cb16..d81f5cd7e7 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -182,7 +182,7 @@ Ambitus_engraver::finalize () } } -ENTER_DESCRIPTION (Ambitus_engraver, +ADD_TRANSLATOR (Ambitus_engraver, /* descr */ "", /* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental", /* accepts */ "", diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index e258b5a707..028d6aee5a 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -93,7 +93,7 @@ Arpeggio_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Arpeggio_engraver, +ADD_TRANSLATOR (Arpeggio_engraver, /* descr */ "Generate an Arpeggio from a Arpeggio_req", /* creats*/ "Arpeggio", /* accepts */ "arpeggio-event", diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 93b918b4c7..57d9dbfdab 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -534,7 +534,7 @@ Auto_beam_engraver::process_acknowledged_grobs () count_ ++; } -ENTER_DESCRIPTION (Auto_beam_engraver, +ADD_TRANSLATOR (Auto_beam_engraver, /* descr */ "Generate beams based on measure characteristics and observed " "Stems. Uses beatLength, measureLength and measurePosition to decide " "when to start and stop a beam. Overriding beaming is done through " diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index 50dd889714..258abb2925 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -194,7 +194,7 @@ Hara_kiri_engraver::Hara_kiri_engraver () { } -ENTER_DESCRIPTION (Hara_kiri_engraver, +ADD_TRANSLATOR (Hara_kiri_engraver, /* descr */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add " "interesting items (ie. note heads, lyric syllables and normal rests) ", /* creats*/ "RemoveEmptyVerticalGroup", @@ -203,7 +203,7 @@ ENTER_DESCRIPTION (Hara_kiri_engraver, /* reads */ "", /* write */ ""); -ENTER_DESCRIPTION (Axis_group_engraver, +ADD_TRANSLATOR (Axis_group_engraver, /* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.", /* creats*/ "VerticalAxisGroup", /* accepts */ "", diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 10444fbc2e..e3fcdfefd5 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -96,7 +96,7 @@ Bar_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Bar_engraver, +ADD_TRANSLATOR (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", diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index dc80bd4b13..73bebb742c 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -106,7 +106,7 @@ Bar_number_engraver::create_items () Side_position_interface::set_axis (text_,Y_AXIS); } -ENTER_DESCRIPTION (Bar_number_engraver, +ADD_TRANSLATOR (Bar_number_engraver, /* descr */ "A bar number is created whenever measurePosition is zero. It is\n" "put on top of all staves, and appears only at left side of the staff. " "The staves are taken from @code{stavesFound}, which is maintained by " diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index 0217378217..1e686f1c65 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -276,7 +276,7 @@ Beam_engraver::acknowledge_grob (Grob_info info) -ENTER_DESCRIPTION (Beam_engraver, +ADD_TRANSLATOR (Beam_engraver, /* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will be " "printed with flags instead of beams.", /* creats*/ "Beam", @@ -317,7 +317,7 @@ Grace_beam_engraver::valid_end_point () -ENTER_DESCRIPTION (Grace_beam_engraver, +ADD_TRANSLATOR (Grace_beam_engraver, /* descr */ "Handles Beam events by engraving Beams. If omitted, then notes will " "be printed with flags instead of beams. Only engraves beams when we " " are at grace points in time. " diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc index dc5194a60a..70df79d95f 100644 --- a/lily/beam-performer.cc +++ b/lily/beam-performer.cc @@ -86,6 +86,6 @@ Beam_performer::try_music (Music *m) return false; } -ENTER_DESCRIPTION (Beam_performer,"","", +ADD_TRANSLATOR (Beam_performer,"","", "beam-event","","",""); diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 5d2987b6b3..4742942529 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -128,7 +128,7 @@ Break_align_engraver::add_to_group (SCM align_name, Item*item) Axis_group_interface::add_element (group, item); } -ENTER_DESCRIPTION (Break_align_engraver, +ADD_TRANSLATOR (Break_align_engraver, "Align grobs with corresponding @code{break-align-symbols} into " "groups, and order the groups according to @code{breakAlignOrder}. " "The left edge of the alignment gets a separate group, with a symbol @code{left-edge}. " diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc index f6442151a0..0b698c6887 100644 --- a/lily/breathing-sign-engraver.cc +++ b/lily/breathing-sign-engraver.cc @@ -64,7 +64,7 @@ Breathing_sign_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Breathing_sign_engraver, +ADD_TRANSLATOR (Breathing_sign_engraver, /* descr */ "", /* creats*/ "BreathingSign", /* accepts */ "breathing-event", diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index fa8191a422..44c1333d7a 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -151,7 +151,7 @@ Chord_name_engraver::stop_translation_timestep () The READs description is not strictly accurate: which properties are read depend on the chord naming function active. */ -ENTER_DESCRIPTION (Chord_name_engraver, +ADD_TRANSLATOR (Chord_name_engraver, /* descr */ "Catch note-events " "and generate the appropriate chordname.", /* creats*/ "ChordName", diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 705e53e83c..a617993b0e 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -214,7 +214,7 @@ Chord_tremolo_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Chord_tremolo_engraver, +ADD_TRANSLATOR (Chord_tremolo_engraver, /* descr */ "Generates beams for tremolo repeats.", /* creats*/ "Beam", /* accepts */ "repeated-music", diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 4131005ae4..6afa86229e 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -186,7 +186,7 @@ Clef_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Clef_engraver, +ADD_TRANSLATOR (Clef_engraver, /* descr */ "Determine and set reference point for pitches", /* creats*/ "Clef OctavateEight", /* accepts */ "", diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc index f576e671df..ac2ea3dd62 100644 --- a/lily/cluster-engraver.cc +++ b/lily/cluster-engraver.cc @@ -125,7 +125,7 @@ Cluster_spanner_engraver::acknowledge_grob (Grob_info info) } } -ENTER_DESCRIPTION (Cluster_spanner_engraver, +ADD_TRANSLATOR (Cluster_spanner_engraver, /* descr */ "Engraves a cluster using Spanner notation ", /* creats*/ "ClusterSpanner ClusterSpannerBeacon", /* accepts */ "cluster-note-event busy-playing-event", diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc index c233baa6c4..b4d152153b 100644 --- a/lily/coherent-ligature-engraver.cc +++ b/lily/coherent-ligature-engraver.cc @@ -213,7 +213,7 @@ Coherent_ligature_engraver::typeset_ligature (Spanner *ligature, collect_accidentals (ligature, primitives); } -ENTER_DESCRIPTION (Coherent_ligature_engraver, +ADD_TRANSLATOR (Coherent_ligature_engraver, /* descr */ "This is an abstract class. Subclasses such as Gregorian_ligature_engraver handle ligatures by glueing special ligature heads together.", /* creats*/ "", /* accepts */ "ligature-event", diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index bfaf52c412..e3100f46ff 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -69,7 +69,7 @@ Collision_engraver::Collision_engraver () -ENTER_DESCRIPTION (Collision_engraver, +ADD_TRANSLATOR (Collision_engraver, /* descr */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.", /* creats*/ "NoteCollision", /* accepts */ "", diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index dda44e2196..f1d2170087 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -312,7 +312,7 @@ Completion_heads_engraver::Completion_heads_engraver () { } -ENTER_DESCRIPTION (Completion_heads_engraver, +ADD_TRANSLATOR (Completion_heads_engraver, /* descr */ "This engraver replaces " "@code{Note_heads_engraver}. It plays some trickery to " "break long notes and automatically tie them into the next measure.", diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc index fb6cc09c74..e5566dfa41 100644 --- a/lily/custos-engraver.cc +++ b/lily/custos-engraver.cc @@ -139,7 +139,7 @@ Custos_engraver::finalize () -ENTER_DESCRIPTION (Custos_engraver, +ADD_TRANSLATOR (Custos_engraver, /* descr */ "", /* creats*/ "Custos", /* accepts */ "", diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc index e6678cc145..6cabafe451 100644 --- a/lily/dot-column-engraver.cc +++ b/lily/dot-column-engraver.cc @@ -72,7 +72,7 @@ Dot_column_engraver::acknowledge_grob (Grob_info info) -ENTER_DESCRIPTION (Dot_column_engraver, +ADD_TRANSLATOR (Dot_column_engraver, /* descr */ "Engraves dots on dotted notes shifted to the right of the note.\n" "If omitted, then dots appear on top of the notes.", /* creats*/ "DotColumn", diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index 22b9084560..4490c31300 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -168,7 +168,7 @@ Drum_notes_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Drum_notes_engraver, +ADD_TRANSLATOR (Drum_notes_engraver, /* descr */ "Generate noteheads.", /* creats*/ "NoteHead Dots Script", /* accepts */ "note-event busy-playing-event", diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index 9036e1ab52..d419a8959a 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -108,7 +108,7 @@ Drum_note_performer::try_music (Music* ev) return false; } -ENTER_DESCRIPTION (Drum_note_performer, +ADD_TRANSLATOR (Drum_note_performer, "Play drum notes.","", "note-event busy-playing-event","","",""); diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index be821ca7f6..20e69400db 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -420,7 +420,7 @@ Dynamic_engraver::acknowledge_grob (Grob_info info) } } -ENTER_DESCRIPTION (Dynamic_engraver, +ADD_TRANSLATOR (Dynamic_engraver, /* descr */ "This engraver creates hairpins, dynamic texts, and their vertical\n" "alignments. The symbols are collected onto a DynamicLineSpanner grob\n" diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc index 721ae39492..f6885b554b 100644 --- a/lily/dynamic-performer.cc +++ b/lily/dynamic-performer.cc @@ -124,7 +124,7 @@ Dynamic_performer::try_music (Music* r) return false; } -ENTER_DESCRIPTION (Dynamic_performer, +ADD_TRANSLATOR (Dynamic_performer, /*descr*/ "", /* creats*/ "", /* accepts */ "absolute-dynamic-event", diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 0be5398260..d64004be79 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -141,7 +141,7 @@ Engraver_group_engraver::initialize () Engraver_group_engraver::Engraver_group_engraver () {} -ENTER_DESCRIPTION (Engraver_group_engraver, +ADD_TRANSLATOR (Engraver_group_engraver, /* descr */ "A group of engravers taken together", /* creats*/ "", /* accepts */ "", diff --git a/lily/engraver.cc b/lily/engraver.cc index e1d1ddf50b..52ca1c9278 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -66,7 +66,7 @@ Engraver::get_score_engraver () const } -ENTER_DESCRIPTION (Engraver, +ADD_TRANSLATOR (Engraver, "", "", "", "", "", ""); diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc index 73f8f58b7e..d163ac6486 100644 --- a/lily/extender-engraver.cc +++ b/lily/extender-engraver.cc @@ -152,7 +152,7 @@ Extender_engraver::finalize () } -ENTER_DESCRIPTION (Extender_engraver, +ADD_TRANSLATOR (Extender_engraver, /* descr */ "Create lyric extenders", /* creats*/ "LyricExtender", /* accepts */ "extender-event", diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc index c35e87d9c1..2a63c10a5e 100644 --- a/lily/figured-bass-engraver.cc +++ b/lily/figured-bass-engraver.cc @@ -86,7 +86,7 @@ Figured_bass_engraver::process_music () } -ENTER_DESCRIPTION (Figured_bass_engraver, +ADD_TRANSLATOR (Figured_bass_engraver, /* descr */ "Make figured bass numbers.", /* creats*/ "BassFigure", /* accepts */ "rest-event bass-figure-event", diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 9a615f073d..2dc0cb9baf 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -145,7 +145,7 @@ Fingering_engraver::Fingering_engraver () } -ENTER_DESCRIPTION (Fingering_engraver, +ADD_TRANSLATOR (Fingering_engraver, /* descr */ "Create fingering-scripts", /* creats*/ "Fingering", /* accepts */ "fingering-event", diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc index 3efa0fee37..46672d0ac1 100644 --- a/lily/font-size-engraver.cc +++ b/lily/font-size-engraver.cc @@ -46,7 +46,7 @@ Font_size_engraver::acknowledge_grob (Grob_info gi) } -ENTER_DESCRIPTION (Font_size_engraver, +ADD_TRANSLATOR (Font_size_engraver, /* descr */ "Puts fontSize into font-relative-size grob property.", /* creats*/ "", /* accepts */ "", diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc index 2407e81613..9bbf42e394 100644 --- a/lily/forbid-break-engraver.cc +++ b/lily/forbid-break-engraver.cc @@ -36,7 +36,7 @@ Forbid_line_break_engraver::start_translation_timestep () } -ENTER_DESCRIPTION (Forbid_line_break_engraver, +ADD_TRANSLATOR (Forbid_line_break_engraver, /* descr */ "Forbid line breaks when note heads are still playing at some point.", /* creats*/ "", /* accepts */ "", diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc index 511badf58e..32dd0e9edb 100644 --- a/lily/glissando-engraver.cc +++ b/lily/glissando-engraver.cc @@ -110,7 +110,7 @@ Glissando_engraver::finalize () -ENTER_DESCRIPTION (Glissando_engraver, +ADD_TRANSLATOR (Glissando_engraver, /* descr */ "Engrave a glissandi", /* creats*/ "Glissando", /* accepts */ "glissando-event", diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc index ee998dda5d..3fe474eefd 100644 --- a/lily/grace-engraver.cc +++ b/lily/grace-engraver.cc @@ -93,7 +93,7 @@ Grace_engraver::start_translation_timestep () } -ENTER_DESCRIPTION (Grace_engraver, +ADD_TRANSLATOR (Grace_engraver, /* descr */ "Set font size and other properties for grace notes.", /* creats*/ "", /* accepts */ "", diff --git a/lily/gregorian-ligature-engraver.cc b/lily/gregorian-ligature-engraver.cc index 7b623cc2ef..bf28600f80 100644 --- a/lily/gregorian-ligature-engraver.cc +++ b/lily/gregorian-ligature-engraver.cc @@ -274,7 +274,7 @@ Gregorian_ligature_engraver::stop_translation_timestep () pes_or_flexa_req_ = 0; } -ENTER_DESCRIPTION (Gregorian_ligature_engraver, +ADD_TRANSLATOR (Gregorian_ligature_engraver, /* descr */ "This is an abstract class. Subclasses such as Vaticana_ligature_engraver handle ligatures by glueing special ligature heads together.", /* creats*/ "", /* accepts */ "ligature-event", diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index 86e2814900..910a133266 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -112,7 +112,7 @@ Grob_pq_engraver::start_translation_timestep () } -ENTER_DESCRIPTION (Grob_pq_engraver, +ADD_TRANSLATOR (Grob_pq_engraver, /* descr */ "Administrate when certain grobs (eg. note heads) stop playing; this \ engraver is a sort-of a failure, since it doesn't handle all sorts of \ diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc index 494a90bc50..3dd39676c6 100644 --- a/lily/horizontal-bracket-engraver.cc +++ b/lily/horizontal-bracket-engraver.cc @@ -28,7 +28,7 @@ public: virtual void acknowledge_grob (Grob_info); }; -ENTER_DESCRIPTION (Horizontal_bracket_engraver, +ADD_TRANSLATOR (Horizontal_bracket_engraver, "Create horizontal brackets over notes for musical analysis purposes.", "HorizontalBracket", "note-grouping-event", diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc index 6d18b63ff0..fcf1eb8450 100644 --- a/lily/hyphen-engraver.cc +++ b/lily/hyphen-engraver.cc @@ -148,7 +148,7 @@ Hyphen_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Hyphen_engraver, +ADD_TRANSLATOR (Hyphen_engraver, /* descr */ "Create lyric hyphens", /* creats*/ "LyricHyphen", /* accepts */ "hyphen-event", diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 9dba8e17bb..90b903eb16 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -94,7 +94,7 @@ ADD_GLOBAL_CTOR (_ ## T ## _adder); -#define ENTER_DESCRIPTION(classname,desc,grobs,accepted,acked,read,write) \ +#define ADD_TRANSLATOR(classname,desc,grobs,accepted,acked,read,write) \ ADD_THIS_TRANSLATOR (classname);\ SCM \ classname::static_translator_description () const \ diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh index ec53a7019f..8383167d5b 100644 --- a/lily/include/type-swallow-translator.hh +++ b/lily/include/type-swallow-translator.hh @@ -31,7 +31,7 @@ struct TYPE ## _swallow_translator : public Type_swallow_translator { \ TYPE ## _swallow_translator :: TYPE ## _swallow_translator() {\ swallow_string_ = #TYPE; \ } \ -ENTER_DESCRIPTION(TYPE ## _swallow_translator, \ +ADD_TRANSLATOR(TYPE ## _swallow_translator, \ "Swallow events of " #TYPE " type.", \ "", \ "general-music",\ diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 695d96a2f8..1debf00a12 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -124,7 +124,7 @@ Instrument_name_engraver::process_music () create_text (); } -ENTER_DESCRIPTION (Instrument_name_engraver, +ADD_TRANSLATOR (Instrument_name_engraver, /* descr */ " Prints the name of the instrument (specified by " " @code{Staff.instrument} and @code{Staff.instr}) " "at the left of the staff. ", @@ -176,7 +176,7 @@ Vocal_name_engraver::create_text () -ENTER_DESCRIPTION (Vocal_name_engraver, +ADD_TRANSLATOR (Vocal_name_engraver, /* descr */ " Prints the name of the a lyric voice (specified by " " @code{Staff.vocalName} and @code{Staff.vocNam}) " "at the left of the staff. ", diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index db5c1e4c06..30c8bac285 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -192,7 +192,7 @@ Key_engraver::initialize () } -ENTER_DESCRIPTION (Key_engraver, +ADD_TRANSLATOR (Key_engraver, /* descr */ "", /* creats*/ "KeySignature", /* accepts */ "key-change-event", diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 09e0ce0aac..8d00b911cd 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -93,7 +93,7 @@ Key_performer::try_music (Music* req) return false; } -ENTER_DESCRIPTION (Key_performer, +ADD_TRANSLATOR (Key_performer, "","", "key-change-event", "","",""); diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc index b1f5b3aed6..a51e888d4a 100644 --- a/lily/ledger-line-engraver.cc +++ b/lily/ledger-line-engraver.cc @@ -55,7 +55,7 @@ Ledger_line_engraver::acknowledge_grob (Grob_info s) Pointer_group_interface::add_grob (span_, ly_symbol2scm ("note-heads"), s.grob_); } -ENTER_DESCRIPTION (Ledger_line_engraver, +ADD_TRANSLATOR (Ledger_line_engraver, "Creates the spanner to draw ledger lines, and notices objects that need ledger lines", /* creats*/ "LedgerLineSpanner", /* accepts */ "", diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc index 5790517afe..aeebbc86d9 100644 --- a/lily/ligature-bracket-engraver.cc +++ b/lily/ligature-bracket-engraver.cc @@ -53,7 +53,7 @@ Ligature_bracket_engraver::acknowledge_grob (Grob_info info) } } -ENTER_DESCRIPTION (Ligature_bracket_engraver, +ADD_TRANSLATOR (Ligature_bracket_engraver, /* descr */ "Handles Ligature_events by engraving Ligature brackets.", /* creats*/ "TupletBracket", /* accepts */ "ligature-event", diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc index 4ec29c1cf2..1c7c35db4f 100644 --- a/lily/ligature-engraver.cc +++ b/lily/ligature-engraver.cc @@ -286,7 +286,7 @@ Ligature_engraver::acknowledge_grob (Grob_info info) } } -ENTER_DESCRIPTION (Ligature_engraver, +ADD_TRANSLATOR (Ligature_engraver, /* descr */ "Abstract class; a concrete subclass handles Ligature_events by engraving Ligatures in a concrete style.", /* creats */ "", /* accepts */ "ligature-event", diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 87a6bfb8f4..8a187c6af5 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -146,7 +146,7 @@ Lyric_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Lyric_engraver, +ADD_TRANSLATOR (Lyric_engraver, /* descr */ "", /* creats*/ "LyricText", /* accepts */ "lyric-event", diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index 8118c60d90..a0607c24d7 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -70,4 +70,4 @@ Lyric_performer::try_music (Music* req) return false; } -ENTER_DESCRIPTION (Lyric_performer,"","","lyric-event","","",""); +ADD_TRANSLATOR (Lyric_performer,"","","lyric-event","","",""); diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 8d22aba1c5..084af60a3e 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -137,7 +137,7 @@ Mark_engraver::process_music () } } -ENTER_DESCRIPTION (Mark_engraver, +ADD_TRANSLATOR (Mark_engraver, /* descr */ "This engraver will create RehearsalMark objects. " "It puts them on top of all staves (which is taken from " "the property @code{stavesFound}). If moving this engraver " diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index 85e3c4e99f..48a95af0fb 100644 --- a/lily/measure-grouping-engraver.cc +++ b/lily/measure-grouping-engraver.cc @@ -108,7 +108,7 @@ Measure_grouping_engraver::Measure_grouping_engraver () grouping_ = 0; } -ENTER_DESCRIPTION (Measure_grouping_engraver, +ADD_TRANSLATOR (Measure_grouping_engraver, /* descr */ "Creates MeasureGrouping to indicate beat subdivision.", /* creats*/ "MeasureGrouping", /* accepts */ "", diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc index fbffc1e00f..a44414ff94 100644 --- a/lily/melisma-translator.cc +++ b/lily/melisma-translator.cc @@ -72,7 +72,7 @@ Melisma_translator::Melisma_translator () event_ = 0; } -ENTER_DESCRIPTION (Melisma_translator, +ADD_TRANSLATOR (Melisma_translator, /* descr */ "This translator collects melisma information about ties, beams, and user settings (@code{melismaBusy}, and signals it to the @code{\addlyrics} code. ", /* creats*/ "", /* accepts */ "melisma-playing-event melisma-span-event", diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index 5598ec4207..67b32ae8d0 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -444,7 +444,7 @@ Mensural_ligature_engraver::build_ligature (Spanner *ligature, join_primitives (primitives); } -ENTER_DESCRIPTION (Mensural_ligature_engraver, +ADD_TRANSLATOR (Mensural_ligature_engraver, /* descr */ "Handles Mensural_ligature_events by glueing special ligature heads together.", /* creats*/ "MensuralLigature", /* accepts */ "ligature-event", diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 50eab8b607..510fcff874 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -88,7 +88,7 @@ Metronome_mark_engraver::process_music () } } -ENTER_DESCRIPTION (Metronome_mark_engraver, +ADD_TRANSLATOR (Metronome_mark_engraver, /* descr */ "Engrave metro nome marking. This delegates the formatting work " "to the function in the metronomeMarkFormatter property. " "The mark is put over all staves. " diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 7d5e333f6d..0d134fab2b 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -245,7 +245,7 @@ Multi_measure_rest_engraver::finalize () { } -ENTER_DESCRIPTION (Multi_measure_rest_engraver, +ADD_TRANSLATOR (Multi_measure_rest_engraver, /* descr */ "Engraves multi-measure rests that are produced with @code{R}. Reads " "measurePosition and currentBarNumber to determine what number to print " diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index e1a71795b3..d86ece3f02 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -323,7 +323,7 @@ New_fingering_engraver::New_fingering_engraver () stem_ = 0; } -ENTER_DESCRIPTION (New_fingering_engraver, +ADD_TRANSLATOR (New_fingering_engraver, /* descr */ "Create fingering-scripts for notes in a new chord. " "This engraver is ill-named, since it " "also takes care of articulations and harmonic note heads", diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index b04da2e094..84e3fceb72 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -105,7 +105,7 @@ Note_head_line_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Note_head_line_engraver, +ADD_TRANSLATOR (Note_head_line_engraver, /* descr */ "Engrave a line between two note heads, for example a glissando. If " " followVoice is set, staff switches also generate a line.", /* creats*/ "Glissando VoiceFollower", diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index b87ecec4e3..23de800ffc 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -124,7 +124,7 @@ Note_heads_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Note_heads_engraver, +ADD_TRANSLATOR (Note_heads_engraver, /* descr */ "Generate noteheads.", /* creats*/ "NoteHead Dots", /* accepts */ "note-event busy-playing-event", diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index b89999aca5..8504296bc0 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -68,7 +68,7 @@ Note_name_engraver::Note_name_engraver () { } -ENTER_DESCRIPTION (Note_name_engraver, +ADD_TRANSLATOR (Note_name_engraver, /* descr */ "", /* creats*/ "NoteName", /* accepts */ "note-event", diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 88b0e48a4e..e9a567b625 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -114,7 +114,7 @@ Note_performer::try_music (Music* ev) return false; } -ENTER_DESCRIPTION (Note_performer,"","", +ADD_TRANSLATOR (Note_performer,"","", "note-event busy-playing-event","","",""); Note_performer::Note_performer () diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index 82586c91ef..924f1a6bd1 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -122,7 +122,7 @@ Ottava_spanner_engraver::finalize () last_ottavation_ = SCM_EOL; } -ENTER_DESCRIPTION (Ottava_spanner_engraver, +ADD_TRANSLATOR (Ottava_spanner_engraver, /* descr */ "Create a text spanner when the ottavation property changes..", /* creats*/ "OttavaBracket", /* accepts */ "", diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index 82364e9e82..5403d9d7c2 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -84,7 +84,7 @@ Output_property_engraver::Output_property_engraver () { } -ENTER_DESCRIPTION (Output_property_engraver, +ADD_TRANSLATOR (Output_property_engraver, /* descr */ "Interpret Music of Output_property type, and apply a function " " to any Graphic objects that satisfies the predicate.", /* creats*/ "", diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc index 52811a6eb9..8af9aafb82 100644 --- a/lily/part-combine-engraver.cc +++ b/lily/part-combine-engraver.cc @@ -93,7 +93,7 @@ Part_combine_engraver::stop_translation_timestep () event_ = 0; } -ENTER_DESCRIPTION (Part_combine_engraver, +ADD_TRANSLATOR (Part_combine_engraver, /* descr */ "Part combine engraver for orchestral scores: " "Print markings a2, Solo, Solo II, and unisono ", /* creats*/ "CombineTextScript", diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index 7e0bec50e1..118d59100f 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -205,7 +205,7 @@ Percent_repeat_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Percent_repeat_engraver, +ADD_TRANSLATOR (Percent_repeat_engraver, /* descr */ "Make whole bar and double bar repeats.", /* creats*/ "PercentRepeat DoublePercentRepeat", /* accepts */ "repeated-music", diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index 5d35c40448..a49cffbbbd 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -13,7 +13,7 @@ #include "audio-element.hh" #include "warn.hh" -ENTER_DESCRIPTION (Performer_group_performer, +ADD_TRANSLATOR (Performer_group_performer, /* descr */ "", /* creats*/ "", /* accepts */ "", diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 4b57352413..8b6bcd353f 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -146,7 +146,7 @@ Phrasing_slur_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Phrasing_slur_engraver, +ADD_TRANSLATOR (Phrasing_slur_engraver, /* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", /* creats*/ "PhrasingSlur", /* accepts */ "phrasing-slur-event", diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 4e9160c980..829b9c12ba 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -538,7 +538,7 @@ Piano_pedal_engraver::typeset_all (Pedal_info * p) } } -ENTER_DESCRIPTION (Piano_pedal_engraver, +ADD_TRANSLATOR (Piano_pedal_engraver, /* descr */ "Engrave piano pedal symbols and brackets.", /* creats*/ "SostenutoPedal SustainPedal UnaCordaPedal SostenutoPedalLineSpanner SustainPedalLineSpanner UnaCordaPedalLineSpanner", /* accepts */ "pedal-event", diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc index 63b6b3833e..66ff951671 100644 --- a/lily/piano-pedal-performer.cc +++ b/lily/piano-pedal-performer.cc @@ -140,6 +140,6 @@ Piano_pedal_performer::try_music (Music* r) return false; } -ENTER_DESCRIPTION (Piano_pedal_performer, "","", +ADD_TRANSLATOR (Piano_pedal_performer, "","", "pedal-event", "","","" ); diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc index 73211dfd98..e69c3a337f 100644 --- a/lily/pitch-squash-engraver.cc +++ b/lily/pitch-squash-engraver.cc @@ -35,7 +35,7 @@ Pitch_squash_engraver::Pitch_squash_engraver () { } -ENTER_DESCRIPTION (Pitch_squash_engraver, +ADD_TRANSLATOR (Pitch_squash_engraver, /* descr */ "Set the vertical position of noteheads to " "@code{squashedPosition}, if that " diff --git a/lily/recording-group-engraver.cc b/lily/recording-group-engraver.cc index 14b80bc448..4f3afcf6c1 100644 --- a/lily/recording-group-engraver.cc +++ b/lily/recording-group-engraver.cc @@ -84,7 +84,7 @@ Recording_group_engraver::try_music (Music *m) } -ENTER_DESCRIPTION (Recording_group_engraver, +ADD_TRANSLATOR (Recording_group_engraver, "Engraver_group_engraver that records all music events " "for this context. Calls the procedure " "in @code{recordEventSequence} when finished.", diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index 711cedb6ce..f6316e76a6 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -109,7 +109,7 @@ Repeat_acknowledge_engraver::process_music () } } -ENTER_DESCRIPTION (Repeat_acknowledge_engraver, +ADD_TRANSLATOR (Repeat_acknowledge_engraver, /* descr */ "Acknowledge repeated music, and convert the contents of " "repeatCommands ainto an appropriate setting for whichBar.", /* creats*/ "", diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index 598880e98a..0291bfae3b 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -66,7 +66,7 @@ Rest_collision_engraver::stop_translation_timestep () rest_count_ = 0; } -ENTER_DESCRIPTION (Rest_collision_engraver, +ADD_TRANSLATOR (Rest_collision_engraver, /* descr */ "Handles collisions of rests.", /* creats*/ "RestCollision", /* accepts */ "", diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index cecab14762..69eb1150fb 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -105,7 +105,7 @@ Rest_engraver::try_music (Music *m) return false; } -ENTER_DESCRIPTION (Rest_engraver, +ADD_TRANSLATOR (Rest_engraver, /* descr */ "", /* creats*/ "Rest Dots", /* accepts */ "rest-event", diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 8246d8ffc3..ad8e761c23 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -158,7 +158,7 @@ Rhythmic_column_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Rhythmic_column_engraver, +ADD_TRANSLATOR (Rhythmic_column_engraver, /* descr */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.", /* creats*/ "NoteColumn NoteSpacing", /* accepts */ "", diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index bfd0908a05..3dea667878 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -319,7 +319,7 @@ Score_engraver::acknowledge_grob (Grob_info gi) -ENTER_DESCRIPTION (Score_engraver, +ADD_TRANSLATOR (Score_engraver, /* descr */ "Top level engraver. Takes care of generating columns and the complete system (ie. System) " "\n\n " "This engraver decides whether a column is breakable. The default is " diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 8a681d3aa7..97afb37573 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -17,7 +17,7 @@ #include "context-def.hh" #include "output-def.hh" -ENTER_DESCRIPTION (Score_performer, +ADD_TRANSLATOR (Score_performer, /* descr */ "", /* creats*/ "", /* accepts */ "", diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 9b0c1310ac..9ee7d384ee 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -72,7 +72,7 @@ Script_column_engraver::process_acknowledged_grobs () } -ENTER_DESCRIPTION (Script_column_engraver, +ADD_TRANSLATOR (Script_column_engraver, /* descr */ "", /* creats*/ "ScriptColumn", /* accepts */ "", diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index b40fb63eb5..c5e8ff2190 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -239,7 +239,7 @@ Script_engraver::stop_translation_timestep () scripts_.clear (); } -ENTER_DESCRIPTION (Script_engraver, +ADD_TRANSLATOR (Script_engraver, /* descr */ "Handles note scripted articulations.", /* creats*/ "Script", /* accepts */ "script-event articulation-event", diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 54dae428db..6844cb2b63 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -216,7 +216,7 @@ Separating_line_group_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Separating_line_group_engraver, +ADD_TRANSLATOR (Separating_line_group_engraver, /* descr */ "Generates objects for computing spacing parameters.", /* creats*/ "SeparationItem SeparatingGroupSpanner StaffSpacing", /* accepts */ "", diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc index 850dd54195..7020be066f 100644 --- a/lily/slash-repeat-engraver.cc +++ b/lily/slash-repeat-engraver.cc @@ -131,7 +131,7 @@ Slash_repeat_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Slash_repeat_engraver, +ADD_TRANSLATOR (Slash_repeat_engraver, /* descr */ "Make beat repeats.", /* creats*/ "RepeatSlash", /* accepts */ "repeated-music", diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index 1bc7fce62f..b88afa21b0 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -158,7 +158,7 @@ Slur_engraver::stop_translation_timestep () events_[START] = events_[STOP] = 0; } -ENTER_DESCRIPTION (Slur_engraver, +ADD_TRANSLATOR (Slur_engraver, /* descr */ "Build slurs grobs from slur events", /* creats*/ "Slur", /* accepts */ "slur-event", diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc index a383514068..1b818c50e3 100644 --- a/lily/slur-performer.cc +++ b/lily/slur-performer.cc @@ -89,6 +89,6 @@ Slur_performer::try_music (Music *m) return false; } -ENTER_DESCRIPTION (Slur_performer,"","", +ADD_TRANSLATOR (Slur_performer,"","", "slur-event","","",""); diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index 48cb143b8d..697820f72d 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -178,7 +178,7 @@ Spacing_engraver::start_translation_timestep () -ENTER_DESCRIPTION (Spacing_engraver, +ADD_TRANSLATOR (Spacing_engraver, /* descr */ "make a SpacingSpanner and do bookkeeping of shortest starting and playing notes ", /* creats*/ "SpacingSpanner", /* accepts */ "", diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 7783f57c08..b7321da6e8 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -99,7 +99,7 @@ Span_arpeggio_engraver::stop_translation_timestep () -ENTER_DESCRIPTION (Span_arpeggio_engraver, +ADD_TRANSLATOR (Span_arpeggio_engraver, /* descr */ "", /* creats*/ "Arpeggio", /* accepts */ "", diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index adeb1808c6..7b54329835 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -76,7 +76,7 @@ Span_bar_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Span_bar_engraver, +ADD_TRANSLATOR (Span_bar_engraver, /* descr */ "This engraver makes cross-staff barlines: It catches all normal " "bar lines, and draws a single span-bar across them.", /* creats*/ "SpanBar", diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc index 6cbef11b47..45aba8177c 100644 --- a/lily/span-dynamic-performer.cc +++ b/lily/span-dynamic-performer.cc @@ -180,7 +180,7 @@ Span_dynamic_performer::try_music (Music* r) } return false; } -ENTER_DESCRIPTION (Span_dynamic_performer, +ADD_TRANSLATOR (Span_dynamic_performer, "", "", "crescendo-event decrescendo-event", "", "", ""); diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc index c9865ef3b6..5d3e154bab 100644 --- a/lily/staff-collecting-engraver.cc +++ b/lily/staff-collecting-engraver.cc @@ -37,7 +37,7 @@ Staff_collecting_engraver::acknowledge_grob (Grob_info gi) } -ENTER_DESCRIPTION (Staff_collecting_engraver, +ADD_TRANSLATOR (Staff_collecting_engraver, /* descr */ "Maintain the stavesFound variable", /* creats*/ "", diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 3994e3b63d..ffc0cb7358 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -41,7 +41,7 @@ private: Audio_tempo* tempo_; }; -ENTER_DESCRIPTION (Staff_performer, "", "", +ADD_TRANSLATOR (Staff_performer, "", "", "", "", "", ""); diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index 8472086258..75a5184d08 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -73,7 +73,7 @@ Staff_symbol_engraver::acknowledge_grob (Grob_info s) -ENTER_DESCRIPTION (Staff_symbol_engraver, +ADD_TRANSLATOR (Staff_symbol_engraver, /* descr */ "Create the constellation of five (default) " "staff lines.", /* creats*/ "StaffSymbol", @@ -110,7 +110,7 @@ Tab_staff_symbol_engraver::Tab_staff_symbol_engraver () { } -ENTER_DESCRIPTION (Tab_staff_symbol_engraver, +ADD_TRANSLATOR (Tab_staff_symbol_engraver, /* descr */ "Create a staff-symbol, but look at stringTunings for the number of lines." "staff lines.", /* creats*/ "StaffSymbol", diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc index f511cfee8d..9bcb4618f0 100644 --- a/lily/stanza-number-align-engraver.cc +++ b/lily/stanza-number-align-engraver.cc @@ -55,7 +55,7 @@ Stanza_number_align_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Stanza_number_align_engraver, +ADD_TRANSLATOR (Stanza_number_align_engraver, "This engraver ensures that stanza numbers are neatly aligned. ", "", "", diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index e88ac53536..9babd7354a 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -72,7 +72,7 @@ Stanza_number_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Stanza_number_engraver, +ADD_TRANSLATOR (Stanza_number_engraver, /* descr */ "", /* creats*/ "StanzaNumber", /* accepts */ "", diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index e2feae158c..53a12d2fac 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -166,7 +166,7 @@ Stem_engraver::try_music (Music *m) return false; } -ENTER_DESCRIPTION (Stem_engraver, +ADD_TRANSLATOR (Stem_engraver, /* descr */ "Create stems and single-stem tremolos. It also works together with " "the beam engraver for overriding beaming.", /* creats*/ "Stem StemTremolo", diff --git a/lily/string-number-engraver.cc b/lily/string-number-engraver.cc index c05649d6bb..3c1f42993b 100644 --- a/lily/string-number-engraver.cc +++ b/lily/string-number-engraver.cc @@ -31,7 +31,7 @@ String_number_engraver::String_number_engraver () */ -ENTER_DESCRIPTION (String_number_engraver, +ADD_TRANSLATOR (String_number_engraver, /* descr */ "Swallow string-number-events - the purpose of this engraver is to" " process tab for normal notation. To provent warnings for unprocessed " " string-number-event to obscure real error messages, this engraver " diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc index 92ced08887..0dc2f1508c 100644 --- a/lily/swallow-engraver.cc +++ b/lily/swallow-engraver.cc @@ -30,7 +30,7 @@ Swallow_engraver::Swallow_engraver () { } -ENTER_DESCRIPTION (Swallow_engraver, +ADD_TRANSLATOR (Swallow_engraver, /* descr */ "This engraver swallows everything given to it silently. The purpose of " "this is to prevent spurious \"event junked\" warnings.", /* creats*/ "", diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc index e70149069f..f537e6e257 100644 --- a/lily/swallow-perf.cc +++ b/lily/swallow-perf.cc @@ -29,7 +29,7 @@ Swallow_performer::try_music (Music *m) Swallow_performer::Swallow_performer () {} -ENTER_DESCRIPTION (Swallow_performer, +ADD_TRANSLATOR (Swallow_performer, /* descr */ "", /* creats*/ "", /* accepts */ "general-music", diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index c0ac1764d1..d9c858393d 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -90,7 +90,7 @@ System_start_delimiter_engraver::finalize () } } -ENTER_DESCRIPTION (System_start_delimiter_engraver, +ADD_TRANSLATOR (System_start_delimiter_engraver, /* descr */ "Creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner", /* creats*/ "SystemStartBar SystemStartBrace SystemStartBracket", /* accepts */ "", diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index a5b1777f2d..c4aff10fc0 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -167,7 +167,7 @@ Tab_note_heads_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Tab_note_heads_engraver, +ADD_TRANSLATOR (Tab_note_heads_engraver, /* descr */ "Generate one or more tablature noteheads from Music of type NoteEvent.", /* creats*/ "TabNoteHead Dots", /* accepts */ "note-event string-number-event busy-playing-event", diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index 53943e809f..5c44022b45 100644 --- a/lily/tempo-performer.cc +++ b/lily/tempo-performer.cc @@ -73,13 +73,13 @@ Tempo_performer::try_music (Music* req) if (tempo_req_) return false; - tempo_req_ = req; - return true; + tempo_req_ = req; + return true; } -ENTER_DESCRIPTION (Tempo_performer, "","", +ADD_TRANSLATOR (Tempo_performer, "","", "metronome-change-event", "","","" ); diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index b41248ba1c..5be1ff78ef 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -123,7 +123,7 @@ Text_engraver::Text_engraver () { } -ENTER_DESCRIPTION (Text_engraver, +ADD_TRANSLATOR (Text_engraver, /* descr */ "Create text-scripts", /* creats*/ "TextScript", /* accepts */ "text-script-event", diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 38bebe1254..8bd59c74b2 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -141,7 +141,7 @@ Text_spanner_engraver::finalize () } } -ENTER_DESCRIPTION (Text_spanner_engraver, +ADD_TRANSLATOR (Text_spanner_engraver, /* descr */ "Create text spanner from a Music.", /* creats*/ "TextSpanner", /* accepts */ "text-span-event", diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index 21464d02af..dab482036b 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -185,7 +185,7 @@ Tie_engraver::typeset_tie (Grob *her) } -ENTER_DESCRIPTION (Tie_engraver, +ADD_TRANSLATOR (Tie_engraver, /* descr */ "Generate ties between noteheads of equal pitch.", /* creats*/ "Tie TieColumn", /* accepts */ "tie-event", diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 8fe14a3567..4b62770803 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -107,7 +107,7 @@ Tie_performer::stop_translation_timestep () now_heads_.clear (); } -ENTER_DESCRIPTION (Tie_performer, +ADD_TRANSLATOR (Tie_performer, /* descr */ "Generate ties between noteheads of equal pitch.", /* creats*/ "", /* accepts */ "tie-event", diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index 7581abdd15..5ff450422f 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -72,7 +72,7 @@ Time_signature_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Time_signature_engraver, +ADD_TRANSLATOR (Time_signature_engraver, /* descr */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes", /* creats*/ "TimeSignature", /* accepts */ "", diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index 3988db8c23..396a49669e 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -65,4 +65,4 @@ Time_signature_performer::stop_translation_timestep () } } -ENTER_DESCRIPTION (Time_signature_performer,"","","","","",""); +ADD_TRANSLATOR (Time_signature_performer,"","","","","",""); diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc index 73e4f5561f..fd71a37274 100644 --- a/lily/timing-engraver.cc +++ b/lily/timing-engraver.cc @@ -114,7 +114,7 @@ Timing_engraver::stop_translation_timestep () } -ENTER_DESCRIPTION (Timing_engraver, +ADD_TRANSLATOR (Timing_engraver, /* descr */ " Responsible for synchronizing timing information from staves. " "Normally in @code{Score}. In order to create polyrhythmic music, " "this engraver should be removed from @code{Score} and placed in " diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 245fceef7e..3c445645d0 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -151,7 +151,7 @@ Timing_translator::start_translation_timestep () context ()->set_property ("measurePosition", measposp.smobbed_copy ()); } -ENTER_DESCRIPTION (Timing_translator, +ADD_TRANSLATOR (Timing_translator, "This engraver adds the alias " "@code{Timing} to its containing context." , diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc index 594db99e36..7ba0c39f9f 100644 --- a/lily/trill-spanner-engraver.cc +++ b/lily/trill-spanner-engraver.cc @@ -147,7 +147,7 @@ Trill_spanner_engraver::finalize () } } -ENTER_DESCRIPTION (Trill_spanner_engraver, +ADD_TRANSLATOR (Trill_spanner_engraver, /* descr */ "Create trill spanner from a Music.", /* creats*/ "TrillSpanner", /* accepts */ "trill-span-event", diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 8d783526bc..0ee5f17fe1 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -136,7 +136,7 @@ Tuplet_engraver::Tuplet_engraver () { } -ENTER_DESCRIPTION (Tuplet_engraver, +ADD_TRANSLATOR (Tuplet_engraver, /* descr */ "Catch Time_scaled_music and generate appropriate bracket ", /* creats*/ "TupletBracket", /* accepts */ "time-scaled-music", diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc index c14581e099..416d14ac20 100644 --- a/lily/type-swallow-translator.cc +++ b/lily/type-swallow-translator.cc @@ -31,7 +31,7 @@ public: Skip_event_swallow_translator::Skip_event_swallow_translator (){} -ENTER_DESCRIPTION (Skip_event_swallow_translator, +ADD_TRANSLATOR (Skip_event_swallow_translator, "Swallow \\skip.", "", "skip-event", @@ -42,7 +42,7 @@ ENTER_DESCRIPTION (Skip_event_swallow_translator, Rest_swallow_translator::Rest_swallow_translator (){} -ENTER_DESCRIPTION (Rest_swallow_translator, +ADD_TRANSLATOR (Rest_swallow_translator, "Swallow rest", "", "rest-event", @@ -63,7 +63,7 @@ public: Note_swallow_translator::Note_swallow_translator (){} -ENTER_DESCRIPTION (Note_swallow_translator, +ADD_TRANSLATOR (Note_swallow_translator, "Swallow notes", "", "note-event", diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index ca1bfd6c42..10af064573 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -577,7 +577,7 @@ Vaticana_ligature_engraver::transform_heads (Spanner *ligature, } -ENTER_DESCRIPTION (Vaticana_ligature_engraver, +ADD_TRANSLATOR (Vaticana_ligature_engraver, /* descr */ "Handles ligatures by glueing special ligature heads together.", /* creats*/ "VaticanaLigature", /* accepts */ "ligature-event", diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 4eb9a2224f..89a3877bcb 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -69,7 +69,7 @@ Vertical_align_engraver::acknowledge_grob (Grob_info i) } -ENTER_DESCRIPTION (Vertical_align_engraver, +ADD_TRANSLATOR (Vertical_align_engraver, /* descr */ "Catch Vertical axis groups and stack them.", /* creats*/ "VerticalAlignment", /* accepts */ "", diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index c116e0e4ac..944a25b852 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -249,7 +249,7 @@ Volta_engraver::stop_translation_timestep () TODO: should attach volta to paper-column if no bar is found. */ -ENTER_DESCRIPTION (Volta_engraver, +ADD_TRANSLATOR (Volta_engraver, /* descr */ "Make volta brackets.", /* creats*/ "VoltaBracket", /* accepts */ "", -- 2.39.5