style nits.

diff --git a/lily/bend-engraver.cc b/lily/bend-engraver.cc
new file mode 100644 (file)
index 0000000..b260f6f
--- /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 c1cb5a40258384e2e1c960684d183c281ddd6f0d..f427a988759332b1b2813a9e2bc9df17f15fcdbb 100644 (file)
--- 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 fc1b77a0342870c520b767f1325f1d53a546f3ce..07ec4ecce05985ab8825d589b49195d2b7cb6616 100644 (file)
--- 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 08ca8e15e8c3c94c6b5d6975717a6fc6e6cc9841..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 96dd9bbdd0b10fb426114194b9d2de97902193ab..f14a028af6dfc14bc78686e5e356edf752bdbb2d 100644 (file)
--- 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 6e8dd9a22a9469cb878996252023b332b5d3e6a0..3d2e59e5ae01796ef2c0ee341ababd800e229c7f 100644 (file)
--- 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 c765ffcd4cb56d7db3cfe13fc1790da464f0a457..557a5d9ff759cfcce29c11b70afe8d178a661524 100644 (file)
--- 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 a6a48a8f188f4bf92537576453a9b90f6c9e8160..4a3179af34c64e07481826abe54b4dd069733cf9 100644 (file)
--- 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 4064efa37e2fd9f12921dfc8c5cab56df2f219c0..77ea6bc53cc73b7c07760c29716728028c28ba8e 100644 (file)
--- 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 c009608fc96d5b3d12d0c23671c9de112d0f583e..5af45e6d692566a1feacdf07dc9ce6393c3c1df1 100644 (file)
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -109,7 +109,7 @@ Skyline::print () const
     }
 }
 
-static bool
+bool
 is_legal_skyline (list<Building> const &buildings)
 {
   list<Building>::const_iterator i;

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 65094f01c5b84c157369ca07559a4d8539056797..f3416f1bb9dd7fb0f2d939d1d05d9f5af2db7287 100644 (file)
--- 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"