* lily/slur-configuration.cc (score_extra_encompass): different

distance measure for avoid and inside avoidance.
(score_extra_encompass): use 1/(distance+eps) as penalty.

* input/regression/slur-tuplet.ly: new file.

diff --git a/ChangeLog b/ChangeLog
index 860a6a8c21f3fea5ed8c6f7431038f963c9aed92..399261ddff0b2fc12428bb513dc311d430c0b339 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-12-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/slur-configuration.cc (score_extra_encompass): different
+       distance measure for avoid and inside avoidance.
+       (score_extra_encompass): use 1/(distance+eps) as penalty.
+
+       * lily/slur-scoring.cc (generate_avoid_offsets): use 'inside
+       encompass objects for generating slur curves.
+
+       * lily/slur.cc: use details iso. slur-details property.
+
+       * input/regression/slur-tuplet.ly: new file.
+
        * lily/slur-engraver.cc (acknowledge_tuplet_number): new function.  
 
        * flower/include/offset.hh (class Offset): new operator /=

diff --git a/input/regression/slur-tuplet.ly b/input/regression/slur-tuplet.ly
new file mode 100644 (file)
index 0000000..f468ab4
--- /dev/null
+++ b/input/regression/slur-tuplet.ly
@@ -0,0 +1,24 @@
+
+\header {
+  texidoc = "@code{TupletNumber} grobs are always inside slurs.
+This may not work if the slur starts after the tuplet.  "
+  
+}
+
+\version "2.7.24"
+
+\paper {
+  raggedright = ##t
+%  #(define debug-slur-scoring #t)
+}
+
+\relative {
+  \slurUp
+  \override TupletBracket #'bracket-visibility = ##f
+  \override Slur #'details #'region-size  = #6
+  
+  \times 2/3
+  {
+    c(  g'  c,)
+  }
+}

diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc
index be00da14904058880ddf36b509851abd56e0479f..2b5a090822d5026cf5344d23f8a8a8eae9f1ef56 100644 (file)
--- a/lily/slur-configuration.cc
+++ b/lily/slur-configuration.cc
@@ -361,7 +361,6 @@ Slur_configuration::score_extra_encompass (Slur_score_state const &state)
        = (1.0 / (max (dist, 0.0) + epsilon * state.parameters_.extra_encompass_free_distance_));
       Real threshold 
        = 1.0 / ((1 + epsilon) * state.parameters_.extra_encompass_free_distance_);
-          
       
       demerit
        += max (info.penalty_ * (factor - threshold), 0.0);