X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=b3e9d4bd98b7c06b0deadcc89bc45ee27f847a61;hb=666c669990584a38b18cd00f50f22d93959d4f18;hp=eff8a73a20a169b9eba72f8cc127a371639370fd;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index eff8a73a20..b3e9d4bd98 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,189 +3,228 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  */
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-#include "key-item.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
-#include "item.hh"
-#include "bar.hh"
-#include "timing-translator.hh"
-#include "staff-symbol-referencer.hh"
-#include "translator-group.hh"
+#include "bar-line.hh"
+#include "clef.hh"
+#include "context.hh"
 #include "engraver.hh"
-#include "musical-pitch.hh"
+#include "item.hh"
+#include "pitch.hh"
 #include "protected-scm.hh"
-#include "clef.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
-/**
-  Make the key signature.
- */
 class Key_engraver : public Engraver
 {
-  void create_key(bool);
-  void read_req (Key_change_req const * r);
+  void create_key (bool);
+  void read_event (Stream_event const *r);
 
+  Stream_event *key_event_;
+  Item *item_;
+  Item *cancellation_;
 public:
-  Key_engraver();
-  
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS (Key_engraver);
 
-  Key_change_req * keyreq_l_;
-  Item * item_p_;
-  Protected_scm old_accs_;	// ugh. -> property
-    
 protected:
-  virtual void do_creation_processing();
-  virtual void do_removal_processing ();
-  virtual bool do_try_music (Music *req_l);
-  virtual void do_process_music();
-  virtual void do_pre_move_processing();
-  virtual void do_post_move_processing();
-  virtual void acknowledge_element (Score_element_info);
+  virtual void initialize ();
+  virtual void finalize ();
+  void stop_translation_timestep ();
+  void process_music ();
+
+  DECLARE_TRANSLATOR_LISTENER (key_change);
+  DECLARE_ACKNOWLEDGER (clef);
+  DECLARE_ACKNOWLEDGER (bar_line);
 };
 
-
 void
-Key_engraver::do_removal_processing ()
+Key_engraver::finalize ()
 {
-  old_accs_ = SCM_EOL;		// unprotect can not  be called from dtor.
 }
 
 Key_engraver::Key_engraver ()
 {
-  keyreq_l_ = 0;
-  item_p_ = 0;
+  key_event_ = 0;
+  item_ = 0;
+  cancellation_ = 0;
 }
 
+
 void
-Key_engraver::create_key (bool def)
+Key_engraver::create_key (bool is_default)
 {
-  if (!item_p_) 
+  if (!item_)
     {
-      item_p_ = new Item ( get_property ("KeySignature"));
+      item_ = make_item ("KeySignature",
+			 key_event_ ? key_event_->self_scm () : SCM_EOL);
 
-      item_p_->set_elt_property ("c0-position", gh_int2scm (0));
+      item_->set_property ("c0-position",
+			   get_property ("middleCPosition"));
 
-      // todo: put this in basic props.
-      item_p_->set_elt_property ("old-accidentals", old_accs_);
-      item_p_->set_elt_property ("new-accidentals", get_property ("keySignature"));
+      SCM last = get_property ("lastKeySignature");
+      SCM key = get_property ("keySignature");
+      bool extranatural = to_boolean(get_property("extraNatural"));
 
-      Staff_symbol_referencer::set_interface (item_p_);
-      Key_item::set_interface (item_p_);
+      if ((to_boolean (get_property ("printKeyCancellation"))
+	   || key == SCM_EOL)
+	  && !scm_is_eq (last, key))
+	{
+	  SCM restore = SCM_EOL;
+	  SCM *tail = &restore;
+	  for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
+	    {
+	      SCM new_alter_pair = scm_assoc (scm_caar (s), key);
+	      Rational old_alter = ly_scm2rational (scm_cdar (s));
+	      if (new_alter_pair == SCM_BOOL_F
+		  || extranatural
+		  && (ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter)*old_alter < Rational (0))
+		{
+		  *tail = scm_cons (scm_car (s), *tail);
+		  tail = SCM_CDRLOC (*tail);
+		}
+	    }
+
+	  if (scm_is_pair (restore))
+	    {
+	      cancellation_ = make_item ("KeyCancellation",
+					 key_event_
+					 ? key_event_->self_scm () : SCM_EOL);
+	      
+	      cancellation_->set_property ("alteration-alist", restore);
+	      cancellation_->set_property ("c0-position",
+					   get_property ("middleCPosition"));
+	    }
+	}
 
-      SCM prop = get_property ("keyOctaviation");
-      bool multi = to_boolean (prop);
-      
-      if (multi)
-	item_p_->set_elt_property ("multi-octave", gh_bool2scm (multi));
-      
-      announce_element (item_p_,keyreq_l_);
+      item_->set_property ("alteration-alist", key);
     }
 
-
-  if (!def)
+  if (!is_default)
     {
-      SCM vis = get_property ("explicitKeySignatureVisibility"); 
-      if (gh_procedure_p (vis))
-	item_p_->set_elt_property ("visibility-lambda",vis);
+      SCM visibility = get_property ("explicitKeySignatureVisibility");
+      item_->set_property ("break-visibility", visibility);
+      if (cancellation_)
+	cancellation_->set_property ("break-visibility", visibility);
     }
-}      
-
+}
 
