Merge branch 'master' of ssh://jeancharlesm@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / include / tie-details.hh

diff --git a/lily/include/tie-details.hh b/lily/include/tie-details.hh
index e30f3ed8661c972c1b8272749ce5923985180b86..24402e56c56fcddce176339fa46d42d392e63540 100644 (file)
--- a/lily/include/tie-details.hh
+++ b/lily/include/tie-details.hh
@@ -21,8 +21,10 @@ struct Tie_details
   Real stem_gap_; 
   Real between_length_limit_;
   Real wrong_direction_offset_penalty_;
+  Real same_dir_as_stem_penalty_;
   Real min_length_penalty_factor_;
   Real min_length_;
+  Real skyline_padding_;
   Real tip_staff_line_clearance_;
   Real center_staff_line_clearance_;
   Real staff_line_collision_penalty_;
@@ -41,6 +43,7 @@ struct Tie_details
 
   int single_tie_region_size_;
   int multi_tie_region_size_;
+  Direction neutral_direction_;
   
   Tie_details ();
   void from_grob (Grob *);