X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie-formatting-problem.hh;h=df24f2ccf4f66ab1023a2b2bcc823fe2bcc8005c;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=afbca71a008c9448e0c22b7ca2c9b29a2959a1bc;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index afbca71a00..df24f2ccf4 100644
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,12 +30,12 @@
 #include <map>
 #include <set>
 
-typedef map< Tuple<int,4>, Tie_configuration *> Tie_configuration_map;
+typedef map< Tuple<int, 4>, Tie_configuration *> Tie_configuration_map;
 
 struct Tie_configuration_variation
 {
   vector<pair<int, Tie_configuration *> > index_suggestion_pairs_;
-  void add_suggestion(int index, Tie_configuration* suggestion)
+  void add_suggestion (int index, Tie_configuration *suggestion)
   {
     index_suggestion_pairs_.push_back (make_pair (index, suggestion));
   }
@@ -51,45 +51,44 @@ class Tie_formatting_problem
   Column_extent_map stem_extents_;
   Column_extent_map head_extents_;
   Position_extent_map head_positions_;
-  
+
   set<int> dot_positions_;
   Interval dot_x_;
   vector<Tie_specification> specifications_;
   bool use_horizontal_spacing_;
-  
+
   Tie_configuration_map possibilities_;
 
   Grob *x_refpoint_;
   Grob *y_refpoint_;
 
-  
   Tie_configuration *get_configuration (int position, Direction dir, Drul_array<int> cols, bool tune_y) const;
   Tie_configuration *generate_configuration (int position, Direction dir, Drul_array<int> cols, bool tune_y) const;
 
   vector<Tie_configuration_variation> generate_collision_variations (Ties_configuration const &ties) const;
   vector<Tie_configuration_variation> generate_extremal_tie_variations (Ties_configuration const &ties) const;
   vector<Tie_configuration_variation> generate_single_tie_variations (Ties_configuration const &ties) const;
-  
+
   void score_configuration (Tie_configuration *) const;
   Real score_aptitude (Tie_configuration *, Tie_specification const &,
-		       Ties_configuration *, int) const;
+                       Ties_configuration *, int) const;
   void score_ties_aptitude (Ties_configuration *ties) const;
   void score_ties_configuration (Ties_configuration *ties) const;
   void set_ties_config_standard_directions (Ties_configuration *tie_configs_ptr);
   void score_ties (Ties_configuration *) const;
-  
+
   Slice head_positions_slice (int) const;
   Ties_configuration generate_base_chord_configuration ();
   Ties_configuration find_best_variation (Ties_configuration const &base,
-					  vector<Tie_configuration_variation> const &vars);
+                                          vector<Tie_configuration_variation> const &vars);
 
 public:
   Tie_details details_;
   void print_ties_configuration (Ties_configuration const *);
 
-  Interval get_stem_extent (int, Direction, Axis) const; 
-  Interval get_head_extent (int, Direction, Axis) const; 
-  
+  Interval get_stem_extent (int, Direction, Axis) const;
+  Interval get_head_extent (int, Direction, Axis) const;
+
 public:
   Tie_formatting_problem ();
   ~Tie_formatting_problem ();
@@ -98,11 +97,11 @@ public:
   Ties_configuration generate_optimal_configuration ();
   Ties_configuration generate_ties_configuration (Ties_configuration const &);
 
-  void from_ties (vector<Grob*> const &ties);
+  void from_ties (vector<Grob *> const &ties);
   void from_tie (Grob *tie);
-  void from_semi_ties (vector<Grob*> const &, Direction head_dir);
-  void set_chord_outline (vector<Item*>, Direction);
-  void set_column_chord_outline (vector<Item*>, Direction, int rank);
+  void from_semi_ties (vector<Grob *> const &, Direction head_dir);
+  void set_chord_outline (vector<Item *>, Direction);
+  void set_column_chord_outline (vector<Item *>, Direction, int rank);
   void set_manual_tie_configuration (SCM);
   Interval get_attachment (Real, Drul_array<int>) const;
   Grob *common_x_refpoint () const;