From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 28 Dec 2006 17:48:23 +0000 (+0100)
Subject: Update property definitions for 'cautionary, 'cautionary-style
X-Git-Tag: release/2.11.6-1~41
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b323d7a3023aee8c8bfb6d38c14865b79ada109a;p=lilypond.git

Update property definitions for 'cautionary, 'cautionary-style
---

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index c7f956f9af..502aeaea9f 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -420,9 +420,6 @@ Accidental_engraver::make_standard_accidental (Stream_event *note,
     Side_position_interface::add_support (a, right_objects_[i]);
 
   a->set_parent (note_head, Y_AXIS);
-  if (cautionary)
-    a->set_property ("cautionary", SCM_BOOL_T);
-
 
   if (!accidental_placement_)
     accidental_placement_ = make_item ("AccidentalPlacement",
diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 85c06bf95a..8752d704a0 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -783,18 +783,11 @@ Slur_score_state::get_extra_encompass_infos () const
 	  if (Accidental_interface::has_interface (g))
 	    {
 	      penalty = parameters_.accidental_collision_;
-	      /* Begin copy accidental.cc */
-	      bool parens = false;
-	      if (to_boolean (g->get_property ("cautionary")))
-		{
-		  SCM cstyle = g->get_property ("cautionary-style");
-		  parens = ly_is_equal (cstyle, ly_symbol2scm ("parentheses"));
-		}
 
 	      SCM alt = g->get_property ("alteration");
 	      SCM scm_style = g->get_property ("style");
 	      if (!scm_is_symbol (scm_style)
-		  && !parens
+		  && !to_boolean (g->get_property ("parenthesized"))
 		  && !to_boolean (g->get_property ("restore-first")))
 		{
 		  /* End copy accidental.cc */
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index ef150b8f48..6080fb021b 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -20,7 +20,6 @@
     (Accidental
      . (
 	(avoid-slur . inside)
-	(cautionary-style . parentheses)
 	(stencil . ,ly:accidental-interface::print)
 	(stencils . ,ly:accidental-interface::calc-stencils)
 	(after-line-breaking