* lily/tie-formatting-problem.cc (score_configuration): use

sliding score for min-length.

* lily/tie-formatting-problem.cc (set_chord_outline): put dots
in outline too.
(generate_configuration): for small ties, also look for collisions
at Y + DIR*h + DELTA_Y.
(get_variations): consider variation for dot positions too.

diff --git a/ChangeLog b/ChangeLog
index 623838ef8ef1023d9ce50544f5374328744294ae..a2b569dc8c301135c8c549d23b677c64c3960477 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-02-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/tie-formatting-problem.cc (score_configuration): use
+       sliding score for min-length. 
+
        * Documentation/pictures/GNUmakefile (local-dist): loose the rule
        spaghetti for icons.
 

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 50b6bcba93f01e75db806a70606150319896bcdb..8296f4dee160ea3e576849a0a263ed7d32e7c0d4 100644 (file)
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -28,7 +28,7 @@ struct Tie_details
   Real stem_gap_; 
   Real between_length_limit_;
   Real wrong_direction_offset_penalty_;
-  Real length_penalty_factor_;
+  Real min_length_penalty_factor_;
   Real min_length_;
   Real tip_staff_line_clearance_;
   Real center_staff_line_clearance_;

diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index 8d40e75f71784c9f4aad5ed497fd7abbd824c656..9e2252e3f7948047eccba2c7e668c855889bba25 100644 (file)
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -435,7 +435,9 @@ Tie_formatting_problem::score_configuration (Tie_configuration const &conf) cons
   Real penalty = 0.0;
   Real length = conf.attachment_x_.length ();
 
-  penalty += peak_around (0.5 * details_.min_length_, details_.min_length_, length);
+  penalty +=
+    details_.min_length_penalty_factor_
+    * peak_around (0.33 * details_.min_length_, details_.min_length_, length);
 
   Real tip_pos = conf.position_ + conf.delta_y_ / 0.5 * details_.staff_space_;
   Real tip_y = tip_pos * details_.staff_space_ * 0.5;

diff --git a/lily/tie-helper.cc b/lily/tie-helper.cc
index 66afbc42298ba813e5eb645e90732e1dec201cd5..00c8bea035ff81fc7b3cf39d20bb92f94eb2aa74 100644 (file)
--- a/lily/tie-helper.cc
+++ b/lily/tie-helper.cc
@@ -35,8 +35,9 @@ Tie_details::from_grob (Grob *me)
   
   wrong_direction_offset_penalty_ = get_real_detail("wrong-direction-offset-penalty", 10);
   
-  length_penalty_factor_ = get_real_detail("length-penalty-factor", 1.0);
-  min_length_ = get_real_detail("min-length", 0.333);
+  min_length_ = get_real_detail("min-length", 1.0);
+  min_length_penalty_factor_ = get_real_detail("min-length-penalty-factor", 1.0);
+
 
   // in half-space
   center_staff_line_clearance_ = get_real_detail ("center-staff-line-clearance", 0.4);

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 527adae8c95f9ed438771d8326fcc49620818f32..5435161434d54eaa31b97e845a2814a5864d0e3f 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1668,6 +1668,7 @@
                    (stem-gap . 0.35)
                    (height-limit . 1.0)
                    (horizontal-distance-penalty-factor . 10)
+                   (min-length-penalty-factor . 20)
                    (tie-tie-collision-distance . 0.45) 
                    (tie-tie-collision-penalty . 25.0)
                    (intra-space-threshold . 1.25)