From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 27 Feb 2001 17:45:49 +0000 (+0100)
Subject: patch::: 1.3.132.jcn4
X-Git-Tag: release/1.3.133~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=96d907a8c23c116dbad2c1c0804c4265060b5467;p=lilypond.git

patch::: 1.3.132.jcn4
---

diff --git a/VERSION b/VERSION
index f3ad2741c8..298e8f0c5a 100644
--- 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 7a80d7a6c2..fe1ee8b0d7 100644
--- 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 e2a9ead6cb..700535e015 100644
--- 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);
 	    }
 	}
     }