(internal_print): only call

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index e4c84d9e9fc9dfe76a16dbdd81ceb50784707a5b..c1a973f4a0eb7d6e2eb66cdc572c6370c10c044f 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,32 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  */
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
-
-
-#include "event.hh"
 #include "item.hh"
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
 #include "context.hh"
 #include "engraver.hh"
-#include "pitch.hh"
 #include "protected-scm.hh"
 #include "clef.hh"
+#include "pitch.hh"
 
 /*
   TODO: The representation  of key sigs is all fucked.
- */
+*/
 
 /**
-  Make the key signature.
- */
+   Make the key signature.
+*/
 class Key_engraver : public Engraver
 {
   void create_key (bool);
-  void read_ev (Music const * r);
+  void read_ev (Music const *r);
 
   Music *key_ev_;
   Item *item_;
@@ -40,19 +37,16 @@ protected:
   virtual void initialize ();
   virtual void finalize ();
   virtual bool try_music (Music *ev);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  PRECOMPUTED_VIRTUAL void process_music ();
   virtual void acknowledge_grob (Grob_info);
 };
 
-
 void
 Key_engraver::finalize ()
 {
 }
 
-
 Key_engraver::Key_engraver ()
 {
   key_ev_ = 0;
@@ -60,11 +54,10 @@ Key_engraver::Key_engraver ()
   cancellation_ = 0;
 }
 
-
 void
 Key_engraver::create_key (bool def)
 {
-  if (!item_) 
+  if (!item_)
     {
       item_ = make_item ("KeySignature", key_ev_ ? key_ev_->self_scm () : SCM_EOL);
 
@@ -77,25 +70,23 @@ Key_engraver::create_key (bool def)
          && !scm_is_eq (last, key))
        {
          cancellation_ = make_item ("KeyCancellation", key_ev_ ? key_ev_->self_scm () : SCM_EOL);
-         cancellation_->set_property ("old-accidentals",last);
+         cancellation_->set_property ("old-accidentals", last);
          cancellation_->set_property ("c0-position",
-                          get_property ("middleCPosition"));
-      
+                                      get_property ("middleCPosition"));
        }
       item_->set_property ("new-accidentals", key);
     }
 
   if (!def)
     {
-      SCM vis = get_property ("explicitKeySignatureVisibility"); 
-      if (ly_c_procedure_p (vis))
-       item_->set_property ("break-visibility",vis);
+      SCM vis = get_property ("explicitKeySignatureVisibility");
+      if (ly_is_procedure (vis))
+       item_->set_property ("break-visibility", vis);
     }
-}      
-
+}
 
 bool
-Key_engraver::try_music (Music * ev)
+Key_engraver::try_music (Music *ev)
 {
   if (ev->is_mus_type ("key-change-event"))
     {
@@ -106,50 +97,47 @@ Key_engraver::try_music (Music * ev)
          read_ev (key_ev_);
        }
       return true;
-    }   
-  return  false;
+    }
+  return false;
 }
 
-
 void
 Key_engraver::acknowledge_grob (Grob_info info)
 {
-  if (Clef::has_interface (info.grob_))
+  if (Clef::has_interface (info.grob ()))
     {
-      SCM c =  get_property ("createKeyOnClefChange");
+      SCM c = get_property ("createKeyOnClefChange");
       if (to_boolean (c))
        {
          create_key (false);
        }
     }
-  else if (Bar_line::has_interface (info.grob_)
+  else if (Bar_line::has_interface (info.grob ())
           && scm_is_pair (get_property ("keySignature")))
     {
       create_key (true);
     }
 }
 
-
 void
 Key_engraver::process_music ()
 {
-  if (key_ev_ ||
-      get_property ("lastKeySignature") != get_property ("keySignature"))
+  if (key_ev_
+      || get_property ("lastKeySignature") != get_property ("keySignature"))
     create_key (false);
 }
 
-
 void
 Key_engraver::stop_translation_timestep ()
 {
   item_ = 0;
   context ()->set_property ("lastKeySignature", get_property ("keySignature"));
-  cancellation_ = 0; 
+  cancellation_ = 0;
+  key_ev_ = 0;
 }
 
-
 void
-Key_engraver::read_ev (Music const * r)
+Key_engraver::read_ev (Music const *r)
 {
   SCM p = r->get_property ("pitch-alist");
   if (!scm_is_pair (p))
@@ -166,40 +154,32 @@ Key_engraver::read_ev (Music const * r)
          n = scm_delete_x (scm_car (s), n);
        }
     }
-  
-  for (SCM s = n ; scm_is_pair (s); s = scm_cdr (s))
+
+  for (SCM s = n; scm_is_pair (s); s = scm_cdr (s))
     if (scm_to_int (scm_cdar (s)))
       accs = scm_cons (scm_car (s), accs);
 
   context ()->set_property ("keySignature", accs);
-  context ()->set_property ("tonic" ,
+  context ()->set_property ("tonic",
                            r->get_property ("tonic"));
 }
 
-
-void
-Key_engraver::start_translation_timestep ()
-{
-  key_ev_ = 0;
-}
-
-
 void
 Key_engraver::initialize ()
 {
   context ()->set_property ("keySignature", SCM_EOL);
   context ()->set_property ("lastKeySignature", SCM_EOL);
 
-  Pitch p (0,0,0);
+  Pitch p (0, 0, 0);
   context ()->set_property ("tonic", p.smobbed_copy ());
-
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION (Key_engraver,
-/* descr */       "",
-/* creats*/       "KeySignature",
-/* accepts */     "key-change-event",
-/* acks  */      "bar-line-interface clef-interface",
-/* reads */       "keySignature printKeyCancellation lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
-/* write */       "lastKeySignature tonic keySignature");
+ADD_TRANSLATOR (Key_engraver,
+               /* descr */ "",
+               /* creats*/ "KeySignature",
+               /* accepts */ "key-change-event",
+               /* acks  */ "bar-line-interface clef-interface",
+               /* reads */ "keySignature printKeyCancellation lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
+               /* write */ "lastKeySignature tonic keySignature");