-bool
-Key_engraver::do_try_music (Music * req_l)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_engraver, key_change);
+void
+Key_engraver::listen_key_change (Stream_event *ev)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
-    {
-      if (keyreq_l_)
-	warning (_ ("FIXME: key change merge"));
-      keyreq_l_ = kc;
-      read_req (keyreq_l_);
-      return true;
-    }   
-  return  false;
+  /* do this only once, just to be on the safe side.  */
+  if (ASSIGN_EVENT_ONCE (key_event_, ev))
+    read_event (key_event_);
 }
 
 void
-Key_engraver::acknowledge_element (Score_element_info info)
+Key_engraver::acknowledge_clef (Grob_info info)
 {
-  if (Clef::has_interface (info.elem_l_))
-    {
-      SCM c =  get_property ("createKeyOnClefChange");
-      if (to_boolean (c))
-	{
-	  create_key (false);
-	}
-    }
-  else if (Bar::has_interface (info.elem_l_)
-	   && gh_pair_p (get_property ("keySignature")))
-    {
-      create_key (true);
-    }
+  (void)info;
+  SCM c = get_property ("createKeyOnClefChange");
+  if (to_boolean (c))
+    create_key (false);
+}
 
+void
+Key_engraver::acknowledge_bar_line (Grob_info info)
+{
+  (void)info;
+  if (scm_is_pair (get_property ("keySignature")))
+    create_key (true);
 }
 
 void
-Key_engraver::do_process_music ()
+Key_engraver::process_music ()
 {
-  if (keyreq_l_ || old_accs_ != get_property ("keySignature"))
-    {
-      create_key (false);
-    }
+  if (key_event_
+      || get_property ("lastKeySignature") != get_property ("keySignature"))
+    create_key (false);
 }
 
 void
-Key_engraver::do_pre_move_processing ()
-{ 
-  if (item_p_) 
-    {
-      typeset_element (item_p_);
-      item_p_ = 0;
-    }
+Key_engraver::stop_translation_timestep ()
+{
+  item_ = 0;
+  context ()->set_property ("lastKeySignature", get_property ("keySignature"));
+  cancellation_ = 0;
+  key_event_ = 0;
 }
 
 void
-Key_engraver::read_req (Key_change_req const * r)
+Key_engraver::read_event (Stream_event const *r)
 {
-  SCM p = r->get_mus_property ("pitch-alist");
-  if (p == SCM_UNDEFINED)
+  SCM p = r->get_property ("pitch-alist");
+  if (!scm_is_pair (p))
     return;
 
-  SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
-  for (SCM s = get_property ("keyAccidentalOrder");
-       gh_pair_p (s); s = gh_cdr (s))
+
+  SCM alist = scm_list_copy (p);
+  SCM order = get_property ("keyAlterationOrder");
+  for (SCM s = order;
+       scm_is_pair (s) && scm_is_pair (alist); s = scm_cdr (s))
     {
-      if (gh_pair_p (scm_member (gh_car (s), n)))
+      SCM head = scm_member (scm_car (s), alist);
+      
+      if (scm_is_pair (head))
 	{
-	  accs = gh_cons (gh_car (s), accs);
-	  n = scm_delete_x (gh_car (s), n);
+	  accs = scm_cons (scm_car (head), accs);
+	  alist = scm_delete_x (scm_car (head), alist);
 	}
     }
-  for (SCM s = n ; gh_pair_p (s); s = gh_cdr (s))
-    if (gh_scm2int (gh_cdar (s)))
-      accs = gh_cons (gh_car (s), accs);
 
-  old_accs_ = get_property ("keySignature");
-  daddy_trans_l_->set_property ("keySignature", accs);
+  if (scm_is_pair (alist))
+    {
+      bool warn = false;
+      for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
+	if (ly_scm2rational (scm_cdar (s)))
+	  {
+	    warn = true;
+	    accs = scm_cons (scm_car (s), accs);
+	  }
+
+      if (warn)
+	r->origin ()->warning ("No ordering for key signature alterations");      
+    }
+  
+  context ()->set_property ("keySignature", accs);
+  context ()->set_property ("tonic",
+			    r->get_property ("tonic"));
 }
 
 void
-Key_engraver::do_post_move_processing ()
+Key_engraver::initialize ()
 {
-  keyreq_l_ = 0;
-  old_accs_ = get_property ("keySignature");
-}
+  context ()->set_property ("keySignature", SCM_EOL);
+  context ()->set_property ("lastKeySignature", SCM_EOL);
 
-void
-Key_engraver::do_creation_processing ()
-{
-  daddy_trans_l_->set_property ("keySignature", SCM_EOL);
-  old_accs_ = SCM_EOL;
+  Pitch p (0, 0, 0);
+  context ()->set_property ("tonic", p.smobbed_copy ());
 }
 
-
-ADD_THIS_TRANSLATOR (Key_engraver);
-
+ADD_ACKNOWLEDGER (Key_engraver, clef);
+ADD_ACKNOWLEDGER (Key_engraver, bar_line);
+
+ADD_TRANSLATOR (Key_engraver,
+		/* doc */ "",
+		/* create */ "KeySignature",
+		
+		/* read */
+		"createKeyOnClefChange "
+		"explicitKeySignatureVisibility "
+		"extraNatural "
+		"keyAlterationOrder "
+		"keySignature "
+		"keySignature "
+		"lastKeySignature "
+		"printKeyCancellation "
+		,
+		
+		/* write */
+		"keySignature "
+		"lastKeySignature "
+		"tonic ")