Run `make grand-replace'.

[lilypond.git] / lily / tie-details.cc

diff --git a/lily/tie-details.cc b/lily/tie-details.cc
index c4ed37a2e48568c6bb41e9c8e1a7b5497d8b8466..2524599ad76172d2fd7f0a8221fb776a4f4ac27f 100644 (file)
--- a/lily/tie-details.cc
+++ b/lily/tie-details.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -28,24 +28,27 @@ Tie_details::from_grob (Grob *me)
 {
   staff_symbol_referencer_ = me;
   staff_space_ = Staff_symbol_referencer::staff_space (me);
-
+  
+  neutral_direction_ = to_dir (me->get_property ("neutral-direction"));
+  if (!neutral_direction_)
+    neutral_direction_ = DOWN;
   
   SCM details = me->get_property ("details");
 
-  height_limit_ = get_real_detail("height-limit", 0.75);
-  ratio_ = get_real_detail("ratio", .333);  
+  height_limit_ = get_real_detail ("height-limit", 0.75);
+  ratio_ = get_real_detail ("ratio", .333);  
   between_length_limit_ = get_real_detail ("between-length-limit", 1.0);
   
-  wrong_direction_offset_penalty_ = get_real_detail("wrong-direction-offset-penalty", 10);
+  wrong_direction_offset_penalty_ = get_real_detail ("wrong-direction-offset-penalty", 10);
   
-  min_length_ = get_real_detail("min-length", 1.0);
-  min_length_penalty_factor_ = get_real_detail("min-length-penalty-factor", 1.0);
+  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);
   tip_staff_line_clearance_ = get_real_detail ("tip-staff-line-clearance", 0.4);
-  staff_line_collision_penalty_ = get_real_detail("staff-line-collision-penalty", 5);
+  staff_line_collision_penalty_ = get_real_detail ("staff-line-collision-penalty", 5);
   dot_collision_clearance_ = get_real_detail ( "dot-collision-clearance", 0.25);
   dot_collision_penalty_ = get_real_detail ( "dot-collision-penalty", 0.25);
   x_gap_ = get_real_detail ("note-head-gap", 0.2);
@@ -54,6 +57,7 @@ Tie_details::from_grob (Grob *me)
   tie_tie_collision_penalty_ = get_real_detail ("tie-tie-collision-penalty", 30);
   tie_tie_collision_distance_ = get_real_detail ("tie-tie-collision-distance", .25);
   horizontal_distance_penalty_factor_ = get_real_detail ("horizontal-distance-penalty-factor", 5);
+  same_dir_as_stem_penalty_ = get_real_detail ("same-dir-as-stem-penalty", 20);
   vertical_distance_penalty_factor_ = get_real_detail ("vertical-distance-penalty-factor", 5);
   intra_space_threshold_ = get_real_detail ("intra-space-threshold", 1.0);
   outer_tie_length_symmetry_penalty_factor_ = get_real_detail ("outer-tie-length-symmetry-penalty-factor", 3.0);
@@ -62,6 +66,7 @@ Tie_details::from_grob (Grob *me)
   outer_tie_vertical_gap_ = get_real_detail ("outer-tie-vertical-gap", 0.15);
 
   single_tie_region_size_ = get_int_detail ("single-tie-region-size", 3);
+  skyline_padding_ = get_real_detail ("skyline-padding", 0.05);
   multi_tie_region_size_ = get_int_detail ("multi-tie-region-size", 1);
 }