patch::: 1.3.132.jcn4

diff --git a/VERSION b/VERSION
index f3ad2741c8ca661dd33607218c1c32361ccd6891..298e8f0c5a9f51adb423da6f9486a577aec7027f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=132
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc
index 7a80d7a6c2af05b9cf9610546266db5dadce46e6..fe1ee8b0d704ae04f7b7a38f6791631180c573b6 100644 (file)
--- a/lily/local-key-engraver.cc
+++ b/lily/local-key-engraver.cc
@@ -104,9 +104,8 @@ Local_key_engraver::create_grobs ()
            if (support_l == Tie::head (tie_l_arr_[i], RIGHT))
              {
                tie_changes = different;
-#if 0
-               // don't do this, yet.  the accidentals can't be
-               // deleted, yet.
+#if 1
+               /* Enable accidentals for broken tie */
                tie_break_cautionary = tie_l_arr_[i];
 #endif
                break;

diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index e2a9ead6cb8010637dc83f96d9cc203019af177b..700535e0156ba9d7cdf38af5175ff8785a47e20d 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -91,12 +91,13 @@ Local_key_item::after_line_breaking (SCM smob)
        {
          Grob *tie = unsmob_grob (gh_cadr (t));
          Spanner *sp = dynamic_cast<Spanner*> (tie);
-         if (!sp->broken_into_l_arr_.size ())
+         if (!sp->original_l_)
            {
              /* there should be a better way to delete me */
              scm_set_car_x (s, gh_list (gh_caar (s),
                                         ly_symbol2scm ("deleted"),
                                         SCM_UNDEFINED));
+             me->set_grob_property ("molecule", SCM_EOL);
            }
        }
     }