tie-helpre -> tie-details

diff --git a/lily/tie-details.cc b/lily/tie-details.cc
new file mode 100644 (file)
index 0000000..852f044
--- /dev/null
+++ b/lily/tie-details.cc
@@ -0,0 +1,74 @@
+/*
+  tie-details.cc -- implement Tie_configuration, Tie_details
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+*/
+
+#include "tie.hh"
+#include "bezier.hh"
+#include "grob.hh"
+#include "staff-symbol-referencer.hh"
+#include "warn.hh"
+#include "tie-details.hh"
+
+
+/*
+  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)
+#define get_int_detail(src, defvalue) \
+  robust_scm2int(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);
+
+  
+  SCM details = me->get_property ("details");
+
+  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);
+  
+  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);
+  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);
+  
+  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);
+  multi_tie_region_size_ = get_int_detail ("multi-tie-region-size", 1);
+}
+
+Tie_details::Tie_details ()
+{
+  staff_space_ = 1.0; 
+  height_limit_ = 1.0;
+  ratio_ = .333;   
+}
+

diff --git a/lily/tie-helper.cc b/lily/tie-helper.cc
deleted file mode 100644 (file)
index e69de29..0000000