Add beam typenames to typename list.

[lilypond.git] / lily / clef-engraver.cc

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index c45c4b6dc3623d7157e41de0a3fed7ee9efc4e18..5551cbc07c6eac64e15f22f47f7060aa96dced9e 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -1,16 +1,27 @@
 /*
-  clef-engraver.cc -- implement Clef_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Mats Bengtsson <matsb@s3.kth.se>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  Mats Bengtsson <matsb@s3.kth.se>
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cctype>
 using namespace std;
 
+#include "item.hh"
 #include "context.hh"
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
@@ -25,8 +36,6 @@ class Clef_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Clef_engraver);
 
-  Direction octave_dir_;
-
 protected:
   void stop_translation_timestep ();
   void process_music ();
@@ -56,7 +65,6 @@ Clef_engraver::derived_mark () const
 Clef_engraver::Clef_engraver ()
 {
   clef_ = 0;
-  octave_dir_ = CENTER;
   octavate_ = 0;
 
   /*
@@ -82,7 +90,7 @@ Clef_engraver::set_glyph ()
 void
 Clef_engraver::acknowledge_bar_line (Grob_info info)
 {
-  Item *item = dynamic_cast<Item *> (info.grob ());
+  Item *item = info.item ();
   if (item && scm_is_string (get_property ("clefGlyph")))
     create_clef ();
 }
@@ -178,11 +186,7 @@ Clef_engraver::stop_translation_timestep ()
        vis = get_property ("explicitClefVisibility");
 
       if (vis)
-       {
-         clef_->set_property ("break-visibility", vis);
-         if (octavate_)
-           octavate_->set_property ("break-visibility", vis);
-       }
+       clef_->set_property ("break-visibility", vis);
 
       clef_ = 0;
 
@@ -192,8 +196,20 @@ Clef_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Clef_engraver, bar_line);
 ADD_TRANSLATOR (Clef_engraver,
-               /* doc */ "Determine and set reference point for pitches",
-               /* create */ "Clef OctavateEight",
-               /* accept */ "",
-               /* read */ "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility forceClef",
-               /* write */ "");
+               /* doc */
+               "Determine and set reference point for pitches.",
+
+               /* create */
+               "Clef "
+               "OctavateEight ",
+
+               /* read */
+               "clefGlyph "
+               "clefOctavation "
+               "clefPosition "
+               "explicitClefVisibility "
+               "forceClef ",
+
+               /* write */
+               ""
+               );