Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / pitch-squash-engraver.cc

diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc
index a6e1941ed1955406c136104422a14c42c154be31..f072c3c84e209301a097a3354122f42172b60072 100644 (file)
--- a/lily/pitch-squash-engraver.cc
+++ b/lily/pitch-squash-engraver.cc
@@ -3,12 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
+
+#include "engraver.hh"
+
 #include "staff-symbol-referencer.hh"
 #include "note-head.hh"
 #include "rhythmic-head.hh"
-#include "engraver.hh"
+#include "grob.hh"
 
 class Pitch_squash_engraver : public Engraver
 {
@@ -22,9 +25,7 @@ Pitch_squash_engraver::acknowledge_note_head (Grob_info i)
 {
   SCM newpos = get_property ("squashedPosition");
   if (scm_is_number (newpos))
-    {
-      i.grob ()->set_property ("staff-position", newpos);
-    }
+    i.grob ()->set_property ("staff-position", newpos);
 }
 
 Pitch_squash_engraver::Pitch_squash_engraver ()
@@ -32,16 +33,15 @@ Pitch_squash_engraver::Pitch_squash_engraver ()
 }
 
 #include "translator.icc"
-ADD_ACKNOWLEDGER (Pitch_squash_engraver,note_head);
+ADD_ACKNOWLEDGER (Pitch_squash_engraver, note_head);
 ADD_TRANSLATOR (Pitch_squash_engraver,
-               /* descr */
+               /* doc */
                "Set the vertical position of noteheads to "
                "@code{squashedPosition}, if that "
                "property is set. "
                "This can be used to make  a single line staff "
                "demonstrating the rhythm of a melody.",
 
-               /* creats*/ "",
-               /* accepts */ "",
-               /* reads */ "squashedPosition",
+               /* create */ "",
+               /* read */ "squashedPosition",
                /* write */ "");