lilypond-0.1.52

diff --git a/lily/col-info.cc b/lily/col-info.cc
index 83c7f61fbc0296646a13f91b386dbd0dc2065ab9..9fa43ef8d30f09257fd61f767e3481129299b28f 100644 (file)
--- a/lily/col-info.cc
+++ b/lily/col-info.cc
@@ -15,7 +15,7 @@ Colinfo::print() const
 {
 #ifndef NPRINT
   DOUT << "column { ";
-  if (fixed())
+  if (fixed_b())
     DOUT << "fixed at " << fixed_position()<<", ";
   assert (pcol_l_);
   DOUT << width_.str();
@@ -41,3 +41,20 @@ Colinfo::Colinfo()
   pcol_l_ =0;
 }
 
+bool
+Colinfo::fixed_b () const
+{
+ return fixpos_p_.get_C();
+}
+
+Real
+Colinfo::fixed_position () const
+{
+  return *fixpos_p_;
+}
+
+int
+Colinfo::rank_i () const
+{
+  return pcol_l_->rank_i ();
+}

diff --git a/lily/include/col-info.hh b/lily/include/col-info.hh
index 50944b6fc43d2f0f2cf66989c26dcc3218161c62..405712e99db1bc047d5cae34fa248f274dd492b6 100644 (file)
--- a/lily/include/col-info.hh
+++ b/lily/include/col-info.hh
@@ -13,11 +13,13 @@
 #include "lily-proto.hh"
 #include "pointer.hh"
 #include "interval.hh"
+#include "assoc.hh"
 
 /// helper struct for #Spacing_problem#
 struct Colinfo {
   Paper_column *pcol_l_;
   P<Real> fixpos_p_;
+  Assoc<int, Real> min_dists_assoc_;
   Interval width_;
   int rank_i_;
   /// did some tricks to make this column come out.
@@ -26,9 +28,10 @@ struct Colinfo {
   Colinfo();
   Colinfo (Paper_column *,Real const *);
 
+  int rank_i () const;
   void print() const;
-  bool fixed() const { return fixpos_p_.get_C();}
-  Real fixed_position() const { return *fixpos_p_; }
+  bool fixed_b() const ;
+  Real fixed_position() const ;
 };
 
 #endif // COL_INFO_HH

diff --git a/lily/include/drul-array.hh b/lily/include/drul-array.hh
index 69db537a9b60c225c8bfbb188c850376c7bd91e1..962fd2b6c21d2a7e8b98f6de03e19974c52a5370 100644 (file)
--- a/lily/include/drul-array.hh
+++ b/lily/include/drul-array.hh
@@ -12,6 +12,8 @@
 
 #include "direction.hh"
 
+#include <assert.h>
+
 /**
   Left/right or Up/down arrays. Drul is nicer sounding than udlr
  */

diff --git a/lily/include/separating-line-group-grav.hh b/lily/include/separating-line-group-grav.hh
new file mode 100644 (file)
index 0000000..17e83aa
--- /dev/null
+++ b/lily/include/separating-line-group-grav.hh
@@ -0,0 +1,34 @@
+/*   
+  separating-line-group-grav.hh -- declare Separating_line_group_engraver
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  
+ */
+
+#ifndef SEPARATING_LINE_GROUP_GRAV_HH
+#define SEPARATING_LINE_GROUP_GRAV_HH
+
+#include "line-group-grav.hh"
+
+class Separating_line_group_engraver : public Line_group_engraver
+{
+protected:
+  Single_malt_grouping_item * break_malt_p_;
+  Single_malt_grouping_item* nobreak_malt_p_;
+  Separating_group_spanner * sep_span_p_;
+  
+  virtual void acknowledge_element (Score_elem_info);
+  virtual void do_creation_processing ();
+  virtual void do_removal_processing ();
+  virtual void do_pre_move_processing ();
+public:
+  Separating_line_group_engraver ();
+  TRANSLATOR_CLONE (Separating_line_group_engraver);
+  DECLARE_MY_RUNTIME_TYPEINFO;
+};
+
+
+#endif /* SEPARATING_LINE_GROUP_GRAV_HH */
+