From 0432c8dd16a35cab22fb6218a2890c6ad649e40d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 8 Jan 2007 23:42:46 +0100 Subject: [PATCH] style nits. --- lily/bend-engraver.cc | 116 +++++++++++++++++++++++++++++ lily/cluster-engraver.cc | 7 +- lily/drum-note-engraver.cc | 2 + lily/fall-engraver.cc | 116 ----------------------------- lily/laissez-vibrer-engraver.cc | 2 +- lily/ligature-bracket-engraver.cc | 1 + lily/line-interface.cc | 2 +- lily/mensural-ligature-engraver.cc | 1 + lily/page-turn-engraver.cc | 1 + lily/skyline.cc | 2 +- ly/engraver-init.ly | 2 +- 11 files changed, 130 insertions(+), 122 deletions(-) create mode 100644 lily/bend-engraver.cc diff --git a/lily/bend-engraver.cc b/lily/bend-engraver.cc new file mode 100644 index 0000000000..b260f6fbfb --- /dev/null +++ b/lily/bend-engraver.cc @@ -0,0 +1,116 @@ +/* + bend-engraver.cc -- implement Bend_engraver + + (c) 2006 Han-Wen Nienhuys + + +*/ + +#include "engraver.hh" +#include "item.hh" +#include "moment.hh" +#include "spanner.hh" +#include "stream-event.hh" + +#include "translator.icc" + +class Bend_engraver : public Engraver +{ +public: + TRANSLATOR_DECLARATIONS (Bend_engraver); + DECLARE_ACKNOWLEDGER (note_head); + +protected: + DECLARE_TRANSLATOR_LISTENER (bend_after); + void process_music (); + void stop_translation_timestep (); + void start_translation_timestep (); + void stop_fall (); + +private: + Moment stop_moment_; + Stream_event *fall_event_; + Spanner *fall_; + Grob *note_head_; +}; + +void +Bend_engraver::stop_fall () +{ + bool bar = scm_is_string (get_property ("whichBar")); + + + fall_->set_bound (RIGHT, unsmob_grob (bar + ? get_property ("currentCommandColumn") + : get_property ("currentMusicalColumn"))); + fall_ = 0; + note_head_ = 0; + fall_event_ = 0; +} + +void +Bend_engraver::stop_translation_timestep () +{ + if (fall_ && !fall_->get_bound (LEFT)) + { + fall_->set_bound (LEFT, note_head_); + fall_->set_parent (note_head_, Y_AXIS); + } +} + +void +Bend_engraver::start_translation_timestep () +{ + if (fall_ && now_mom ().main_part_ >= stop_moment_.main_part_) + { + stop_fall (); + } +} + +void +Bend_engraver::acknowledge_note_head (Grob_info info) +{ + if (!fall_event_) + return; + + if (note_head_ && fall_) + { + stop_fall (); + } + + note_head_ = info.grob (); + stop_moment_ = now_mom () + get_event_length (info.event_cause ()); +} + +Bend_engraver::Bend_engraver () +{ + fall_ = 0; + note_head_ = 0; + fall_event_ = 0; +} + +IMPLEMENT_TRANSLATOR_LISTENER (Bend_engraver, bend_after); +void +Bend_engraver::listen_bend_after (Stream_event *ev) +{ + ASSIGN_EVENT_ONCE (fall_event_, ev); +} + +void +Bend_engraver::process_music () +{ + if (fall_event_ && !fall_) + { + fall_ = make_spanner ("BendAfter", fall_event_->self_scm ()); + fall_->set_property ("delta-position", + scm_from_double (robust_scm2double (fall_event_->get_property ("delta-step"), 0))); + } +} + +ADD_ACKNOWLEDGER (Bend_engraver, note_head); + +ADD_TRANSLATOR (Bend_engraver, + /* doc */ "Create fall spanners.", + /* create */ "BendAfter", + /* read */ "", + /* write */ ""); diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc index c1cb5a4025..f427a98875 100644 --- a/lily/cluster-engraver.cc +++ b/lily/cluster-engraver.cc @@ -122,8 +122,11 @@ Cluster_spanner_engraver::acknowledge_note_column (Grob_info info) ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column); ADD_TRANSLATOR (Cluster_spanner_engraver, - /* doc */ "Engraves a cluster using Spanner notation ", - /* create */ "ClusterSpanner ClusterSpannerBeacon", + /* doc */ + "Engraves a cluster using Spanner notation ", + /* create */ + "ClusterSpanner " + "ClusterSpannerBeacon ", /* read */ "", /* write */ ""); diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index fc1b77a034..07ec4ecce0 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -132,6 +132,8 @@ Drum_notes_engraver::stop_translation_timestep () ADD_ACKNOWLEDGER (Drum_notes_engraver, stem); ADD_ACKNOWLEDGER (Drum_notes_engraver, note_column); + + ADD_TRANSLATOR (Drum_notes_engraver, /* doc */ "Generate noteheads.", /* create */ diff --git a/lily/fall-engraver.cc b/lily/fall-engraver.cc index 08ca8e15e8..e69de29bb2 100644 --- a/lily/fall-engraver.cc +++ b/lily/fall-engraver.cc @@ -1,116 +0,0 @@ -/* - fall-engraver.cc -- implement Bend_after_engraver - - (c) 2006 Han-Wen Nienhuys - - -*/ - -#include "engraver.hh" -#include "item.hh" -#include "moment.hh" -#include "spanner.hh" -#include "stream-event.hh" - -#include "translator.icc" - -class Bend_after_engraver : public Engraver -{ -public: - TRANSLATOR_DECLARATIONS (Bend_after_engraver); - DECLARE_ACKNOWLEDGER (note_head); - -protected: - DECLARE_TRANSLATOR_LISTENER (bend_after); - void process_music (); - void stop_translation_timestep (); - void start_translation_timestep (); - void stop_fall (); - -private: - Moment stop_moment_; - Stream_event *fall_event_; - Spanner *fall_; - Grob *note_head_; -}; - -void -Bend_after_engraver::stop_fall () -{ - bool bar = scm_is_string (get_property ("whichBar")); - - - fall_->set_bound (RIGHT, unsmob_grob (bar - ? get_property ("currentCommandColumn") - : get_property ("currentMusicalColumn"))); - fall_ = 0; - note_head_ = 0; - fall_event_ = 0; -} - -void -Bend_after_engraver::stop_translation_timestep () -{ - if (fall_ && !fall_->get_bound (LEFT)) - { - fall_->set_bound (LEFT, note_head_); - fall_->set_parent (note_head_, Y_AXIS); - } -} - -void -Bend_after_engraver::start_translation_timestep () -{ - if (fall_ && now_mom ().main_part_ >= stop_moment_.main_part_) - { - stop_fall (); - } -} - -void -Bend_after_engraver::acknowledge_note_head (Grob_info info) -{ - if (!fall_event_) - return; - - if (note_head_ && fall_) - { - stop_fall (); - } - - note_head_ = info.grob (); - stop_moment_ = now_mom () + get_event_length (info.event_cause ()); -} - -Bend_after_engraver::Bend_after_engraver () -{ - fall_ = 0; - note_head_ = 0; - fall_event_ = 0; -} - -IMPLEMENT_TRANSLATOR_LISTENER (Bend_after_engraver, bend_after); -void -Bend_after_engraver::listen_bend_after (Stream_event *ev) -{ - ASSIGN_EVENT_ONCE (fall_event_, ev); -} - -void -Bend_after_engraver::process_music () -{ - if (fall_event_ && !fall_) - { - fall_ = make_spanner ("BendAfter", fall_event_->self_scm ()); - fall_->set_property ("delta-position", - scm_from_double (robust_scm2double (fall_event_->get_property ("delta-step"), 0))); - } -} - -ADD_ACKNOWLEDGER (Bend_after_engraver, note_head); - -ADD_TRANSLATOR (Bend_after_engraver, - /* doc */ "Create fall spanners.", - /* create */ "BendAfter", - /* read */ "", - /* write */ ""); diff --git a/lily/laissez-vibrer-engraver.cc b/lily/laissez-vibrer-engraver.cc index 96dd9bbdd0..f14a028af6 100644 --- a/lily/laissez-vibrer-engraver.cc +++ b/lily/laissez-vibrer-engraver.cc @@ -77,6 +77,6 @@ ADD_TRANSLATOR (Laissez_vibrer_engraver, /* create */ "LaissezVibrerTie " - "LaissezVibrerTieColumn", + "LaissezVibrerTieColumn ", /* read */ "", /* write */ ""); diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc index 6e8dd9a22a..3d2e59e5ae 100644 --- a/lily/ligature-bracket-engraver.cc +++ b/lily/ligature-bracket-engraver.cc @@ -81,6 +81,7 @@ Ligature_bracket_engraver::acknowledge_rest (Grob_info info) ADD_ACKNOWLEDGER (Ligature_bracket_engraver, rest); ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column); + ADD_TRANSLATOR (Ligature_bracket_engraver, /* doc */ "Handles Ligature_events by engraving Ligature brackets.", /* create */ "TupletBracket", diff --git a/lily/line-interface.cc b/lily/line-interface.cc index c765ffcd4c..557a5d9ff7 100644 --- a/lily/line-interface.cc +++ b/lily/line-interface.cc @@ -154,5 +154,5 @@ ADD_INTERFACE (Line_interface, "thickness " "style " "arrow-length " - "arrow-width") + "arrow-width ") diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index a6a48a8f18..4a3179af34 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -416,6 +416,7 @@ Mensural_ligature_engraver::build_ligature (Spanner *ligature, ADD_ACKNOWLEDGER (Mensural_ligature_engraver, rest); ADD_ACKNOWLEDGER (Mensural_ligature_engraver, note_head); + ADD_TRANSLATOR (Mensural_ligature_engraver, /* doc */ "Handles Mensural_ligature_events by glueing special ligature heads together.", /* create */ "MensuralLigature", diff --git a/lily/page-turn-engraver.cc b/lily/page-turn-engraver.cc index 4064efa37e..77ea6bc53c 100644 --- a/lily/page-turn-engraver.cc +++ b/lily/page-turn-engraver.cc @@ -327,6 +327,7 @@ Page_turn_engraver::finalize () } ADD_ACKNOWLEDGER (Page_turn_engraver, note_head); + ADD_TRANSLATOR (Page_turn_engraver, /* doc */ "Decide where page turns are allowed to go", /* create */ "", diff --git a/lily/skyline.cc b/lily/skyline.cc index c009608fc9..5af45e6d69 100644 --- a/lily/skyline.cc +++ b/lily/skyline.cc @@ -109,7 +109,7 @@ Skyline::print () const } } -static bool +bool is_legal_skyline (list const &buildings) { list::const_iterator i; diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 65094f01c5..f3416f1bb9 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -227,7 +227,7 @@ contained staves are not connected vertically." \consists "Text_engraver" \consists "Dynamic_engraver" \consists "Fingering_engraver" - \consists "Bend_after_engraver" + \consists "Bend_engraver" \consists "Script_engraver" \consists "Script_column_engraver" -- 2.39.2