From 4dd2a5700470a8c4085b8e962dd189eb775125f5 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Fri, 27 Jan 2012 10:33:51 -0800 Subject: [PATCH] hairpin.cc: apply bound padding for lone hairpins. Finish fixing issue 2130 --- lily/concurrent-hairpin-engraver.cc | 4 ++-- lily/hairpin.cc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lily/concurrent-hairpin-engraver.cc b/lily/concurrent-hairpin-engraver.cc index 873e8b5994..5d04d258fe 100644 --- a/lily/concurrent-hairpin-engraver.cc +++ b/lily/concurrent-hairpin-engraver.cc @@ -75,8 +75,8 @@ Concurrent_hairpin_engraver::stop_translation_timestep () if (arriving_hairpins_.size ()) { if (arriving_hairpins_.size () > 1) - for (vsize i = 0; i < arriving_hairpins_.size (); i++) - for (vsize j = i; j < arriving_hairpins_.size (); j++) + for (vsize i = 0; i < arriving_hairpins_.size () - 1; i++) + for (vsize j = i + 1; j < arriving_hairpins_.size (); j++) { Pointer_group_interface::add_grob (arriving_hairpins_[i], ly_symbol2scm ("concurrent-hairpins"), arriving_hairpins_[j]); Pointer_group_interface::add_grob (arriving_hairpins_[j], ly_symbol2scm ("concurrent-hairpins"), arriving_hairpins_[i]); diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 4ccce328b8..bf590a564b 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -176,7 +176,8 @@ Hairpin::print (SCM smob) x_points[d] = e[-d]; else { - Real broken_bound_padding = 0.0; + Real broken_bound_padding + = robust_scm2double (me->get_property ("broken-bound-padding"), 0.0); extract_grob_set (me, "concurrent-hairpins", chp); for (vsize i = 0; i < chp.size (); i++) { -- 2.39.5