(get_default_dir): oops. Take abs () for

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

diff --git a/lily/tie-helper.cc b/lily/tie-helper.cc
index 6da15c0c3c221fc10fdcab316e3d8993fdfeb89f..66afbc42298ba813e5eb645e90732e1dec201cd5 100644 (file)
--- a/lily/tie-helper.cc
+++ b/lily/tie-helper.cc
@@ -15,14 +15,17 @@
 #include "tie-formatting-problem.hh"
 
 
-#define get_real_detail(src, defvalue) robust_scm2double(ly_assoc_get (ly_symbol2scm (src), details, SCM_EOL), defvalue)
+/*
+  this is a macro because we want ly_symbol2scm() 
+ */
+#define get_real_detail(src, defvalue) \
+  robust_scm2double(ly_assoc_get (ly_symbol2scm (src), details, SCM_EOL), defvalue)
 
 void
 Tie_details::from_grob (Grob *me)
 {
   staff_symbol_referencer_ = me;
   staff_space_ = Staff_symbol_referencer::staff_space (me);
-  x_gap_ = robust_scm2double (me->get_property ("x-gap"), 0.2);
 
   SCM details = me->get_property ("details");
 
@@ -31,19 +34,27 @@ Tie_details::from_grob (Grob *me)
   between_length_limit_ = get_real_detail ("between-length-limit", 1.0);
   
   wrong_direction_offset_penalty_ = get_real_detail("wrong-direction-offset-penalty", 10);
-  distance_penalty_factor_ = get_real_detail("distance-penalty-factor", 5);
+  
   length_penalty_factor_ = get_real_detail("length-penalty-factor", 1.0);
   min_length_ = get_real_detail("min-length", 0.333);
 
   // in half-space
-  staff_line_clearance_ = get_real_detail ("staff-line-clearance", 0.4);
+  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);
   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);
+  stem_gap_ = get_real_detail ("stem-gap", 0.3);
   tie_column_monotonicity_penalty_ = get_real_detail ("tie-column-monotonicity-penalty", 100);
   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);
+  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);
+  outer_tie_vertical_distance_symmetry_penalty_factor_ = get_real_detail ("outer-tie-vertical-distance-symmetry-penalty-factor", 3.0);
+  
 }
 
 Tie_details::Tie_details ()