Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index af402a8307720f25be2d82cff48e3c108101f8f2..b0a87988a4809908419b5d4906a555cc5aa7ce53 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,7 +3,7 @@
 
   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 "item.hh"
@@ -76,10 +76,6 @@ Key_engraver::create_key (bool is_default)
           || key == SCM_EOL)
          && !scm_is_eq (last, key))
        {
-         cancellation_ = make_item ("KeyCancellation",
-                                    key_event_
-                                    ? key_event_->self_scm () : SCM_EOL);
-
          SCM restore = SCM_EOL;
          SCM *tail = &restore;
          for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
@@ -88,21 +84,30 @@ Key_engraver::create_key (bool is_default)
                {
                  *tail = scm_acons (scm_caar (s),
                                     scm_from_int (0), *tail);
-                 tail = SCM_CDRLOC(*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 ("accidentals", restore);
-         cancellation_->set_property ("c0-position",
-                                      get_property ("middleCPosition"));
+             cancellation_->set_property ("alteration-alist", restore);
+             cancellation_->set_property ("c0-position",
+                                          get_property ("middleCPosition"));
+           }
        }
-      item_->set_property ("accidentals", key);
+      item_->set_property ("alteration-alist", key);
     }
 
   if (!is_default)
     {
       SCM visibility = get_property ("explicitKeySignatureVisibility");
       item_->set_property ("break-visibility", visibility);
+      if (cancellation_)
+       cancellation_->set_property ("break-visibility", visibility);
     }
 }
 
@@ -128,9 +133,7 @@ Key_engraver::acknowledge_clef (Grob_info info)
   (void)info;
   SCM c = get_property ("createKeyOnClefChange");
   if (to_boolean (c))
-    {
-      create_key (false);
-    }
+    create_key (false);
 }
 
 void
@@ -138,9 +141,7 @@ Key_engraver::acknowledge_bar_line (Grob_info info)
 {
   (void)info;
   if (scm_is_pair (get_property ("keySignature")))
-    {
-      create_key (true);
-    }
+    create_key (true);
 }
 
 void
@@ -169,7 +170,7 @@ Key_engraver::read_event (Music const *r)
 
   SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
-  for (SCM s = get_property ("keyAccidentalOrder");
+  for (SCM s = get_property ("keyAlterationOrder");
        scm_is_pair (s); s = scm_cdr (s))
     {
       if (scm_is_pair (scm_member (scm_car (s), n)))
@@ -198,15 +199,25 @@ Key_engraver::initialize ()
   context ()->set_property ("tonic", p.smobbed_copy ());
 }
 
-
-ADD_ACKNOWLEDGER (Key_engraver,clef);
-ADD_ACKNOWLEDGER (Key_engraver,bar_line);
+ADD_ACKNOWLEDGER (Key_engraver, clef);
+ADD_ACKNOWLEDGER (Key_engraver, bar_line);
 
 ADD_TRANSLATOR (Key_engraver,
-               /* descr */ "",
-               /* creats*/ "KeySignature",
-               /* accepts */ "key-change-event",
-               /* reads */ "keySignature printKeyCancellation lastKeySignature "
-               "explicitKeySignatureVisibility createKeyOnClefChange "
-               "keyAccidentalOrder keySignature",
-               /* write */ "lastKeySignature tonic keySignature");
+               /* doc */ "",
+               /* create */ "KeySignature",
+               /* accept */ "key-change-event",
+               
+               /* read */
+               "createKeyOnClefChange "
+               "explicitKeySignatureVisibility "
+               "keyAlterationOrder "
+               "keySignature "
+               "keySignature "
+               "lastKeySignature "
+               "printKeyCancellation "
+               ,
+               
+               /* write */
+               "keySignature "
+               "lastKeySignature "
+               "tonic ")