Update property definitions for 'cautionary, 'cautionary-style

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index c7f956f9af5da3be856d3fb0972fe0ba05e56a6f..502aeaea9fd602cd654f790827c56eab8d6629b9 100644 (file)
--- 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 85c06bf95ac6c9a51cdcad1e5cf28a63cc418e50..8752d704a0ab1895e4da2ad434bf5c5aaa9b099e 100644 (file)
--- 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 ef150b8f48f3acee54c23efdc2e694138355dfc3..6080fb021b1939c369318b67ddb1e839d824ead1 100644 (file)
--- 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